diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2001-10-30 18:12:26 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2001-10-30 18:12:26 +0000 |
| commit | 75cb88401d83c1722828f24ad739c686be031f2f (patch) | |
| tree | 36405b9d550c39b0ee76bb60c292e23d86706b46 /src | |
| parent | d2f0635b70699b5a68f9746d69c4109cd717e30a (diff) | |
| download | krb5-75cb88401d83c1722828f24ad739c686be031f2f.tar.gz krb5-75cb88401d83c1722828f24ad739c686be031f2f.tar.xz krb5-75cb88401d83c1722828f24ad739c686be031f2f.zip | |
* k5unseal.c: Fix whitespace in copyright message
* k5seal.c (make_seal_token_v1): Cleanup code for mic
tokens. Essentially revert code to Sam's 10/25 code, with one
correction - allocation of data_ptr - use msglen and not tmsglen.
Additionally, do not rely on malloc(0) being non-NULL.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13907 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/gssapi/krb5/ChangeLog | 12 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/k5seal.c | 11 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/k5unseal.c | 2 |
3 files changed, 16 insertions, 9 deletions
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index 61f853aadd..5d6982149d 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,6 +1,16 @@ +2001-10-30 Ezra Peisach <epeisach@mit.edu> + + * k5unseal.c: Fix whitespace in copyright message. + + * k5seal.c (make_seal_token_v1): Cleanup code for mic + tokens. Essentially revert code to Sam's 10/25 code, with one + correction - allocation of data_ptr - use msglen and not tmsglen. + Additionally, do not rely on malloc(0) being non-NULL. + 2001-10-27 Sam Hartman <hartmans@mit.edu> - * k5seal.c (make_seal_token_v1): Use usage 15 only for mic tokens, not for seal tokens without encryption + * k5seal.c (make_seal_token_v1): Use usage 15 only for mic tokens, + not for seal tokens without encryption 2001-10-26 Ezra Peisach <epeisach@mit.edu> diff --git a/src/lib/gssapi/krb5/k5seal.c b/src/lib/gssapi/krb5/k5seal.c index e9d2985d18..6631961a4b 100644 --- a/src/lib/gssapi/krb5/k5seal.c +++ b/src/lib/gssapi/krb5/k5seal.c @@ -164,7 +164,7 @@ make_seal_token_v1 (krb5_context context, md5cksum.length = sumlen; - if ((plain = (unsigned char *) xmalloc(msglen)) == NULL) { + if ((plain = (unsigned char *) xmalloc(msglen ? msglen : 1)) == NULL) { xfree(t); return(ENOMEM); } @@ -184,20 +184,17 @@ make_seal_token_v1 (krb5_context context, /* 8 = head of token body as specified by mech spec */ if (! (data_ptr = - (char *) xmalloc(8 + - ((bigend || (toktype != KG_TOK_SEAL_MSG)) - ? text->length : tmsglen)))) { + (char *) xmalloc(8 + (bigend ? text->length : msglen)))) { xfree(plain); xfree(t); return(ENOMEM); } (void) memcpy(data_ptr, ptr-2, 8); - if (bigend || (toktype != KG_TOK_SEAL_MSG)) + if (bigend) (void) memcpy(data_ptr+8, text->value, text->length); else (void) memcpy(data_ptr+8, plain, msglen); - plaind.length = 8 + - ((bigend || (toktype != KG_TOK_SEAL_MSG))? text->length : msglen); + plaind.length = 8 + (bigend ? text->length : msglen); plaind.data = data_ptr; code = krb5_c_make_checksum(context, md5cksum.checksum_type, seq, sign_usage, &plaind, &md5cksum); diff --git a/src/lib/gssapi/krb5/k5unseal.c b/src/lib/gssapi/krb5/k5unseal.c index 9980688846..ebc8a760fe 100644 --- a/src/lib/gssapi/krb5/k5unseal.c +++ b/src/lib/gssapi/krb5/k5unseal.c @@ -1,5 +1,5 @@ /* - * Copyright2001 by the Massachusetts Institute of Technology. + * Copyright 2001 by the Massachusetts Institute of Technology. * Copyright 1993 by OpenVision Technologies, Inc. * * Permission to use, copy, modify, distribute, and sell this software |