diff options
author | miod <> | 2014-11-17 20:31:22 +0000 |
---|---|---|
committer | miod <> | 2014-11-17 20:31:22 +0000 |
commit | bfbfc9f97202a8cab8435a93df289559bfa32d7f (patch) | |
tree | c7f0941adc30ef30ee635c54679ff29bee78f41d /src/lib/libcrypto/arch/arm | |
parent | 1c596fb88a1bcb37040846b2e74feebb7d15fa27 (diff) | |
download | openbsd-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/arch/arm')
-rw-r--r-- | src/lib/libcrypto/arch/arm/Makefile.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/libcrypto/arch/arm/Makefile.inc b/src/lib/libcrypto/arch/arm/Makefile.inc index 08179b7283..22145a79cc 100644 --- a/src/lib/libcrypto/arch/arm/Makefile.inc +++ b/src/lib/libcrypto/arch/arm/Makefile.inc | |||
@@ -14,6 +14,8 @@ CFLAGS+= -DOPENSSL_BN_ASM_MONT | |||
14 | SSLASM+= bn armv4-mont | 14 | SSLASM+= bn armv4-mont |
15 | CFLAGS+= -DOPENSSL_BN_ASM_GF2m | 15 | CFLAGS+= -DOPENSSL_BN_ASM_GF2m |
16 | SSLASM+= bn armv4-gf2m | 16 | SSLASM+= bn armv4-gf2m |
17 | # camellia | ||
18 | SRCS+= camellia.c cmll_cbc.c cmll_misc.c | ||
17 | # des | 19 | # des |
18 | SRCS+= des_enc.c fcrypt_b.c | 20 | SRCS+= des_enc.c fcrypt_b.c |
19 | # modes | 21 | # modes |