summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/camellia
diff options
context:
space:
mode:
authormiod <>2014-11-17 20:31:22 +0000
committermiod <>2014-11-17 20:31:22 +0000
commitbfbfc9f97202a8cab8435a93df289559bfa32d7f (patch)
treec7f0941adc30ef30ee635c54679ff29bee78f41d /src/lib/libcrypto/camellia
parent1c596fb88a1bcb37040846b2e74feebb7d15fa27 (diff)
downloadopenbsd-bfbfc9f97202a8cab8435a93df289559bfa32d7f.tar.gz
openbsd-bfbfc9f97202a8cab8435a93df289559bfa32d7f.tar.bz2
openbsd-bfbfc9f97202a8cab8435a93df289559bfa32d7f.zip
Add the Cammelia cipher to libcrypto.
There used to be a strong reluctance to provide this cipher in LibreSSL in the past, because the licence terms under which Cammelia was released by NTT were free-but-not-in-the-corners, by restricting the right to modify the source code, as well retaining the right to enforce their patents against anyone in the future. However, as stated in http://www.ntt.co.jp/news/news06e/0604/060413a.html , NTT changed its mind and made this code truly free. We only wish there had been more visibility of this, for we could have had enabled Cammelia earlier (-: Licence change noticed by deraadt@. General agreement from the usual LibreSSL suspects. Crank libcrypto.so minor version due to the added symbols.
Diffstat (limited to 'src/lib/libcrypto/camellia')
-rw-r--r--src/lib/libcrypto/camellia/asm/cmll-x86.pl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/camellia/asm/cmll-x86.pl b/src/lib/libcrypto/camellia/asm/cmll-x86.pl
index c314d62312..027302ac86 100644
--- a/src/lib/libcrypto/camellia/asm/cmll-x86.pl
+++ b/src/lib/libcrypto/camellia/asm/cmll-x86.pl
@@ -723,11 +723,11 @@ my $bias=int(@T[0])?shift(@T):0;
723&function_end("Camellia_Ekeygen"); 723&function_end("Camellia_Ekeygen");
724 724
725if ($OPENSSL) { 725if ($OPENSSL) {
726# int private_Camellia_set_key ( 726# int Camellia_set_key (
727# const unsigned char *userKey, 727# const unsigned char *userKey,
728# int bits, 728# int bits,
729# CAMELLIA_KEY *key) 729# CAMELLIA_KEY *key)
730&function_begin_B("private_Camellia_set_key"); 730&function_begin_B("Camellia_set_key");
731 &push ("ebx"); 731 &push ("ebx");
732 &mov ("ecx",&wparam(0)); # pull arguments 732 &mov ("ecx",&wparam(0)); # pull arguments
733 &mov ("ebx",&wparam(1)); 733 &mov ("ebx",&wparam(1));
@@ -760,7 +760,7 @@ if ($OPENSSL) {
760&set_label("done",4); 760&set_label("done",4);
761 &pop ("ebx"); 761 &pop ("ebx");
762 &ret (); 762 &ret ();
763&function_end_B("private_Camellia_set_key"); 763&function_end_B("Camellia_set_key");
764} 764}
765 765
766@SBOX=( 766@SBOX=(