Browse Source

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.
OPENBSD_5_7
miod 10 years ago
parent
commit
b4b58e435d
12 changed files with 33 additions and 12 deletions
  1. +2
    -2
      src/lib/libcrypto/crypto/Makefile
  2. +3
    -1
      src/lib/libcrypto/crypto/arch/alpha/Makefile.inc
  3. +4
    -1
      src/lib/libcrypto/crypto/arch/amd64/Makefile.inc
  4. +2
    -0
      src/lib/libcrypto/crypto/arch/arm/Makefile.inc
  5. +3
    -1
      src/lib/libcrypto/crypto/arch/hppa/Makefile.inc
  6. +3
    -1
      src/lib/libcrypto/crypto/arch/i386/Makefile.inc
  7. +3
    -1
      src/lib/libcrypto/crypto/arch/mips64/Makefile.inc
  8. +3
    -1
      src/lib/libcrypto/crypto/arch/powerpc/Makefile.inc
  9. +3
    -1
      src/lib/libcrypto/crypto/arch/sparc/Makefile.inc
  10. +3
    -1
      src/lib/libcrypto/crypto/arch/sparc64/Makefile.inc
  11. +3
    -1
      src/lib/libcrypto/crypto/arch/vax/Makefile.inc
  12. +1
    -1
      src/lib/libcrypto/crypto/shlib_version

+ 2
- 2
src/lib/libcrypto/crypto/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.47 2014/11/09 19:17:11 miod Exp $
# $OpenBSD: Makefile,v 1.48 2014/11/17 20:31:20 miod Exp $
LIB= crypto LIB= crypto
@ -72,7 +72,7 @@ SRCS+= bn_depr.c bn_const.c bn_x931p.c
SRCS+= buffer.c buf_err.c buf_str.c SRCS+= buffer.c buf_err.c buf_str.c
# camellia/ # camellia/
#SRCS+= cmll_ecb.c cmll_ofb.c cmll_cfb.c cmll_ctr.c cmll_utl.c
SRCS+= cmll_cfb.c cmll_ctr.c cmll_ecb.c cmll_ofb.c
# cast/ # cast/
SRCS+= c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c SRCS+= c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c


+ 3
- 1
src/lib/libcrypto/crypto/arch/alpha/Makefile.inc View File

@ -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 # alpha-specific libcrypto build rules
@ -10,6 +10,8 @@ SRCS+= bf_enc.c
SRCS+= bn_asm.c SRCS+= bn_asm.c
SSLASM+= bn alpha-mont SSLASM+= bn alpha-mont
CFLAGS+= -DOPENSSL_BN_ASM_MONT CFLAGS+= -DOPENSSL_BN_ASM_MONT
# camellia
SRCS+= camellia.c cmll_cbc.c cmll_misc.c
# des # des
SRCS+= des_enc.c fcrypt_b.c SRCS+= des_enc.c fcrypt_b.c
# modes # modes


+ 4
- 1
src/lib/libcrypto/crypto/arch/amd64/Makefile.inc View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.3 2014/08/11 13:29:43 bcook Exp $
# $OpenBSD: Makefile.inc,v 1.4 2014/11/17 20:31:21 miod Exp $
# amd64-specific libcrypto build rules # amd64-specific libcrypto build rules
@ -23,6 +23,9 @@ CFLAGS+= -DOPENSSL_BN_ASM_MONT5
SSLASM+= bn x86_64-mont5 SSLASM+= bn x86_64-mont5
CFLAGS+= -DOPENSSL_BN_ASM_GF2m CFLAGS+= -DOPENSSL_BN_ASM_GF2m
SSLASM+= bn x86_64-gf2m SSLASM+= bn x86_64-gf2m
# camellia
SRCS+= cmll_misc.c
SSLASM+= camellia cmll-x86_64
# des # des
SRCS+= des_enc.c fcrypt_b.c SRCS+= des_enc.c fcrypt_b.c
# md5 # md5


+ 2
- 0
src/lib/libcrypto/crypto/arch/arm/Makefile.inc View File

@ -14,6 +14,8 @@ CFLAGS+= -DOPENSSL_BN_ASM_MONT
SSLASM+= bn armv4-mont SSLASM+= bn armv4-mont
CFLAGS+= -DOPENSSL_BN_ASM_GF2m CFLAGS+= -DOPENSSL_BN_ASM_GF2m
SSLASM+= bn armv4-gf2m SSLASM+= bn armv4-gf2m
# camellia
SRCS+= camellia.c cmll_cbc.c cmll_misc.c
# des # des
SRCS+= des_enc.c fcrypt_b.c SRCS+= des_enc.c fcrypt_b.c
# modes # modes


+ 3
- 1
src/lib/libcrypto/crypto/arch/hppa/Makefile.inc View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.6 2014/09/27 20:42:38 miod Exp $
# $OpenBSD: Makefile.inc,v 1.7 2014/11/17 20:31:21 miod Exp $
# hppa-specific libcrypto build rules # hppa-specific libcrypto build rules
@ -12,6 +12,8 @@ SRCS+= bf_enc.c
SRCS+= bn_asm.c SRCS+= bn_asm.c
SSLASM+= bn parisc-mont parisc-mont SSLASM+= bn parisc-mont parisc-mont
CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV2W CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV2W
# camellia
SRCS+= camellia.c cmll_cbc.c cmll_misc.c
# des # des
SRCS+= des_enc.c fcrypt_b.c SRCS+= des_enc.c fcrypt_b.c
# modes # modes


+ 3
- 1
src/lib/libcrypto/crypto/arch/i386/Makefile.inc View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.3 2014/05/07 00:04:14 deraadt Exp $
# $OpenBSD: Makefile.inc,v 1.4 2014/11/17 20:31:22 miod Exp $
# i386-specific libcrypto build rules # i386-specific libcrypto build rules
@ -20,6 +20,8 @@ CFLAGS+= -DOPENSSL_BN_ASM_MONT
SSLASM+= bn x86-mont SSLASM+= bn x86-mont
CFLAGS+= -DOPENSSL_BN_ASM_GF2m CFLAGS+= -DOPENSSL_BN_ASM_GF2m
SSLASM+= bn x86-gf2m SSLASM+= bn x86-gf2m
# camellia
SSLASM+= camellia cmll-x86
# des # des
SRCS+= fcrypt_b.c SRCS+= fcrypt_b.c
SSLASM+= des des-586 SSLASM+= des des-586


+ 3
- 1
src/lib/libcrypto/crypto/arch/mips64/Makefile.inc View File

@ -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 # mips64-specific libcrypto build rules
@ -12,6 +12,8 @@ SRCS+= bf_enc.c
SSLASM+= bn mips bn-mips SSLASM+= bn mips bn-mips
SSLASM+= bn mips-mont mips-mont SSLASM+= bn mips-mont mips-mont
CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV3W CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV3W
# camellia
SRCS+= camellia.c cmll_cbc.c cmll_misc.c
# des # des
SRCS+= des_enc.c fcrypt_b.c SRCS+= des_enc.c fcrypt_b.c
# rc4 # rc4


+ 3
- 1
src/lib/libcrypto/crypto/arch/powerpc/Makefile.inc View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.1 2014/05/03 11:41:05 miod Exp $
# $OpenBSD: Makefile.inc,v 1.2 2014/11/17 20:31:22 miod Exp $
# powerpc-specific libcrypto build rules # powerpc-specific libcrypto build rules
@ -14,6 +14,8 @@ SSLASM+= bn ppc bn-ppc
SSLASM+= bn ppc-mont ppc-mont # bn_mul_mont_int SSLASM+= bn ppc-mont ppc-mont # bn_mul_mont_int
#SSLASM+= bn ppc64-mont ppc64-mont # bn_mul_mont_fpu64 #SSLASM+= bn ppc64-mont ppc64-mont # bn_mul_mont_fpu64
CFLAGS+= -DOPENSSL_BN_ASM_MONT CFLAGS+= -DOPENSSL_BN_ASM_MONT
# camellia
SRCS+= camellia.c cmll_cbc.c cmll_misc.c
# des # des
SRCS+= des_enc.c fcrypt_b.c SRCS+= des_enc.c fcrypt_b.c
# rc4 # rc4


+ 3
- 1
src/lib/libcrypto/crypto/arch/sparc/Makefile.inc View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.1 2014/05/05 04:44:54 miod Exp $
# $OpenBSD: Makefile.inc,v 1.2 2014/11/17 20:31:22 miod Exp $
# sparc-specific libcrypto build rules # sparc-specific libcrypto build rules
@ -13,6 +13,8 @@ SRCS+= sparcv8.S
.else .else
SRCS+= bn_asm.c SRCS+= bn_asm.c
.endif .endif
# camellia
SRCS+= camellia.c cmll_cbc.c cmll_misc.c
# des # des
SRCS+= fcrypt_b.c SRCS+= fcrypt_b.c
SRCS+= des_enc-sparc.S SRCS+= des_enc-sparc.S


+ 3
- 1
src/lib/libcrypto/crypto/arch/sparc64/Makefile.inc View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.1 2014/05/03 20:06:13 miod Exp $
# $OpenBSD: Makefile.inc,v 1.2 2014/11/17 20:31:22 miod Exp $
# sparc64-specific libcrypto build rules # sparc64-specific libcrypto build rules
@ -10,6 +10,8 @@ SSLASM+= aes aes-sparcv9 aes-sparcv9
SRCS+= bf_enc.c SRCS+= bf_enc.c
# bn # bn
SRCS+= bn_asm.c SRCS+= bn_asm.c
# camellia
SRCS+= camellia.c cmll_cbc.c cmll_misc.c
# des # des
SRCS+= fcrypt_b.c SRCS+= fcrypt_b.c
SRCS+= des_enc-sparc.S SRCS+= des_enc-sparc.S


+ 3
- 1
src/lib/libcrypto/crypto/arch/vax/Makefile.inc View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.1 2014/05/04 17:13:05 miod Exp $
# $OpenBSD: Makefile.inc,v 1.2 2014/11/17 20:31:22 miod Exp $
# vax-specific libcrypto build rules # vax-specific libcrypto build rules
@ -9,6 +9,8 @@ SRCS+= aes_core.c aes_cbc.c
SRCS+= bf_enc.c SRCS+= bf_enc.c
# bn # bn
SRCS+= bn_asm_vax.S SRCS+= bn_asm_vax.S
# camellia
SRCS+= camellia.c cmll_cbc.c cmll_misc.c
# des # des
SRCS+= des_enc.c fcrypt_b.c SRCS+= des_enc.c fcrypt_b.c
# rc4 # rc4


+ 1
- 1
src/lib/libcrypto/crypto/shlib_version View File

@ -1,2 +1,2 @@
major=30 major=30
minor=2
minor=3

Loading…
Cancel
Save