diff options
author | Rich Salz <rsalz@openssl.org> | 2016-04-18 13:43:54 +0200 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-04-18 14:22:00 +0200 |
commit | 9021a5dfb37fd3a6f7726f07ef0f27dcb71048e2 (patch) | |
tree | 1676ab2e59a9fe9a859c2b7e55a4ddfcd7e2be21 /crypto/idea | |
parent | NOTES files will contain more requirements, make that explicit (diff) | |
download | openssl-9021a5dfb37fd3a6f7726f07ef0f27dcb71048e2.tar.xz openssl-9021a5dfb37fd3a6f7726f07ef0f27dcb71048e2.zip |
Rename some lowercase API's
Make OBJ_name_cmp internal
Rename idea_xxx to IDEA_xxx
Rename get_rfc_xxx to BN_get_rfc_xxx
Rename v3_addr and v3_asid functions to X509v3_...
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/idea')
-rw-r--r-- | crypto/idea/i_cbc.c | 12 | ||||
-rw-r--r-- | crypto/idea/i_cfb64.c | 6 | ||||
-rw-r--r-- | crypto/idea/i_ecb.c | 6 | ||||
-rw-r--r-- | crypto/idea/i_ofb64.c | 4 | ||||
-rw-r--r-- | crypto/idea/i_skey.c | 4 |
5 files changed, 16 insertions, 16 deletions
diff --git a/crypto/idea/i_cbc.c b/crypto/idea/i_cbc.c index e1c5b2d719..5cdcc64a67 100644 --- a/crypto/idea/i_cbc.c +++ b/crypto/idea/i_cbc.c @@ -58,7 +58,7 @@ #include <openssl/idea.h> #include "idea_lcl.h" -void idea_cbc_encrypt(const unsigned char *in, unsigned char *out, +void IDEA_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv, int encrypt) { @@ -78,7 +78,7 @@ void idea_cbc_encrypt(const unsigned char *in, unsigned char *out, tin1 ^= tout1; tin[0] = tin0; tin[1] = tin1; - idea_encrypt(tin, ks); + IDEA_encrypt(tin, ks); tout0 = tin[0]; l2n(tout0, out); tout1 = tin[1]; @@ -90,7 +90,7 @@ void idea_cbc_encrypt(const unsigned char *in, unsigned char *out, tin1 ^= tout1; tin[0] = tin0; tin[1] = tin1; - idea_encrypt(tin, ks); + IDEA_encrypt(tin, ks); tout0 = tin[0]; l2n(tout0, out); tout1 = tin[1]; @@ -107,7 +107,7 @@ void idea_cbc_encrypt(const unsigned char *in, unsigned char *out, tin[0] = tin0; n2l(in, tin1); tin[1] = tin1; - idea_encrypt(tin, ks); + IDEA_encrypt(tin, ks); tout0 = tin[0] ^ xor0; tout1 = tin[1] ^ xor1; l2n(tout0, out); @@ -120,7 +120,7 @@ void idea_cbc_encrypt(const unsigned char *in, unsigned char *out, tin[0] = tin0; n2l(in, tin1); tin[1] = tin1; - idea_encrypt(tin, ks); + IDEA_encrypt(tin, ks); tout0 = tin[0] ^ xor0; tout1 = tin[1] ^ xor1; l2nn(tout0, tout1, out, l + 8); @@ -134,7 +134,7 @@ void idea_cbc_encrypt(const unsigned char *in, unsigned char *out, tin[0] = tin[1] = 0; } -void idea_encrypt(unsigned long *d, IDEA_KEY_SCHEDULE *key) +void IDEA_encrypt(unsigned long *d, IDEA_KEY_SCHEDULE *key) { register IDEA_INT *p; register unsigned long x1, x2, x3, x4, t0, t1, ul; diff --git a/crypto/idea/i_cfb64.c b/crypto/idea/i_cfb64.c index 557cd4d2ac..f6ed632749 100644 --- a/crypto/idea/i_cfb64.c +++ b/crypto/idea/i_cfb64.c @@ -64,7 +64,7 @@ * used is contained in *num; */ -void idea_cfb64_encrypt(const unsigned char *in, unsigned char *out, +void IDEA_cfb64_encrypt(const unsigned char *in, unsigned char *out, long length, IDEA_KEY_SCHEDULE *schedule, unsigned char *ivec, int *num, int encrypt) { @@ -82,7 +82,7 @@ void idea_cfb64_encrypt(const unsigned char *in, unsigned char *out, ti[0] = v0; n2l(iv, v1); ti[1] = v1; - idea_encrypt((unsigned long *)ti, schedule); + IDEA_encrypt((unsigned long *)ti, schedule); iv = (unsigned char *)ivec; t = ti[0]; l2n(t, iv); @@ -102,7 +102,7 @@ void idea_cfb64_encrypt(const unsigned char *in, unsigned char *out, ti[0] = v0; n2l(iv, v1); ti[1] = v1; - idea_encrypt((unsigned long *)ti, schedule); + IDEA_encrypt((unsigned long *)ti, schedule); iv = (unsigned char *)ivec; t = ti[0]; l2n(t, iv); diff --git a/crypto/idea/i_ecb.c b/crypto/idea/i_ecb.c index e7eeb4f937..9ab64b7dca 100644 --- a/crypto/idea/i_ecb.c +++ b/crypto/idea/i_ecb.c @@ -59,12 +59,12 @@ #include "idea_lcl.h" #include <openssl/opensslv.h> -const char *idea_options(void) +const char *IDEA_options(void) { return ("idea(int)"); } -void idea_ecb_encrypt(const unsigned char *in, unsigned char *out, +void IDEA_ecb_encrypt(const unsigned char *in, unsigned char *out, IDEA_KEY_SCHEDULE *ks) { unsigned long l0, l1, d[2]; @@ -73,7 +73,7 @@ void idea_ecb_encrypt(const unsigned char *in, unsigned char *out, d[0] = l0; n2l(in, l1); d[1] = l1; - idea_encrypt(d, ks); + IDEA_encrypt(d, ks); l0 = d[0]; l2n(l0, out); l1 = d[1]; diff --git a/crypto/idea/i_ofb64.c b/crypto/idea/i_ofb64.c index 64f128eff4..174f6354d6 100644 --- a/crypto/idea/i_ofb64.c +++ b/crypto/idea/i_ofb64.c @@ -63,7 +63,7 @@ * The extra state information to record how much of the 64bit block we have * used is contained in *num; */ -void idea_ofb64_encrypt(const unsigned char *in, unsigned char *out, +void IDEA_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length, IDEA_KEY_SCHEDULE *schedule, unsigned char *ivec, int *num) { @@ -86,7 +86,7 @@ void idea_ofb64_encrypt(const unsigned char *in, unsigned char *out, l2n(v1, dp); while (l--) { if (n == 0) { - idea_encrypt((unsigned long *)ti, schedule); + IDEA_encrypt((unsigned long *)ti, schedule); dp = (char *)d; t = ti[0]; l2n(t, dp); diff --git a/crypto/idea/i_skey.c b/crypto/idea/i_skey.c index c30547795f..c86140ffba 100644 --- a/crypto/idea/i_skey.c +++ b/crypto/idea/i_skey.c @@ -59,7 +59,7 @@ #include "idea_lcl.h" static IDEA_INT inverse(unsigned int xin); -void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks) +void IDEA_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks) { int i; register IDEA_INT *kt, *kf, r0, r1, r2; @@ -99,7 +99,7 @@ void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks) } } -void idea_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk) +void IDEA_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk) { int r; register IDEA_INT *fp, *tp, t; |