diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2014-11-17 20:31:23 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2014-11-17 20:31:23 +0000 |
| commit | 5fea17d24c5b78b8a2f38a6906a1e2d0c4c51b60 (patch) | |
| tree | b8fa0be0c2f884cce27fc0164090e2502eb4e416 /lib/libssl | |
| parent | a06c795f5a00d90ce8025ebb20c0c3e324360784 (diff) | |
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 'lib/libssl')
| -rw-r--r-- | lib/libssl/src/crypto/camellia/asm/cmll-x86.pl | 2 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/opensslfeatures.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/libssl/src/crypto/camellia/asm/cmll-x86.pl b/lib/libssl/src/crypto/camellia/asm/cmll-x86.pl index 0812815bfb8..027302ac869 100644 --- a/lib/libssl/src/crypto/camellia/asm/cmll-x86.pl +++ b/lib/libssl/src/crypto/camellia/asm/cmll-x86.pl @@ -1133,6 +1133,6 @@ my ($s0,$s1,$s2,$s3) = @T; &function_end("Camellia_cbc_encrypt"); } -&asciz("Camellia for x86 by <appro@openssl.org>"); +&asciz("Camellia for x86 by <appro\@openssl.org>"); &asm_finish(); diff --git a/lib/libssl/src/crypto/opensslfeatures.h b/lib/libssl/src/crypto/opensslfeatures.h index cf7ffeac79d..6e81fa3013e 100644 --- a/lib/libssl/src/crypto/opensslfeatures.h +++ b/lib/libssl/src/crypto/opensslfeatures.h @@ -1,4 +1,3 @@ -# define OPENSSL_NO_CAMELLIA # define OPENSSL_NO_EC_NISTP_64_GCC_128 # define OPENSSL_NO_CMS # define OPENSSL_NO_COMP |