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/hppa | |
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/hppa')
-rw-r--r-- | src/lib/libcrypto/arch/hppa/Makefile.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libcrypto/arch/hppa/Makefile.inc b/src/lib/libcrypto/arch/hppa/Makefile.inc index 8f91214a50..0f60586865 100644 --- a/src/lib/libcrypto/arch/hppa/Makefile.inc +++ b/src/lib/libcrypto/arch/hppa/Makefile.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile.inc,v 1.6 2014/09/27 20:42:38 miod Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.7 2014/11/17 20:31:21 miod Exp $ |
2 | 2 | ||
3 | # hppa-specific libcrypto build rules | 3 | # hppa-specific libcrypto build rules |
4 | 4 | ||
@@ -12,6 +12,8 @@ SRCS+= bf_enc.c | |||
12 | SRCS+= bn_asm.c | 12 | SRCS+= bn_asm.c |
13 | SSLASM+= bn parisc-mont parisc-mont | 13 | SSLASM+= bn parisc-mont parisc-mont |
14 | CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV2W | 14 | CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV2W |
15 | # camellia | ||
16 | SRCS+= camellia.c cmll_cbc.c cmll_misc.c | ||
15 | # des | 17 | # des |
16 | SRCS+= des_enc.c fcrypt_b.c | 18 | SRCS+= des_enc.c fcrypt_b.c |
17 | # modes | 19 | # modes |