WARNING! GitLab maintenance operation scheduled for this Friday between 14:00 and 19:00 (CET). During this time window, GitLab will be unavailable, and any data entered during this period may be lost. Thank you in advance for your understanding.

Commit 9021a5df authored Apr 18, 2016 by Rich Salz

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>

parent 84f4f0bd

apps/speed.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1667,7 +1667,7 @@ int speed_main(int argc, char **argv)
		Camellia_set_key(ckey32, 256, &camellia_ks3);
		#endif
		#ifndef OPENSSL_NO_IDEA
		idea_set_encrypt_key(key16, &idea_ks);
		IDEA_set_encrypt_key(key16, &idea_ks);
		#endif
		#ifndef OPENSSL_NO_SEED
		SEED_set_key(key16, &seed_ks);
		@@ -2202,7 +2202,7 @@ int speed_main(int argc, char **argv)
		}
		Time_F(START);
		for (count = 0, run = 1; COND(c[D_CBC_IDEA][testnum]); count++)
		idea_cbc_encrypt(loopargs[0].buf, loopargs[0].buf,
		IDEA_cbc_encrypt(loopargs[0].buf, loopargs[0].buf,
		(unsigned long)lengths[testnum], &idea_ks,
		iv, IDEA_ENCRYPT);
		d = Time_F(STOP);
		@@ -2693,7 +2693,7 @@ int speed_main(int argc, char **argv)
		#endif
		printf("%s ", AES_options());
		#ifndef OPENSSL_NO_IDEA
		printf("%s ", idea_options());
		printf("%s ", IDEA_options());
		#endif
		#ifndef OPENSSL_NO_BF
		printf("%s ", BF_options());

apps/version.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -222,7 +222,7 @@ int version_main(int argc, char **argv)
		printf("%s ", DES_options());
		#endif
		#ifndef OPENSSL_NO_IDEA
		printf("%s ", idea_options());
		printf("%s ", IDEA_options());
		#endif
		#ifndef OPENSSL_NO_BF
		printf("%s ", BF_options());

crypto/bn/bn_const.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@
		* RFC2412 specifies a generator of of 22.
		*/

		BIGNUM get_rfc2409_prime_768(BIGNUM bn)
		BIGNUM BN_get_rfc2409_prime_768(BIGNUM bn)
		{
		static const unsigned char RFC2409_PRIME_768[] = {
		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
		@@ -39,7 +39,7 @@ BIGNUM get_rfc2409_prime_768(BIGNUM bn)
		* RFC2412 specifies a generator of 22.
		*/

		BIGNUM get_rfc2409_prime_1024(BIGNUM bn)
		BIGNUM BN_get_rfc2409_prime_1024(BIGNUM bn)
		{
		static const unsigned char RFC2409_PRIME_1024[] = {
		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
		@@ -71,7 +71,7 @@ BIGNUM get_rfc2409_prime_1024(BIGNUM bn)
		* RFC2312 specifies a generator of 22.
		*/

		BIGNUM get_rfc3526_prime_1536(BIGNUM bn)
		BIGNUM BN_get_rfc3526_prime_1536(BIGNUM bn)
		{
		static const unsigned char RFC3526_PRIME_1536[] = {
		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
		@@ -110,7 +110,7 @@ BIGNUM get_rfc3526_prime_1536(BIGNUM bn)
		* RFC3526 specifies a generator of 2.
		*/

		BIGNUM get_rfc3526_prime_2048(BIGNUM bn)
		BIGNUM BN_get_rfc3526_prime_2048(BIGNUM bn)
		{
		static const unsigned char RFC3526_PRIME_2048[] = {
		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
		@@ -157,7 +157,7 @@ BIGNUM get_rfc3526_prime_2048(BIGNUM bn)
		* RFC3526 specifies a generator of 2.
		*/

		BIGNUM get_rfc3526_prime_3072(BIGNUM bn)
		BIGNUM BN_get_rfc3526_prime_3072(BIGNUM bn)
		{
		static const unsigned char RFC3526_PRIME_3072[] = {
		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
		@@ -220,7 +220,7 @@ BIGNUM get_rfc3526_prime_3072(BIGNUM bn)
		* RFC3526 specifies a generator of 2.
		*/

		BIGNUM get_rfc3526_prime_4096(BIGNUM bn)
		BIGNUM BN_get_rfc3526_prime_4096(BIGNUM bn)
		{
		static const unsigned char RFC3526_PRIME_4096[] = {
		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
		@@ -299,7 +299,7 @@ BIGNUM get_rfc3526_prime_4096(BIGNUM bn)
		* RFC3526 specifies a generator of 2.
		*/

		BIGNUM get_rfc3526_prime_6144(BIGNUM bn)
		BIGNUM BN_get_rfc3526_prime_6144(BIGNUM bn)
		{
		static const unsigned char RFC3526_PRIME_6144[] = {
		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
		@@ -410,7 +410,7 @@ BIGNUM get_rfc3526_prime_6144(BIGNUM bn)
		* RFC3526 specifies a generator of 2.
		*/

		BIGNUM get_rfc3526_prime_8192(BIGNUM bn)
		BIGNUM BN_get_rfc3526_prime_8192(BIGNUM bn)
		{
		static const unsigned char RFC3526_PRIME_8192[] = {
		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,

crypto/evp/e_idea.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@
		# include "internal/evp_int.h"
		# include <openssl/idea.h>

		/* Can't use IMPLEMENT_BLOCK_CIPHER because idea_ecb_encrypt is different */
		/* Can't use IMPLEMENT_BLOCK_CIPHER because IDEA_ecb_encrypt is different */

		typedef struct {
		IDEA_KEY_SCHEDULE ks;
		@@ -74,7 +74,7 @@ static int idea_init_key(EVP_CIPHER_CTX ctx, const unsigned char key,
		const unsigned char *iv, int enc);

		/*
		* NB idea_ecb_encrypt doesn't take an 'encrypt' argument so we treat it as a
		* NB IDEA_ecb_encrypt doesn't take an 'encrypt' argument so we treat it as a
		* special case
		*/

		@@ -104,12 +104,12 @@ static int idea_init_key(EVP_CIPHER_CTX ctx, const unsigned char key,
		enc = 1;
		}
		if (enc)
		idea_set_encrypt_key(key, &EVP_C_DATA(EVP_IDEA_KEY,ctx)->ks);
		IDEA_set_encrypt_key(key, &EVP_C_DATA(EVP_IDEA_KEY,ctx)->ks);
		else {
		IDEA_KEY_SCHEDULE tmp;

		idea_set_encrypt_key(key, &tmp);
		idea_set_decrypt_key(&tmp, &EVP_C_DATA(EVP_IDEA_KEY,ctx)->ks);
		IDEA_set_encrypt_key(key, &tmp);
		IDEA_set_decrypt_key(&tmp, &EVP_C_DATA(EVP_IDEA_KEY,ctx)->ks);
		OPENSSL_cleanse((unsigned char *)&tmp, sizeof(IDEA_KEY_SCHEDULE));
		}
		return 1;

crypto/idea/i_cbc.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -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;