From bfbfc9f97202a8cab8435a93df289559bfa32d7f Mon Sep 17 00:00:00 2001
From: miod <>
Date: Mon, 17 Nov 2014 20:31:22 +0000
Subject: 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.
---
 src/lib/libcrypto/crypto/arch/alpha/Makefile.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/lib/libcrypto/crypto/arch/alpha')

diff --git a/src/lib/libcrypto/crypto/arch/alpha/Makefile.inc b/src/lib/libcrypto/crypto/arch/alpha/Makefile.inc
index 9c9d77ea75..82fa9fc1f4 100644
--- a/src/lib/libcrypto/crypto/arch/alpha/Makefile.inc
+++ b/src/lib/libcrypto/crypto/arch/alpha/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.2 2014/05/03 17:23:55 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.3 2014/11/17 20:31:21 miod Exp $
 
 # alpha-specific libcrypto build rules
 
@@ -10,6 +10,8 @@ SRCS+= bf_enc.c
 SRCS+= bn_asm.c
 SSLASM+= bn alpha-mont
 CFLAGS+= -DOPENSSL_BN_ASM_MONT
+# camellia
+SRCS+= camellia.c cmll_cbc.c cmll_misc.c
 # des
 SRCS+= des_enc.c fcrypt_b.c
 # modes
-- 
cgit v1.2.3-55-g6feb