diff options
author | Zhanna Tsitkov <tsitkova@mit.edu> | 2009-10-28 18:12:38 +0000 |
---|---|---|
committer | Zhanna Tsitkov <tsitkova@mit.edu> | 2009-10-28 18:12:38 +0000 |
commit | c60792b08a48ec497e541917d7fea953d59f5612 (patch) | |
tree | b27bbd6a72c985474c74b7a4b2b8ed80015d468f /src/lib/crypto/builtin | |
parent | ca0304526a518b2419eee3c0aad569b50d9009ef (diff) | |
download | krb5-c60792b08a48ec497e541917d7fea953d59f5612.tar.gz krb5-c60792b08a48ec497e541917d7fea953d59f5612.tar.xz krb5-c60792b08a48ec497e541917d7fea953d59f5612.zip |
Replace krb5_ with krb5Int_ prefix for non-API functions
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23079 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/builtin')
-rw-r--r-- | src/lib/crypto/builtin/aes/aes_s2k.c | 2 | ||||
-rw-r--r-- | src/lib/crypto/builtin/arcfour/arcfour.c | 10 | ||||
-rw-r--r-- | src/lib/crypto/builtin/arcfour/arcfour.h | 13 | ||||
-rw-r--r-- | src/lib/crypto/builtin/arcfour/arcfour_aead.c | 4 | ||||
-rw-r--r-- | src/lib/crypto/builtin/arcfour/arcfour_s2k.c | 6 | ||||
-rw-r--r-- | src/lib/crypto/builtin/hash_provider/hash_md4.c | 6 | ||||
-rw-r--r-- | src/lib/crypto/builtin/hash_provider/hash_md5.c | 6 | ||||
-rw-r--r-- | src/lib/crypto/builtin/hmac.c | 2 | ||||
-rw-r--r-- | src/lib/crypto/builtin/md4/md4.c | 8 | ||||
-rw-r--r-- | src/lib/crypto/builtin/md4/rsa-md4.h | 6 | ||||
-rw-r--r-- | src/lib/crypto/builtin/md5/md5.c | 20 | ||||
-rw-r--r-- | src/lib/crypto/builtin/md5/rsa-md5.h | 6 | ||||
-rw-r--r-- | src/lib/crypto/builtin/pbkdf2.c | 2 |
13 files changed, 46 insertions, 45 deletions
diff --git a/src/lib/crypto/builtin/aes/aes_s2k.c b/src/lib/crypto/builtin/aes/aes_s2k.c index 76d73c635..14c7726bb 100644 --- a/src/lib/crypto/builtin/aes/aes_s2k.c +++ b/src/lib/crypto/builtin/aes/aes_s2k.c @@ -81,7 +81,7 @@ krb5int_aes_string_to_key(const struct krb5_enc_provider *enc, if (err) goto cleanup; - err = krb5_derive_keyblock (enc, tempkey, key, &usage); + err = krb5int_derive_keyblock (enc, tempkey, key, &usage); cleanup: if (err) diff --git a/src/lib/crypto/builtin/arcfour/arcfour.c b/src/lib/crypto/builtin/arcfour/arcfour.c index ad7ccec0b..ff2f4378c 100644 --- a/src/lib/crypto/builtin/arcfour/arcfour.c +++ b/src/lib/crypto/builtin/arcfour/arcfour.c @@ -13,7 +13,7 @@ of RSA Data Security) const char *const krb5int_arcfour_l40 = "fortybits"; void -krb5_arcfour_encrypt_length(const struct krb5_enc_provider *enc, +krb5int_arcfour_encrypt_length(const struct krb5_enc_provider *enc, const struct krb5_hash_provider *hash, size_t inputlen, size_t *length) { @@ -62,7 +62,7 @@ case 7: /* tgs-req authenticator */ } krb5_error_code -krb5_arcfour_encrypt(const struct krb5_enc_provider *enc, +krb5int_arcfour_encrypt(const struct krb5_enc_provider *enc, const struct krb5_hash_provider *hash, krb5_key key, krb5_keyusage usage, const krb5_data *ivec, const krb5_data *input, @@ -148,7 +148,7 @@ krb5_arcfour_encrypt(const struct krb5_enc_provider *enc, salt.length=4; store_32_le(ms_usage, salt.data); } - krb5_hmac(hash, key, 1, &salt, &d1); + krb5int_hmac(hash, key, 1, &salt, &d1); memcpy(k2.contents, k1.contents, k2.length); @@ -192,7 +192,7 @@ krb5_arcfour_encrypt(const struct krb5_enc_provider *enc, /* This is the arcfour-hmac decryption routine */ krb5_error_code -krb5_arcfour_decrypt(const struct krb5_enc_provider *enc, +krb5int_arcfour_decrypt(const struct krb5_enc_provider *enc, const struct krb5_hash_provider *hash, krb5_key key, krb5_keyusage usage, const krb5_data *ivec, const krb5_data *input, @@ -275,7 +275,7 @@ krb5_arcfour_decrypt(const struct krb5_enc_provider *enc, salt.length = 4; store_32_le(ms_usage, salt.data); } - ret = krb5_hmac(hash, key, 1, &salt, &d1); + ret = krb5int_hmac(hash, key, 1, &salt, &d1); if (ret) goto cleanup; diff --git a/src/lib/crypto/builtin/arcfour/arcfour.h b/src/lib/crypto/builtin/arcfour/arcfour.h index 1a2876437..e00708a7c 100644 --- a/src/lib/crypto/builtin/arcfour/arcfour.h +++ b/src/lib/crypto/builtin/arcfour/arcfour.h @@ -2,13 +2,13 @@ #define ARCFOUR_H extern void -krb5_arcfour_encrypt_length(const struct krb5_enc_provider *, +krb5int_arcfour_encrypt_length(const struct krb5_enc_provider *, const struct krb5_hash_provider *, size_t, size_t *); -extern -krb5_error_code krb5_arcfour_encrypt(const struct krb5_enc_provider *, +extern krb5_error_code +krb5int_arcfour_encrypt(const struct krb5_enc_provider *, const struct krb5_hash_provider *, krb5_key, krb5_keyusage, @@ -16,8 +16,8 @@ krb5_error_code krb5_arcfour_encrypt(const struct krb5_enc_provider *, const krb5_data *, krb5_data *); -extern -krb5_error_code krb5_arcfour_decrypt(const struct krb5_enc_provider *, +extern krb5_error_code +krb5int_arcfour_decrypt(const struct krb5_enc_provider *, const struct krb5_hash_provider *, krb5_key, krb5_keyusage, @@ -25,7 +25,8 @@ krb5_error_code krb5_arcfour_decrypt(const struct krb5_enc_provider *, const krb5_data *, krb5_data *); -extern krb5_error_code krb5int_arcfour_string_to_key( +extern krb5_error_code +krb5int_arcfour_string_to_key( const struct krb5_enc_provider *, const krb5_data *, const krb5_data *, diff --git a/src/lib/crypto/builtin/arcfour/arcfour_aead.c b/src/lib/crypto/builtin/arcfour/arcfour_aead.c index 4896afaaf..c01fc001b 100644 --- a/src/lib/crypto/builtin/arcfour/arcfour_aead.c +++ b/src/lib/crypto/builtin/arcfour/arcfour_aead.c @@ -152,7 +152,7 @@ krb5int_arcfour_encrypt_iov(const struct krb5_aead_provider *aead, salt.length = 4; store_32_le(ms_usage, salt.data); } - ret = krb5_hmac(hash, key, 1, &salt, &d1); + ret = krb5int_hmac(hash, key, 1, &salt, &d1); if (ret != 0) goto cleanup; @@ -272,7 +272,7 @@ krb5int_arcfour_decrypt_iov(const struct krb5_aead_provider *aead, salt.length = 4; store_32_le(ms_usage, (unsigned char *)salt.data); } - ret = krb5_hmac(hash, key, 1, &salt, &d1); + ret = krb5int_hmac(hash, key, 1, &salt, &d1); if (ret != 0) goto cleanup; diff --git a/src/lib/crypto/builtin/arcfour/arcfour_s2k.c b/src/lib/crypto/builtin/arcfour/arcfour_s2k.c index 41053ed17..09c9b7689 100644 --- a/src/lib/crypto/builtin/arcfour/arcfour_s2k.c +++ b/src/lib/crypto/builtin/arcfour/arcfour_s2k.c @@ -35,9 +35,9 @@ krb5int_arcfour_string_to_key(const struct krb5_enc_provider *enc, return err; /* the actual MD4 hash of the data */ - krb5_MD4Init(&md4_context); - krb5_MD4Update(&md4_context, copystr, copystrlen); - krb5_MD4Final(&md4_context); + krb5int_MD4Init(&md4_context); + krb5int_MD4Update(&md4_context, copystr, copystrlen); + krb5int_MD4Final(&md4_context); memcpy(key->contents, md4_context.digest, 16); #if 0 diff --git a/src/lib/crypto/builtin/hash_provider/hash_md4.c b/src/lib/crypto/builtin/hash_provider/hash_md4.c index f507aaaf7..3a4a4d530 100644 --- a/src/lib/crypto/builtin/hash_provider/hash_md4.c +++ b/src/lib/crypto/builtin/hash_provider/hash_md4.c @@ -38,10 +38,10 @@ k5_md4_hash(unsigned int icount, const krb5_data *input, if (output->length != RSA_MD4_CKSUM_LENGTH) return(KRB5_CRYPTO_INTERNAL); - krb5_MD4Init(&ctx); + krb5int_MD4Init(&ctx); for (i=0; i<icount; i++) - krb5_MD4Update(&ctx, (unsigned char *) input[i].data, input[i].length); - krb5_MD4Final(&ctx); + krb5int_MD4Update(&ctx, (unsigned char *) input[i].data, input[i].length); + krb5int_MD4Final(&ctx); memcpy(output->data, ctx.digest, RSA_MD4_CKSUM_LENGTH); diff --git a/src/lib/crypto/builtin/hash_provider/hash_md5.c b/src/lib/crypto/builtin/hash_provider/hash_md5.c index a6e380ae2..10840d0d9 100644 --- a/src/lib/crypto/builtin/hash_provider/hash_md5.c +++ b/src/lib/crypto/builtin/hash_provider/hash_md5.c @@ -38,10 +38,10 @@ k5_md5_hash(unsigned int icount, const krb5_data *input, if (output->length != RSA_MD5_CKSUM_LENGTH) return(KRB5_CRYPTO_INTERNAL); - krb5_MD5Init(&ctx); + krb5int_MD5Init(&ctx); for (i=0; i<icount; i++) - krb5_MD5Update(&ctx, (unsigned char *) input[i].data, input[i].length); - krb5_MD5Final(&ctx); + krb5int_MD5Update(&ctx, (unsigned char *) input[i].data, input[i].length); + krb5int_MD5Final(&ctx); memcpy(output->data, ctx.digest, RSA_MD5_CKSUM_LENGTH); diff --git a/src/lib/crypto/builtin/hmac.c b/src/lib/crypto/builtin/hmac.c index 6726a0826..d1be17e9c 100644 --- a/src/lib/crypto/builtin/hmac.c +++ b/src/lib/crypto/builtin/hmac.c @@ -178,7 +178,7 @@ krb5int_hmac_iov_keyblock(const struct krb5_hash_provider *hash, } krb5_error_code -krb5_hmac(const struct krb5_hash_provider *hash, krb5_key key, +krb5int_hmac(const struct krb5_hash_provider *hash, krb5_key key, unsigned int icount, const krb5_data *input, krb5_data *output) { return krb5int_hmac_keyblock(hash, &key->keyblock, icount, input, output); diff --git a/src/lib/crypto/builtin/md4/md4.c b/src/lib/crypto/builtin/md4/md4.c index 7922c71ed..b36a47613 100644 --- a/src/lib/crypto/builtin/md4/md4.c +++ b/src/lib/crypto/builtin/md4/md4.c @@ -76,7 +76,7 @@ static const unsigned char PADDING[64] = { (a) = ROTATE_LEFT ((a), (s));} void -krb5_MD4Init (krb5_MD4_CTX *mdContext) +krb5int_MD4Init (krb5_MD4_CTX *mdContext) { mdContext->i[0] = mdContext->i[1] = (krb5_ui_4)0; @@ -89,7 +89,7 @@ krb5_MD4Init (krb5_MD4_CTX *mdContext) } void -krb5_MD4Update (krb5_MD4_CTX *mdContext, const unsigned char *inBuf, unsigned int inLen) +krb5int_MD4Update (krb5_MD4_CTX *mdContext, const unsigned char *inBuf, unsigned int inLen) { krb5_ui_4 in[16]; int mdi; @@ -120,7 +120,7 @@ krb5_MD4Update (krb5_MD4_CTX *mdContext, const unsigned char *inBuf, unsigned in } void -krb5_MD4Final (krb5_MD4_CTX *mdContext) +krb5int_MD4Final (krb5_MD4_CTX *mdContext) { krb5_ui_4 in[16]; int mdi; @@ -136,7 +136,7 @@ krb5_MD4Final (krb5_MD4_CTX *mdContext) /* pad out to 56 mod 64 */ padLen = (mdi < 56) ? (56 - mdi) : (120 - mdi); - krb5_MD4Update (mdContext, PADDING, padLen); + krb5int_MD4Update (mdContext, PADDING, padLen); /* append length in bits and transform */ for (i = 0, ii = 0; i < 14; i++, ii += 4) diff --git a/src/lib/crypto/builtin/md4/rsa-md4.h b/src/lib/crypto/builtin/md4/rsa-md4.h index d4e6f6b79..f4272d5ff 100644 --- a/src/lib/crypto/builtin/md4/rsa-md4.h +++ b/src/lib/crypto/builtin/md4/rsa-md4.h @@ -82,9 +82,9 @@ typedef struct { unsigned char digest[16]; /* actual digest after MD4Final call */ } krb5_MD4_CTX; -extern void krb5_MD4Init(krb5_MD4_CTX *); -extern void krb5_MD4Update(krb5_MD4_CTX *, const unsigned char *, unsigned int); -extern void krb5_MD4Final(krb5_MD4_CTX *); +extern void krb5int_MD4Init(krb5_MD4_CTX *); +extern void krb5int_MD4Update(krb5_MD4_CTX *, const unsigned char *, unsigned int); +extern void krb5int_MD4Final(krb5_MD4_CTX *); /* ********************************************************************** diff --git a/src/lib/crypto/builtin/md5/md5.c b/src/lib/crypto/builtin/md5/md5.c index e548dbc3a..8f04be426 100644 --- a/src/lib/crypto/builtin/md5/md5.c +++ b/src/lib/crypto/builtin/md5/md5.c @@ -42,9 +42,9 @@ *********************************************************************** ** Message-digest routines: ** ** To form the message digest for a message M ** - ** (1) Initialize a context buffer mdContext using krb5_MD5Init ** - ** (2) Call krb5_MD5Update on mdContext and M ** - ** (3) Call krb5_MD5Final on mdContext ** + ** (1) Initialize a context buffer mdContext using krb5int_MD5Init ** + ** (2) Call krb5int_MD5Update on mdContext and M ** + ** (3) Call krb5int_MD5Final on mdContext ** ** The message digest is now in mdContext->digest[0...15] ** *********************************************************************** */ @@ -103,11 +103,11 @@ static const unsigned char PADDING[64] = { (a) &= 0xffffffff; \ } -/* The routine krb5_MD5Init initializes the message-digest context +/* The routine krb5int_MD5Init initializes the message-digest context mdContext. All fields are set to zero. */ void -krb5_MD5Init (krb5_MD5_CTX *mdContext) +krb5int_MD5Init (krb5_MD5_CTX *mdContext) { mdContext->i[0] = mdContext->i[1] = (krb5_ui_4)0; @@ -119,12 +119,12 @@ krb5_MD5Init (krb5_MD5_CTX *mdContext) mdContext->buf[3] = 0x10325476UL; } -/* The routine krb5_MD5Update updates the message-digest context to +/* The routine krb5int_MD5Update updates the message-digest context to account for the presence of each of the characters inBuf[0..inLen-1] in the message whose digest is being computed. */ void -krb5_MD5Update (krb5_MD5_CTX *mdContext, const unsigned char *inBuf, unsigned int inLen) +krb5int_MD5Update (krb5_MD5_CTX *mdContext, const unsigned char *inBuf, unsigned int inLen) { krb5_ui_4 in[16]; int mdi; @@ -153,11 +153,11 @@ krb5_MD5Update (krb5_MD5_CTX *mdContext, const unsigned char *inBuf, unsigned in } } -/* The routine krb5_MD5Final terminates the message-digest computation and +/* The routine krb5int_MD5Final terminates the message-digest computation and ends with the desired message digest in mdContext->digest[0...15]. */ void -krb5_MD5Final (krb5_MD5_CTX *mdContext) +krb5int_MD5Final (krb5_MD5_CTX *mdContext) { krb5_ui_4 in[16]; int mdi; @@ -173,7 +173,7 @@ krb5_MD5Final (krb5_MD5_CTX *mdContext) /* pad out to 56 mod 64 */ padLen = (mdi < 56) ? (56 - mdi) : (120 - mdi); - krb5_MD5Update (mdContext, PADDING, padLen); + krb5int_MD5Update (mdContext, PADDING, padLen); /* append length in bits and transform */ for (i = 0, ii = 0; i < 14; i++, ii += 4) diff --git a/src/lib/crypto/builtin/md5/rsa-md5.h b/src/lib/crypto/builtin/md5/rsa-md5.h index 846b23856..938b22d7a 100644 --- a/src/lib/crypto/builtin/md5/rsa-md5.h +++ b/src/lib/crypto/builtin/md5/rsa-md5.h @@ -48,9 +48,9 @@ typedef struct { unsigned char digest[16]; /* actual digest after MD5Final call */ } krb5_MD5_CTX; -extern void krb5_MD5Init(krb5_MD5_CTX *); -extern void krb5_MD5Update(krb5_MD5_CTX *,const unsigned char *,unsigned int); -extern void krb5_MD5Final(krb5_MD5_CTX *); +extern void krb5int_MD5Init(krb5_MD5_CTX *); +extern void krb5int_MD5Update(krb5_MD5_CTX *,const unsigned char *,unsigned int); +extern void krb5int_MD5Final(krb5_MD5_CTX *); #define RSA_MD5_CKSUM_LENGTH 16 #define OLD_RSA_MD5_DES_CKSUM_LENGTH 16 diff --git a/src/lib/crypto/builtin/pbkdf2.c b/src/lib/crypto/builtin/pbkdf2.c index 9201e23b0..96409ba28 100644 --- a/src/lib/crypto/builtin/pbkdf2.c +++ b/src/lib/crypto/builtin/pbkdf2.c @@ -223,7 +223,7 @@ hmac_sha1(krb5_key pass, krb5_data *salt, krb5_data *out) if (debug_hmac) printd(" hmac input", salt); - err = krb5_hmac(h, pass, 1, salt, out); + err = krb5int_hmac(h, pass, 1, salt, out); if (err == 0 && debug_hmac) printd(" hmac output", out); return err; |