Commit 6f9079fd authored by Richard Levitte's avatar Richard Levitte
Browse files

Because Rijndael is more known as AES, use crypto/aes instead of 

crypto/rijndael.  Additionally, I applied the AES integration patch
from Stephen Sprunk <stephen@sprunk.org> and fiddled it to work
properly with the normal EVP constructs (and incidently work the same
way as all other symmetric cipher implementations).

This results in an API that looks a lot like the rest of the OpenSSL
cipher suite.
parent c938563a

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -12,6 +12,11 @@ 
         *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7

         +) applies to 0.9.7 only



  +) Change the AES code to follow the same name structure as all other

     symmetric ciphers, and behave the same way.  Move everything to

     the directory crypto/aes, thereby obsoleting crypto/rijndael.

     [Stephen Sprunk <stephen@sprunk.org> and Richard Levitte]



  *) Fix ssl3_read_bytes (ssl/s3_pkt.c): To ignore messages of unknown

     type, we must throw them away by setting rr->length to 0.

     [D P Chang <dpc@qualys.com>]

Makefile.org

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ SHLIBDIRS= crypto ssl 
SDIRS=  \

	md2 md4 md5 sha mdc2 hmac ripemd \

	des rc2 rc4 rc5 idea bf cast \

	bn ec rsa dsa dh dso engine rijndael \

	bn ec rsa dsa dh dso engine aes \

	buffer bio stack lhash rand err objects \

	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5

crypto/Makefile.ssl

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ LIBS= 


SDIRS=	md2 md5 sha mdc2 hmac ripemd \

	des rc2 rc4 rc5 idea bf cast \

	bn ec rsa dsa dh dso engine rijndael \

	bn ec rsa dsa dh dso engine aes \

	buffer bio stack lhash rand err objects \

	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5

crypto/aes/Makefile.ssl

0 → 100644
+92 −0
Original line number Diff line number Diff line 
#

# crypto/aes/Makefile

#



DIR=	aes

TOP=	../..

CC=	cc

CPP=	$(CC) -E

INCLUDES=

CFLAG=-g

INSTALL_PREFIX=

OPENSSLDIR=     /usr/local/ssl

INSTALLTOP=	/usr/local/ssl

MAKE=		make -f Makefile.ssl

MAKEDEPPROG=	makedepend

MAKEDEPEND=	$(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)

MAKEFILE=	Makefile.ssl

AR=		ar r



# CFLAGS= -mpentiumpro $(INCLUDES) $(CFLAG) -O3 -fexpensive-optimizations -funroll-loops -fforce-addr

CFLAGS= $(INCLUDES) $(CFLAG)



GENERAL=Makefile

TEST=aestest.c

APPS=



LIB=$(TOP)/libcrypto.a

LIBSRC=aes_core.c aes_misc.c aes_ecb.c aes_cbc.c

LIBOBJ=aes_core.o aes_misc.o aes_ecb.o aes_cbc.o



SRC= $(LIBSRC)



EXHEADER= aes.h

HEADER= aes_locl.h $(EXHEADER)



ALL=    $(GENERAL) $(SRC) $(HEADER)



top:

	(cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)



all:	lib



lib:	$(LIBOBJ)

	$(AR) $(LIB) $(LIBOBJ)

	$(RANLIB) $(LIB) || echo Never mind.

	@touch lib



$(LIBOBJ): $(LIBSRC)



files:

	$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO



links:

	@$(TOP)/util/point.sh Makefile.ssl Makefile

	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)

	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)

	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)



install: installs



installs:

	@for i in $(EXHEADER) ; \

	do  \

	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \

	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \

	done;



tags:

	ctags $(SRC)



tests:



lint:

	lint -DLINT $(INCLUDES) $(SRC)>fluff



depend:

	$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)



dclean:

	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

	mv -f Makefile.new $(MAKEFILE)



clean:

	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff



# DO NOT DELETE THIS LINE -- make depend depends on it.



aes_cbc.o: ../../include/openssl/aes.h aes_cbc.c aes_locl.h

aes_core.o: ../../include/openssl/aes.h aes_core.c aes_locl.h

aes_ecb.o: ../../include/openssl/aes.h aes_ecb.c aes_locl.h

aes_misc.o: ../../include/openssl/aes.h ../../include/openssl/opensslv.h

aes_misc.o: aes_locl.h aes_misc.c

crypto/aes/README

0 → 100644
+3 −0
Original line number Diff line number Diff line 
This is an OpenSSL-compatible version of AES (also called Rijndael).

aes_core.c is basically the same as rijndael-alg-fst.c but with an

API that looks like the rest of the OpenSSL symmetric cipher suite.