diff options
| author | Keith Vetter <keithv@fusion.com> | 1995-09-11 19:06:45 +0000 |
|---|---|---|
| committer | Keith Vetter <keithv@fusion.com> | 1995-09-11 19:06:45 +0000 |
| commit | cdd6c33b9ae48076999e33ffa70e2365ecc5eb8c (patch) | |
| tree | 84682f14e77a844dfab2174318ebccb9067c829f /src/lib/des425/string2key.c | |
| parent | a66029e852781fa0333dc92bd88bd8184f6feeb1 (diff) | |
| download | krb5-cdd6c33b9ae48076999e33ffa70e2365ecc5eb8c.tar.gz krb5-cdd6c33b9ae48076999e33ffa70e2365ecc5eb8c.tar.xz krb5-cdd6c33b9ae48076999e33ffa70e2365ecc5eb8c.zip | |
Mac Beta 1 submission
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6749 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/des425/string2key.c')
| -rw-r--r-- | src/lib/des425/string2key.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/des425/string2key.c b/src/lib/des425/string2key.c index 58ed9a3cdb..89c8169554 100644 --- a/src/lib/des425/string2key.c +++ b/src/lib/des425/string2key.c @@ -35,7 +35,7 @@ extern int des_debug; /* converts the string pointed to by "data" into an encryption key - of type "enctype". *keyblock is filled in with the key info; + of type "keytype". *keyblock is filled in with the key info; in particular, keyblock->contents is to be set to allocated storage. It is the responsibility of the caller to release this storage when the generated key no longer needed. @@ -44,13 +44,13 @@ extern int des_debug; algorithm. If the particular function called does not know how to make a - key of type "enctype", an error may be returned. + key of type "keytype", an error may be returned. returns: errors */ -krb5_error_code mit_des_string_to_key (enctype, keyblock, data, princ) - const krb5_enctype enctype; +krb5_error_code mit_des_string_to_key (keytype, keyblock, data, princ) + const krb5_keytype keytype; krb5_keyblock * keyblock; const krb5_data * data; krb5_const_principal princ; @@ -71,8 +71,8 @@ krb5_error_code mit_des_string_to_key (enctype, keyblock, data, princ) #define min(A, B) ((A) < (B) ? (A): (B)) - if ( enctype != ENCTYPE_DES ) - return (KRB5_PROG_ENCTYPE_NOSUPP); + if ( keytype != KEYTYPE_DES ) + return (KRB5_PROG_KEYTYPE_NOSUPP); if ( !(keyblock->contents = (krb5_octet *)malloc(sizeof(mit_des_cblock))) ) return(ENOMEM); @@ -80,7 +80,7 @@ krb5_error_code mit_des_string_to_key (enctype, keyblock, data, princ) #define cleanup() {memset(keyblock->contents, 0, sizeof(mit_des_cblock));\ krb5_xfree(keyblock->contents);} - keyblock->enctype = ENCTYPE_DES; + keyblock->keytype = KEYTYPE_DES; keyblock->length = sizeof(mit_des_cblock); key = keyblock->contents; |