Commit 0ddd3ea2 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Make naming more consistent.

parent 6a8517f2

Configure

+2 −2
Original line number Diff line number Diff line
@@ -1351,7 +1351,7 @@ while (<IN>) 
	s/^CPUID_OBJ=.*$/CPUID_OBJ= $cpuid_obj/;

	s/^BN_ASM=.*$/BN_ASM= $bn_obj/;

	s/^DES_ENC=.*$/DES_ENC= $des_obj/;

	s/^AES_ASM_OBJ=.*$/AES_ASM_OBJ= $aes_obj/;

	s/^AES_ENC=.*$/AES_ENC= $aes_obj/;

	s/^BF_ENC=.*$/BF_ENC= $bf_obj/;

	s/^CAST_ENC=.*$/CAST_ENC= $cast_obj/;

	s/^RC4_ENC=.*$/RC4_ENC= $rc4_obj/;
@@ -1403,7 +1403,7 @@ print "EX_LIBS =$lflags\n"; 
print "CPUID_OBJ     =$cpuid_obj\n";

print "BN_ASM        =$bn_obj\n";

print "DES_ENC       =$des_obj\n";

print "AES_ASM_OBJ   =$aes_obj\n";

print "AES_ENC       =$aes_obj\n";

print "BF_ENC        =$bf_obj\n";

print "CAST_ENC      =$cast_obj\n";

print "RC4_ENC       =$rc4_obj\n";

Makefile.org

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ PROCESSOR= 
CPUID_OBJ= 

BN_ASM= bn_asm.o

DES_ENC= des_enc.o fcrypt_b.o

AES_ASM_OBJ=aes_core.o aes_cbc.o

AES_ENC= aes_core.o aes_cbc.o

BF_ENC= bf_enc.o

CAST_ENC= c_enc.o

RC4_ENC= rc4_enc.o
@@ -192,7 +192,7 @@ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ 
		PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}'	\

		CPUID_OBJ='${CPUID_OBJ}'			\

		BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' 	\

		AES_ASM_OBJ='${AES_ASM_OBJ}'			\

		AES_ENC='${AES_ENC}' CMLL_ENC='${CMLL_ENC}'	\

		BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}'	\

		RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}'	\

		SHA1_ASM_OBJ='${SHA1_ASM_OBJ}'			\

crypto/aes/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ CFLAG=-g 
MAKEFILE=	Makefile

AR=		ar r



AES_ASM_OBJ=aes_core.o aes_cbc.o

AES_ENC=aes_core.o aes_cbc.o



CFLAGS= $(INCLUDES) $(CFLAG)

ASFLAGS= $(INCLUDES) $(ASFLAG)
@@ -26,7 +26,7 @@ LIB=$(TOP)/libcrypto.a 
LIBSRC=aes_core.c aes_misc.c aes_ecb.c aes_cbc.c aes_cfb.c aes_ofb.c \

       aes_ctr.c aes_ige.c

LIBOBJ=aes_misc.o aes_ecb.o aes_cfb.o aes_ofb.o aes_ctr.o aes_ige.o \

       $(AES_ASM_OBJ)

       $(AES_ENC)



SRC= $(LIBSRC)