From aaf2c4beb205e9f9eef1b8a9732468acb7f1a4ee Mon Sep 17 00:00:00 2001 From: Chunrong Guo Date: Wed, 15 Nov 2017 13:26:10 +0800 Subject: openssl-qoriq: update recipes *Update URL to fetch qoriq-open-source github *Update to b9e6572 This includes the following changes: b9e6572 - eng_cryptodev: add support for TLS algorithms offload b3a3bab - Prepare for 1.0.2l release 539c4d3 - make update cde19ec - Update CHANGES and NEWS for new release 8ded5f1 - Ignore -rle and -comp when compiled with OPENSSL_NO_COMP. Fixes make test when configured with no-comp. d130456 - Fix regression in openssl req -x509 behaviour. 7c300b9 - Remove notification settings from appveyor.yml b020bf6 - Remove dead code. ea3fc60 - Copy custom extension flags in a call to SSL_set_SSL_CTX() 4ae5993 - perlasm/x86_64-xlate.pl: work around problem with hex constants in masm. 16d78fb - Fix some error path logic in i2v_AUTHORITY_INFO_ACCESS and i2v_GENERAL_NAME 6b8fa5b - RT2867: des_ede3_cfb1 ignored "size in bits" flag 5453820 - Fix URL links in comment d2335f3 - Fix time offset calculation. 13f70ae - Check fflush on BIO_ctrl call de46e82 - Remove unnecessary loop in pkey_rsa_decrypt. b99f102 - check length sanity before correcting in EVP_CTRL_AEAD_TLS1_AAD fb2345a - Annotate ASN.1 attributes of the jurisdictionCountryName NID 60a70a5 - Fixed typo in X509_STORE_CTX_new description 74bcd77 - Numbers greater than 1 are usually non-negative. e8f2e2f - pkeyutl exit with 0 if the verification succeeded 71d66c4 - Additional check to handle BAD SSL_write retry a91bfe2 - crypto/ppccap.c: SIGILL-free processor capabilities detection on MacOS X. 3f524f7 - Ensure dhparams can handle X9.42 params in DER 1f3b0fe - Add missing macros for DHxparams 248cf95 - Fix for #2730. Add CRLDP extension to list of supported extensions d75c56f - Free the compression methods in s_server and s_client 4bc46d - doc: Add stitched ciphers to EVP_EncryptInit.pod 8625e92 - doc: Add missing options in s_{server,client} 62f488d - Fix the error handling in CRYPTO_dup_ex_data. 144ab9b - Add documentation for SNI APIs *Openssl git includes all qoriq patches so remove qoriq patches folder Signed-off-by: Chunrong Guo Signed-off-by: Otavio Salvador --- ...ut-all-digest-ioctls-into-a-single-functi.patch | 108 --------------------- 1 file changed, 108 deletions(-) delete mode 100644 recipes-connectivity/openssl/openssl-qoriq/qoriq/0027-cryptodev-put-all-digest-ioctls-into-a-single-functi.patch (limited to 'recipes-connectivity/openssl/openssl-qoriq/qoriq/0027-cryptodev-put-all-digest-ioctls-into-a-single-functi.patch') diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0027-cryptodev-put-all-digest-ioctls-into-a-single-functi.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0027-cryptodev-put-all-digest-ioctls-into-a-single-functi.patch deleted file mode 100644 index 081088971..000000000 --- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0027-cryptodev-put-all-digest-ioctls-into-a-single-functi.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 0307a70fc4399a0ee758172e385d4daaae669ce6 Mon Sep 17 00:00:00 2001 -From: Cristian Stoica -Date: Tue, 15 Dec 2015 12:23:13 +0200 -Subject: [PATCH 27/48] cryptodev: put all digest ioctls into a single function - -Signed-off-by: Cristian Stoica ---- - crypto/engine/eng_cryptodev.c | 44 +++++++++++++++++++------------------------ - 1 file changed, 19 insertions(+), 25 deletions(-) - -diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c -index a8652bf..8b8710a 100644 ---- a/crypto/engine/eng_cryptodev.c -+++ b/crypto/engine/eng_cryptodev.c -@@ -1578,13 +1578,6 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx) - sess->mackeylen = digest_key_length(ctx->digest->type); - sess->mac = digest; - -- if (ioctl(state->d_fd, CIOCGSESSION, sess) < 0) { -- put_dev_crypto(state->d_fd); -- state->d_fd = -1; -- printf("cryptodev_digest_init: Open session failed\n"); -- return (0); -- } -- - return (1); - } - -@@ -1624,6 +1617,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data, - - static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) - { -+ int ret = 1; - struct crypt_op cryp; - struct dev_crypto_state *state = ctx->md_data; - struct session_op *sess = &state->d_sess; -@@ -1633,6 +1627,11 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) - return (0); - } - -+ if (ioctl(state->d_fd, CIOCGSESSION, sess) < 0) { -+ printf("cryptodev_digest_init: Open session failed\n"); -+ return (0); -+ } -+ - memset(&cryp, 0, sizeof(cryp)); - - cryp.ses = sess->ses; -@@ -1643,43 +1642,38 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) - - if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) { - printf("cryptodev_digest_final: digest failed\n"); -- return (0); -+ ret = 0; - } - -- return (1); -+ if (ioctl(state->d_fd, CIOCFSESSION, &sess->ses) < 0) { -+ printf("cryptodev_digest_cleanup: failed to close session\n"); -+ } -+ -+ return ret; - } - - static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx) - { -- int ret = 1; - struct dev_crypto_state *state = ctx->md_data; - struct session_op *sess = &state->d_sess; - -- if (state == NULL) -+ if (state == NULL) { - return 0; -- -- if (state->d_fd < 0) { -- printf("cryptodev_digest_cleanup: illegal input\n"); -- return (0); - } - - if (!(ctx->flags & EVP_MD_CTX_FLAG_ONESHOT)) { - OPENSSL_free(state->mac_data); - } -- state->mac_data = NULL; -- state->mac_len = 0; - -- if (ioctl(state->d_fd, CIOCFSESSION, &sess->ses) < 0) { -- printf("cryptodev_digest_cleanup: failed to close session\n"); -- ret = 0; -- } else { -- ret = 1; -+ if (state->d_fd >= 0) { -+ put_dev_crypto(state->d_fd); -+ state->d_fd = -1; - } - -- put_dev_crypto(state->d_fd); -- state->d_fd = -1; -+ state->mac_data = NULL; -+ state->mac_len = 0; - -- return (ret); -+ return 1; - } - - static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) --- -2.7.3 - -- cgit v1.2.3-54-g00ecf