diff options
| author | Theodore Tso <tytso@mit.edu> | 1994-11-08 23:00:00 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1994-11-08 23:00:00 +0000 |
| commit | d18f25e3bdf995e723a7d81bdb6ebac8b1e7f917 (patch) | |
| tree | 74c0c745a8dbd2fe4249304a671e25e76d2be0d9 /src/include | |
| parent | 575922660257014f7e5087db7690f732261cfc5d (diff) | |
| download | krb5-d18f25e3bdf995e723a7d81bdb6ebac8b1e7f917.tar.gz krb5-d18f25e3bdf995e723a7d81bdb6ebac8b1e7f917.tar.xz krb5-d18f25e3bdf995e723a7d81bdb6ebac8b1e7f917.zip | |
Change internal calling signature to pass in the encryption block, so
that the encryption type in the keyblock structure can be properly
initialized.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4649 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/krb5/ChangeLog | 7 | ||||
| -rw-r--r-- | src/include/krb5/encryption.h | 14 |
2 files changed, 15 insertions, 6 deletions
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index 2caf1c82a..fdcaab7c7 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,10 @@ +Tue Nov 8 17:55:47 1994 Theodore Y. Ts'o (tytso@dcl) + + * encryption.h (krb5_string_to_key, krb5_random_key): Change + internal calling signature to pass in the encryption + block, so that the encryption type in the keyblock + structure can be properly initialized. + Thu Nov 3 16:38:44 1994 Theodore Y. Ts'o (tytso@dcl) * encryption.h (krb5_keyblock): Added a field to hold an diff --git a/src/include/krb5/encryption.h b/src/include/krb5/encryption.h index 3f4d70174..235b38ab4 100644 --- a/src/include/krb5/encryption.h +++ b/src/include/krb5/encryption.h @@ -31,7 +31,7 @@ typedef struct _krb5_keyblock { krb5_magic magic; krb5_keytype keytype; - krb5_enctype enctype; /* hint of what encryption type to use */ + krb5_enctype etype; /* hint of what encryption type to use */ int length; krb5_octet *contents; } krb5_keyblock; @@ -76,15 +76,17 @@ typedef struct _krb5_cryptosystem_entry { krb5_error_code (*process_key) NPROTOTYPE((krb5_encrypt_block *, const krb5_keyblock *)); krb5_error_code (*finish_key) NPROTOTYPE((krb5_encrypt_block *)); - krb5_error_code (*string_to_key) NPROTOTYPE((const krb5_keytype, + krb5_error_code (*string_to_key) NPROTOTYPE((const krb5_encrypt_block *, + const krb5_keytype, krb5_keyblock *, const krb5_data *, const krb5_data *)); krb5_error_code (*init_random_key) NPROTOTYPE((const krb5_keyblock *, krb5_pointer *)); krb5_error_code (*finish_random_key) NPROTOTYPE((krb5_pointer *)); - krb5_error_code (*random_key) NPROTOTYPE((krb5_pointer, - krb5_keyblock **)); + krb5_error_code (*random_key) NPROTOTYPE((const krb5_encrypt_block *, + krb5_pointer, + krb5_keyblock **)); int block_length; int pad_minimum; /* needed for cksum size computation */ int keysize; @@ -186,10 +188,10 @@ extern int krb5_max_cksum; /* max entry in array */ #define krb5_decrypt(inptr, outptr, size, eblock, ivec) (*(eblock)->crypto_entry->decrypt_func)(inptr, outptr, size, eblock, ivec) #define krb5_process_key(eblock, key) (*(eblock)->crypto_entry->process_key)(eblock, key) #define krb5_finish_key(eblock) (*(eblock)->crypto_entry->finish_key)(eblock) -#define krb5_string_to_key(eblock, keytype, keyblock, data, princ) (*(eblock)->crypto_entry->string_to_key)(keytype, keyblock, data, princ) +#define krb5_string_to_key(eblock, keytype, keyblock, data, princ) (*(eblock)->crypto_entry->string_to_key)(eblock, keytype, keyblock, data, princ) #define krb5_init_random_key(eblock, keyblock, ptr) (*(eblock)->crypto_entry->init_random_key)(keyblock, ptr) #define krb5_finish_random_key(eblock, ptr) (*(eblock)->crypto_entry->finish_random_key)(ptr) -#define krb5_random_key(eblock, ptr, keyblock) (*(eblock)->crypto_entry->random_key)(ptr, keyblock) +#define krb5_random_key(eblock, ptr, keyblock) (*(eblock)->crypto_entry->random_key)(eblock, ptr, keyblock) /* * Here's the stuff for the checksum switch: |