diff options
| author | Greg Hudson <ghudson@mit.edu> | 2013-03-24 01:28:13 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2013-03-24 01:28:13 -0400 |
| commit | 6c8fed1bb850b92d471b0741a452bb56354fc0e9 (patch) | |
| tree | e170a09d8457a58976562d1b0f369348d2198416 /src/lib/crypto | |
| parent | 81fde7e475b02986c1aff88766cc48882004d5dc (diff) | |
| download | krb5-6c8fed1bb850b92d471b0741a452bb56354fc0e9.tar.gz krb5-6c8fed1bb850b92d471b0741a452bb56354fc0e9.tar.xz krb5-6c8fed1bb850b92d471b0741a452bb56354fc0e9.zip | |
Move a bunch of stuff out of k5-int.h
Move internal declarations from k5-int.h to more localized headers
(like int-proto.h) where appropriate. Rename many symbols whose
prototypes were moved to use the k5_ prefix instead of krb5int_.
Remove some unused declarations or move them to the single source file
they were needed in. Remove krb5_creds_compare since it isn't used
any more.
Diffstat (limited to 'src/lib/crypto')
| -rw-r--r-- | src/lib/crypto/builtin/des/des_int.h | 9 | ||||
| -rw-r--r-- | src/lib/crypto/nss/enc_provider/des.c | 2 | ||||
| -rw-r--r-- | src/lib/crypto/nss/enc_provider/des3.c | 2 |
3 files changed, 2 insertions, 11 deletions
diff --git a/src/lib/crypto/builtin/des/des_int.h b/src/lib/crypto/builtin/des/des_int.h index 2338a9cf52..0801cb5828 100644 --- a/src/lib/crypto/builtin/des/des_int.h +++ b/src/lib/crypto/builtin/des/des_int.h @@ -137,15 +137,6 @@ typedef struct mit_des_ran_key_seed { #define MIT_DES_CBC_CKSUM_LENGTH (4*sizeof(krb5_octet)) -/* - * Check if k5-int.h has been included before us. If so, then check to see - * that our view of the DES key size is the same as k5-int.h's. - */ -#ifdef KRB5_MIT_DES_KEYSIZE -#if MIT_DES_KEYSIZE != KRB5_MIT_DES_KEYSIZE -error(MIT_DES_KEYSIZE does not equal KRB5_MIT_DES_KEYSIZE) -#endif /* MIT_DES_KEYSIZE != KRB5_MIT_DES_KEYSIZE */ -#endif /* KRB5_MIT_DES_KEYSIZE */ #endif /* KRB5_MIT_DES__ */ /* * End "mit-des.h" diff --git a/src/lib/crypto/nss/enc_provider/des.c b/src/lib/crypto/nss/enc_provider/des.c index 3b96617a89..bb1f1c0470 100644 --- a/src/lib/crypto/nss/enc_provider/des.c +++ b/src/lib/crypto/nss/enc_provider/des.c @@ -79,7 +79,7 @@ k5_des_cbc_mac(krb5_key key, const krb5_crypto_iov *data, size_t num_data, const struct krb5_enc_provider krb5int_enc_des = { 8, - 7, KRB5_MIT_DES_KEYSIZE, + 7, 8, k5_des_encrypt_iov, k5_des_decrypt_iov, k5_des_cbc_mac, diff --git a/src/lib/crypto/nss/enc_provider/des3.c b/src/lib/crypto/nss/enc_provider/des3.c index de3f3c91e8..6217709c8e 100644 --- a/src/lib/crypto/nss/enc_provider/des3.c +++ b/src/lib/crypto/nss/enc_provider/des3.c @@ -64,7 +64,7 @@ k5_des3_decrypt_iov(krb5_key key, const krb5_data *ivec, const struct krb5_enc_provider krb5int_enc_des3 = { 8, - 21, KRB5_MIT_DES3_KEYSIZE, + 21, 24, k5_des3_encrypt_iov, k5_des3_decrypt_iov, NULL, |