aboutsummaryrefslogtreecommitdiff
path: root/update.sh
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2014-11-17 17:48:46 -0600
committerBrent Cook <bcook@openbsd.org>2014-11-17 17:48:46 -0600
commitf223e6f14dc9ffc62860a76783c722380694bf2d (patch)
treec02340349ac039f145fc3d964e7586ec7f326c1c /update.sh
parentd84aa5cbc1980d9c6a9273016d45be26a12dab7e (diff)
downloadportable-f223e6f14dc9ffc62860a76783c722380694bf2d.tar.gz
portable-f223e6f14dc9ffc62860a76783c722380694bf2d.tar.bz2
portable-f223e6f14dc9ffc62860a76783c722380694bf2d.zip
Add the Cammelia cipher to libcrypto.
from miod@: 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 'update.sh')
-rwxr-xr-xupdate.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/update.sh b/update.sh
index 97af0ff..11f6404 100755
--- a/update.sh
+++ b/update.sh
@@ -137,6 +137,9 @@ copy_crypto bn "bn_add.c bn_asm.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c
137 137
138copy_crypto buffer "buffer.c buf_err.c buf_str.c" 138copy_crypto buffer "buffer.c buf_err.c buf_str.c"
139 139
140copy_crypto camellia "cmll_cfb.c cmll_ctr.c cmll_ecb.c cmll_ofb.c camellia.c camellia.h
141 cmll_cbc.c cmll_misc.c cmll_locl.h"
142
140copy_crypto cast "c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c cast_lcl.h 143copy_crypto cast "c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c cast_lcl.h
141 cast_s.h" 144 cast_s.h"
142 145
@@ -192,7 +195,8 @@ copy_crypto evp "encode.c digest.c evp_enc.c evp_key.c e_des.c e_bf.c
192 p_dec.c bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c c_all.c c_allc.c 195 p_dec.c bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c c_all.c c_allc.c
193 c_alld.c evp_lib.c evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c 196 c_alld.c evp_lib.c evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c
194 e_old.c pmeth_lib.c pmeth_fn.c pmeth_gn.c m_sigver.c e_aes_cbc_hmac_sha1.c 197 e_old.c pmeth_lib.c pmeth_fn.c pmeth_gn.c m_sigver.c e_aes_cbc_hmac_sha1.c
195 e_rc4_hmac_md5.c evp_locl.h e_chacha.c evp_aead.c e_chacha20poly1305.c" 198 e_rc4_hmac_md5.c evp_locl.h e_chacha.c evp_aead.c e_chacha20poly1305.c
199 e_camellia.c"
196 200
197copy_crypto hmac "hmac.c hm_ameth.c hm_pmeth.c" 201copy_crypto hmac "hmac.c hm_ameth.c hm_pmeth.c"
198 202