diff options
| author | edg <edg@mit.edu> | 1990-05-16 17:48:54 +0000 |
|---|---|---|
| committer | edg <edg@mit.edu> | 1990-05-16 17:48:54 +0000 |
| commit | a22cb9fedb94bf1230de610c43400648101128e7 (patch) | |
| tree | bb5d721edc1e0755d3ce302079bcda2a58cce431 /src | |
| parent | 4b05560e7a5e594ae30089c00b836363e1c9f966 (diff) | |
*** empty log message ***
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@857 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/crypto/des/cbc_cksum.c | 8 | ||||
| -rw-r--r-- | src/lib/crypto/des/string2key.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/crypto/des/cbc_cksum.c b/src/lib/crypto/des/cbc_cksum.c index 655cf3562..a0fc70368 100644 --- a/src/lib/crypto/des/cbc_cksum.c +++ b/src/lib/crypto/des/cbc_cksum.c @@ -60,7 +60,7 @@ OLDDECLARG(krb5_checksum *, cksum) krb5_octet *contents; if (key_size != sizeof(des_cblock)) - return -1; + return KRB5_BAD_KEYSIZE; if (!(schedule = (struct des_ks_struct *) malloc(sizeof(des_key_schedule)))) return ENOMEM; @@ -81,10 +81,10 @@ OLDDECLARG(krb5_checksum *, cksum) ; } - if (!(contents = (krb5_octet *) malloc(sizeof(des_cblock)))) + if (!(contents = (krb5_octet *) malloc(sizeof(des_cblock)))) { + cleanup(); return ENOMEM; - -#define cleanup2() { free( (char *) schedule); } + } des_cbc_cksum((krb5_octet *)in, contents, in_length, schedule, (krb5_octet *)key); diff --git a/src/lib/crypto/des/string2key.c b/src/lib/crypto/des/string2key.c index 48d6daeb5..f1de4f40a 100644 --- a/src/lib/crypto/des/string2key.c +++ b/src/lib/crypto/des/string2key.c @@ -86,7 +86,7 @@ OLDDECLARG(krb5_principal, princ) if ( !(keyblock->contents = (krb5_octet *)malloc(sizeof(des_cblock))) ) return(ENOMEM); -#define cleanup() {memset(keyblock->contents, sizeof(des_cblock), 0);\ +#define cleanup() {bzero(keyblock->contents, sizeof(des_cblock));\ (void) free((char *) keyblock->contents);} keyblock->keytype = KEYTYPE_DES; |