diff options
author | Eneas U de Queiroz <cote2004-github@yahoo.com> | 2018-10-24 11:25:00 -0300 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-02-12 22:23:26 +0100 |
commit | d872d00b2f7e31b98e11e83922d1aaefc270647e (patch) | |
tree | 70a74b004144e1a2d16c71b6d4aff626e085c498 /package/libs/openssl/patches/260-eng_devcrypto-make-sure-digest-can-do-copy.patch | |
parent | be3892284ca77a69615351b106b8dfbadad728c4 (diff) | |
download | upstream-d872d00b2f7e31b98e11e83922d1aaefc270647e.tar.gz upstream-d872d00b2f7e31b98e11e83922d1aaefc270647e.tar.bz2 upstream-d872d00b2f7e31b98e11e83922d1aaefc270647e.zip |
openssl: update to version 1.1.1a
This version adds the following functionality:
* TLS 1.3
* AFALG engine support for hardware accelleration
* x25519 ECC curve support
* CRIME protection: disable use of compression by default
* Support for ChaCha20 and Poly1305
Patches fixing bugs in the /dev/crypto engine were applied, from
https://github.com/openssl/openssl/pull/7585
This increses the size of the ipk binray on MIPS32 by about 32%:
old:
693.941 bin/packages/mips_24kc/base/libopenssl1.0.0_1.0.2q-2_mips_24kc.ipk
193.827 bin/packages/mips_24kc/base/openssl-util_1.0.2q-2_mips_24kc.ipk
new:
912.493 bin/packages/mips_24kc/base/libopenssl1.1_1.1.1a-2_mips_24kc.ipk
239.316 bin/packages/mips_24kc/base/openssl-util_1.1.1a-2_mips_24kc.ipk
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
Diffstat (limited to 'package/libs/openssl/patches/260-eng_devcrypto-make-sure-digest-can-do-copy.patch')
-rw-r--r-- | package/libs/openssl/patches/260-eng_devcrypto-make-sure-digest-can-do-copy.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/package/libs/openssl/patches/260-eng_devcrypto-make-sure-digest-can-do-copy.patch b/package/libs/openssl/patches/260-eng_devcrypto-make-sure-digest-can-do-copy.patch new file mode 100644 index 0000000000..df871920be --- /dev/null +++ b/package/libs/openssl/patches/260-eng_devcrypto-make-sure-digest-can-do-copy.patch @@ -0,0 +1,71 @@ +From 488521d77fdc1de5ae256ce0d9203e35ebc92993 Mon Sep 17 00:00:00 2001 +From: Eneas U de Queiroz <cote2004-github@yahoo.com> +Date: Sat, 8 Dec 2018 18:01:04 -0200 +Subject: [PATCH 7/7] eng_devcrypto: make sure digest can do copy + +Digest must be able to do partial-state copy to be used. + +Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> + +Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> +Reviewed-by: Richard Levitte <levitte@openssl.org> +(Merged from https://github.com/openssl/openssl/pull/7585) + +(cherry picked from commit 16e252a01b754a13e83d5e5e87afbe389997926b) + +--- a/crypto/engine/eng_devcrypto.c ++++ b/crypto/engine/eng_devcrypto.c +@@ -601,6 +601,30 @@ static int digest_cleanup(EVP_MD_CTX *ct + return 1; + } + ++static int devcrypto_test_digest(size_t digest_data_index) ++{ ++ struct session_op sess1, sess2; ++ struct cphash_op cphash; ++ int ret=0; ++ ++ memset(&sess1, 0, sizeof(sess1)); ++ memset(&sess2, 0, sizeof(sess2)); ++ sess1.mac = digest_data[digest_data_index].devcryptoid; ++ if (ioctl(cfd, CIOCGSESSION, &sess1) < 0) ++ return 0; ++ /* Make sure the driver is capable of hash state copy */ ++ sess2.mac = sess1.mac; ++ if (ioctl(cfd, CIOCGSESSION, &sess2) >= 0) { ++ cphash.src_ses = sess1.ses; ++ cphash.dst_ses = sess2.ses; ++ if (ioctl(cfd, CIOCCPHASH, &cphash) >= 0) ++ ret = 1; ++ ioctl(cfd, CIOCFSESSION, &sess2.ses); ++ } ++ ioctl(cfd, CIOCFSESSION, &sess1.ses); ++ return ret; ++} ++ + /* + * Keep a table of known nids and associated methods. + * Note that known_digest_nids[] isn't necessarily indexed the same way as +@@ -613,20 +637,14 @@ static EVP_MD *known_digest_methods[OSSL + static void prepare_digest_methods(void) + { + size_t i; +- struct session_op sess; +- +- memset(&sess, 0, sizeof(sess)); + + for (i = 0, known_digest_nids_amount = 0; i < OSSL_NELEM(digest_data); + i++) { + + /* +- * Check that the algo is really availably by trying to open and close +- * a session. ++ * Check that the algo is usable + */ +- sess.mac = digest_data[i].devcryptoid; +- if (ioctl(cfd, CIOCGSESSION, &sess) < 0 +- || ioctl(cfd, CIOCFSESSION, &sess.ses) < 0) ++ if (!devcrypto_test_digest(i)) + continue; + + if ((known_digest_methods[i] = EVP_MD_meth_new(digest_data[i].nid, |