Camellia cipher, contributed by NTT (f3dea9a5) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+13 −0

Original line number	Diff line number	Diff line
		@@ -284,8 +284,21 @@
		*) Add print and set support for Issuing Distribution Point CRL extension.
		[Steve Henson]

		*) Change 'Configure' script to enable Camellia by default.
		[NTT]

		Changes between 0.9.8b and 0.9.8c [xx XXX xxxx]

		*) Add the symmetric cipher Camellia (128-bit, 192-bit, 256-bit key
		versions), which is now available for royalty-free use
		(see http://info.isl.ntt.co.jp/crypt/eng/info/chiteki.html).
		Also, add Camellia TLS ciphersuites from RFC 4132.

		To minimize changes between patchlevels in the OpenSSL 0.9.8
		series, Camellia remains excluded from compilation unless OpenSSL
		is configured with 'enable-camellia'.
		[NTT]

		*) Disable the padding bug check when compression is in use. The padding
		bug check assumes the first packet is of even length, this is not
		necessarily true if compresssion is enabled and can result in false

Makefile.org

+1 −1

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ SHLIBDIRS= crypto ssl
		SDIRS= \
		objects \
		md2 md4 md5 sha mdc2 hmac ripemd whrlpool \
		des aes rc2 rc4 rc5 idea bf cast \
		des aes rc2 rc4 rc5 idea bf cast camellia \
		bn ec rsa dsa ecdsa dh ecdh dso engine \
		buffer bio stack lhash rand err \
		evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \

apps/Makefile

+21 −20

Original line number	Diff line number	Diff line
		@@ -865,26 +865,27 @@ smime.o: ../include/openssl/x509v3.h apps.h smime.c
		speed.o: ../e_os.h ../include/openssl/aes.h ../include/openssl/asn1.h
		speed.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
		speed.o: ../include/openssl/bn.h ../include/openssl/buffer.h
		speed.o: ../include/openssl/cast.h ../include/openssl/conf.h
		speed.o: ../include/openssl/crypto.h ../include/openssl/des.h
		speed.o: ../include/openssl/des_old.h ../include/openssl/dsa.h
		speed.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
		speed.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
		speed.o: ../include/openssl/engine.h ../include/openssl/err.h
		speed.o: ../include/openssl/evp.h ../include/openssl/hmac.h
		speed.o: ../include/openssl/idea.h ../include/openssl/lhash.h
		speed.o: ../include/openssl/md2.h ../include/openssl/md4.h
		speed.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h
		speed.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
		speed.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
		speed.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
		speed.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
		speed.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
		speed.o: ../include/openssl/safestack.h ../include/openssl/sha.h
		speed.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
		speed.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
		speed.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h
		speed.o: ../include/openssl/x509_vfy.h apps.h speed.c testdsa.h testrsa.h
		speed.o: ../include/openssl/camellia.h ../include/openssl/cast.h
		speed.o: ../include/openssl/conf.h ../include/openssl/crypto.h
		speed.o: ../include/openssl/des.h ../include/openssl/des_old.h
		speed.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
		speed.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
		speed.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
		speed.o: ../include/openssl/err.h ../include/openssl/evp.h
		speed.o: ../include/openssl/hmac.h ../include/openssl/idea.h
		speed.o: ../include/openssl/lhash.h ../include/openssl/md2.h
		speed.o: ../include/openssl/md4.h ../include/openssl/md5.h
		speed.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
		speed.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
		speed.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
		speed.o: ../include/openssl/rand.h ../include/openssl/rc2.h
		speed.o: ../include/openssl/rc4.h ../include/openssl/ripemd.h
		speed.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
		speed.o: ../include/openssl/sha.h ../include/openssl/stack.h
		speed.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
		speed.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
		speed.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h speed.c
		speed.o: testdsa.h testrsa.h
		spkac.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
		spkac.o: ../include/openssl/buffer.h ../include/openssl/conf.h
		spkac.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h

apps/dsa.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -84,6 +84,9 @@
		* -aes128 - encrypt output if PEM format
		* -aes192 - encrypt output if PEM format
		* -aes256 - encrypt output if PEM format
		* -camellia128 - encrypt output if PEM format
		* -camellia192 - encrypt output if PEM format
		* -camellia256 - encrypt output if PEM format
		* -text - print a text version
		* -modulus - print the DSA public key
		*/
		@@ -219,6 +222,10 @@ bad:
		#ifndef OPENSSL_NO_AES
		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
		BIO_printf(bio_err," encrypt PEM output with cbc aes\n");
		#endif
		#ifndef OPENSSL_NO_CAMELLIA
		BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
		BIO_printf(bio_err," encrypt PEM output with cbc camellia\n");
		#endif
		BIO_printf(bio_err," -text print the key in text\n");
		BIO_printf(bio_err," -noout don't print key out\n");

apps/gendsa.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -147,6 +147,14 @@ int MAIN(int argc, char **argv)
		enc=EVP_aes_192_cbc();
		else if (strcmp(*argv,"-aes256") == 0)
		enc=EVP_aes_256_cbc();
		#endif
		#ifndef OPENSSL_NO_CAMELLIA
		else if (strcmp(*argv,"-camellia128") == 0)
		enc=EVP_camellia_128_cbc();
		else if (strcmp(*argv,"-camellia192") == 0)
		enc=EVP_camellia_192_cbc();
		else if (strcmp(*argv,"-camellia256") == 0)
		enc=EVP_camellia_256_cbc();
		#endif
		else if (**argv != '-' && dsaparams == NULL)
		{
		@@ -174,6 +182,10 @@ bad:
		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
		BIO_printf(bio_err," encrypt PEM output with cbc aes\n");
		#endif
		#ifndef OPENSSL_NO_CAMELLIA
		BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
		BIO_printf(bio_err," encrypt PEM output with cbc camellia\n");
		#endif
		#ifndef OPENSSL_NO_ENGINE
		BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
		#endif