OpenSSL: openssl/ Configure Makefile.org openssl/crypto/aes/ Mak...

  OpenSSL CVS Repository
  http://cvs.openssl.org/
 
____________________________________________________________
________________

  Server: cvs.openssl.org                  Name:   Andy
Polyakov
  Root:   /v/openssl/cvs                   Email:  approopenssl.org
  Module: openssl                          Date:  
28-Aug-2007 23:02:39
  Branch: HEAD                             Handle:
2007082822023404

  Modified files:
    openssl                 Configure Makefile.org
    openssl/crypto/aes      Makefile

  Log:
    Make naming more consistent.

  Summary:
    Revision    Changes     Path
    1.568       +2  -2      openssl/Configure
    1.283       +2  -2      openssl/Makefile.org
    1.12        +2  -2      openssl/crypto/aes/Makefile
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/Configure
 
============================================================
================
  $ cvs diff -u -r1.567 -r1.568 Configure
  --- openssl/Configure	28 Aug 2007 20:45:22 -0000	1.567
  +++ openssl/Configure	28 Aug 2007 21:02:34 -0000	1.568
   -1351,7 +1351,7 
   	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 "CPUID_OBJ     =$cpuid_objn";
   print "BN_ASM        =$bn_objn";
   print "DES_ENC       =$des_objn";
  -print "AES_ASM_OBJ   =$aes_objn";
  +print "AES_ENC       =$aes_objn";
   print "BF_ENC        =$bf_objn";
   print "CAST_ENC      =$cast_objn";
   print "RC4_ENC       =$rc4_objn";
   .
  patch -p0 <<' .'
  Index: openssl/Makefile.org
 
============================================================
================
  $ cvs diff -u -r1.282 -r1.283 Makefile.org
  --- openssl/Makefile.org	28 Aug 2007 20:45:23 -0000	1.282
  +++ openssl/Makefile.org	28 Aug 2007 21:02:36 -0000	1.283
   -88,7 +88,7 
   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 
   		PEX_LIBS='$' EX_LIBS='$'	
   		CPUID_OBJ='$'			
   		BN_ASM='$' DES_ENC='$' 	
  -		AES_ASM_OBJ='$'			
  +		AES_ENC='$' CMLL_ENC='$'	
   		BF_ENC='$' CAST_ENC='$'	
   		RC4_ENC='$' RC5_ENC='$'	
   		SHA1_ASM_OBJ='$'			
   .
  patch -p0 <<' .'
  Index: openssl/crypto/aes/Makefile
 
============================================================
================
  $ cvs diff -u -r1.11 -r1.12 Makefile
  --- openssl/crypto/aes/Makefile	30 Apr 2007 09:22:26
-0000	1.11
  +++ openssl/crypto/aes/Makefile	28 Aug 2007 21:02:38
-0000	1.12
   -11,7 +11,7 
   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 
   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)
   
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org