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 | af32d5ab328fe7957bd104c9780327d98ec7da51 (patch) | |
| tree | d440ae46b7fb9628a00bcf896d4917d6600452da /lib/libcrypto/arch/mips64 | |
| parent | 5281a5d0fd29f9673e8e3afd0fb722e045aa738d (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/libcrypto/arch/mips64')
| -rw-r--r-- | lib/libcrypto/arch/mips64/Makefile.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libcrypto/arch/mips64/Makefile.inc b/lib/libcrypto/arch/mips64/Makefile.inc index 0ae20ad5ccd..3b8f01e41cc 100644 --- a/lib/libcrypto/arch/mips64/Makefile.inc +++ b/lib/libcrypto/arch/mips64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.2 2014/05/02 21:55:31 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.3 2014/11/17 20:31:22 miod Exp $ # mips64-specific libcrypto build rules @@ -12,6 +12,8 @@ SRCS+= bf_enc.c SSLASM+= bn mips bn-mips SSLASM+= bn mips-mont mips-mont CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV3W +# camellia +SRCS+= camellia.c cmll_cbc.c cmll_misc.c # des SRCS+= des_enc.c fcrypt_b.c # rc4 |