Commit 3ab56511 authored by Richard Levitte's avatar Richard Levitte
Browse files

The experimental Rijndael code moved to the main trunk. 

make update done.
parent 82ce0b23

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
     this case.

     [Steve Henson]



  *) Added the beginnings of Rijndael support.

     [Ben Laurie]



  *) Fix for bug in DirectoryString mask setting. Add support for

     X509_NAME_print_ex() in 'req' and X509_print_ex() function

     to allow certificate printing to more controllable, additional

Makefile.org

+1 −1
Changes for Makefile.org: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ SHLIBDIRS= crypto ssl 
SDIRS=  \

	md2 md4 md5 sha mdc2 hmac ripemd \

	des rc2 rc4 rc5 idea bf cast \

	bn rsa dsa dh dso \

	bn rsa dsa dh dso rijndael \

	buffer bio stack lhash rand err objects \

	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp

apps/Makefile.ssl

+56 −18

File changed.

Preview size limit exceeded, changes collapsed.

apps/enc.c

+5 −0
Changes for apps/enc.c: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -308,6 +308,11 @@ bad: 
				LN_rc5_cfb64, LN_rc5_ofb64);

			BIO_printf(bio_err," -%-4s (%s)\n","rc5", LN_rc5_cbc);

#endif

#ifndef NO_RIJNDAEL

			BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s\n",

				   LN_rijndael_ecb_k128_b128,"","","","");

#endif

			

			goto end;

			}

		argc--;

crypto/Makefile.ssl

+1 −1
Changes for crypto/Makefile.ssl: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ SDIRS= md2 md5 sha mdc2 hmac ripemd \ 
	des rc2 rc4 rc5 idea bf cast \

	bn rsa dsa dh dso \

	buffer bio stack lhash rand err objects \

	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp

	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp rijndael



GENERAL=Makefile README crypto-lib.com install.com