diff options
| author | miod <> | 2014-11-17 20:31:22 +0000 |
|---|---|---|
| committer | miod <> | 2014-11-17 20:31:22 +0000 |
| commit | 1327462df8cb4ae2dc056e0de53b4b4dc50f50fa (patch) | |
| tree | c7f0941adc30ef30ee635c54679ff29bee78f41d /src/lib/libcrypto/opensslfeatures.h | |
| parent | 0a4cc04047e923468a974a735845ba9bdb958fda (diff) | |
| download | openbsd-1327462df8cb4ae2dc056e0de53b4b4dc50f50fa.tar.gz openbsd-1327462df8cb4ae2dc056e0de53b4b4dc50f50fa.tar.bz2 openbsd-1327462df8cb4ae2dc056e0de53b4b4dc50f50fa.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/opensslfeatures.h')
| -rw-r--r-- | src/lib/libcrypto/opensslfeatures.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lib/libcrypto/opensslfeatures.h b/src/lib/libcrypto/opensslfeatures.h index cf7ffeac79..6e81fa3013 100644 --- a/src/lib/libcrypto/opensslfeatures.h +++ b/src/lib/libcrypto/opensslfeatures.h | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | ||
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | 1 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 |
| 3 | # define OPENSSL_NO_CMS | 2 | # define OPENSSL_NO_CMS |
| 4 | # define OPENSSL_NO_COMP | 3 | # define OPENSSL_NO_COMP |