diff options
author | Chunrong Guo <chunrong.guo@nxp.com> | 2017-11-15 13:26:10 +0800 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2017-11-16 11:09:27 -0200 |
commit | aaf2c4beb205e9f9eef1b8a9732468acb7f1a4ee (patch) | |
tree | 35d88f0e454ca7703cbba91c740bbe8e02e8eac0 /recipes-connectivity/openssl/openssl-qoriq/qoriq/0027-cryptodev-put-all-digest-ioctls-into-a-single-functi.patch | |
parent | d709b2e285633fad2818baf53f3f1ddd35cf8527 (diff) | |
download | meta-freescale-aaf2c4beb205e9f9eef1b8a9732468acb7f1a4ee.tar.gz |
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 <chunrong.guo@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-connectivity/openssl/openssl-qoriq/qoriq/0027-cryptodev-put-all-digest-ioctls-into-a-single-functi.patch')
-rw-r--r-- | recipes-connectivity/openssl/openssl-qoriq/qoriq/0027-cryptodev-put-all-digest-ioctls-into-a-single-functi.patch | 108 |
1 files changed, 0 insertions, 108 deletions
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 08108897..00000000 --- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0027-cryptodev-put-all-digest-ioctls-into-a-single-functi.patch +++ /dev/null | |||
@@ -1,108 +0,0 @@ | |||
1 | From 0307a70fc4399a0ee758172e385d4daaae669ce6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Cristian Stoica <cristian.stoica@nxp.com> | ||
3 | Date: Tue, 15 Dec 2015 12:23:13 +0200 | ||
4 | Subject: [PATCH 27/48] cryptodev: put all digest ioctls into a single function | ||
5 | |||
6 | Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com> | ||
7 | --- | ||
8 | crypto/engine/eng_cryptodev.c | 44 +++++++++++++++++++------------------------ | ||
9 | 1 file changed, 19 insertions(+), 25 deletions(-) | ||
10 | |||
11 | diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c | ||
12 | index a8652bf..8b8710a 100644 | ||
13 | --- a/crypto/engine/eng_cryptodev.c | ||
14 | +++ b/crypto/engine/eng_cryptodev.c | ||
15 | @@ -1578,13 +1578,6 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx) | ||
16 | sess->mackeylen = digest_key_length(ctx->digest->type); | ||
17 | sess->mac = digest; | ||
18 | |||
19 | - if (ioctl(state->d_fd, CIOCGSESSION, sess) < 0) { | ||
20 | - put_dev_crypto(state->d_fd); | ||
21 | - state->d_fd = -1; | ||
22 | - printf("cryptodev_digest_init: Open session failed\n"); | ||
23 | - return (0); | ||
24 | - } | ||
25 | - | ||
26 | return (1); | ||
27 | } | ||
28 | |||
29 | @@ -1624,6 +1617,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data, | ||
30 | |||
31 | static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) | ||
32 | { | ||
33 | + int ret = 1; | ||
34 | struct crypt_op cryp; | ||
35 | struct dev_crypto_state *state = ctx->md_data; | ||
36 | struct session_op *sess = &state->d_sess; | ||
37 | @@ -1633,6 +1627,11 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) | ||
38 | return (0); | ||
39 | } | ||
40 | |||
41 | + if (ioctl(state->d_fd, CIOCGSESSION, sess) < 0) { | ||
42 | + printf("cryptodev_digest_init: Open session failed\n"); | ||
43 | + return (0); | ||
44 | + } | ||
45 | + | ||
46 | memset(&cryp, 0, sizeof(cryp)); | ||
47 | |||
48 | cryp.ses = sess->ses; | ||
49 | @@ -1643,43 +1642,38 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) | ||
50 | |||
51 | if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) { | ||
52 | printf("cryptodev_digest_final: digest failed\n"); | ||
53 | - return (0); | ||
54 | + ret = 0; | ||
55 | } | ||
56 | |||
57 | - return (1); | ||
58 | + if (ioctl(state->d_fd, CIOCFSESSION, &sess->ses) < 0) { | ||
59 | + printf("cryptodev_digest_cleanup: failed to close session\n"); | ||
60 | + } | ||
61 | + | ||
62 | + return ret; | ||
63 | } | ||
64 | |||
65 | static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx) | ||
66 | { | ||
67 | - int ret = 1; | ||
68 | struct dev_crypto_state *state = ctx->md_data; | ||
69 | struct session_op *sess = &state->d_sess; | ||
70 | |||
71 | - if (state == NULL) | ||
72 | + if (state == NULL) { | ||
73 | return 0; | ||
74 | - | ||
75 | - if (state->d_fd < 0) { | ||
76 | - printf("cryptodev_digest_cleanup: illegal input\n"); | ||
77 | - return (0); | ||
78 | } | ||
79 | |||
80 | if (!(ctx->flags & EVP_MD_CTX_FLAG_ONESHOT)) { | ||
81 | OPENSSL_free(state->mac_data); | ||
82 | } | ||
83 | - state->mac_data = NULL; | ||
84 | - state->mac_len = 0; | ||
85 | |||
86 | - if (ioctl(state->d_fd, CIOCFSESSION, &sess->ses) < 0) { | ||
87 | - printf("cryptodev_digest_cleanup: failed to close session\n"); | ||
88 | - ret = 0; | ||
89 | - } else { | ||
90 | - ret = 1; | ||
91 | + if (state->d_fd >= 0) { | ||
92 | + put_dev_crypto(state->d_fd); | ||
93 | + state->d_fd = -1; | ||
94 | } | ||
95 | |||
96 | - put_dev_crypto(state->d_fd); | ||
97 | - state->d_fd = -1; | ||
98 | + state->mac_data = NULL; | ||
99 | + state->mac_len = 0; | ||
100 | |||
101 | - return (ret); | ||
102 | + return 1; | ||
103 | } | ||
104 | |||
105 | static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) | ||
106 | -- | ||
107 | 2.7.3 | ||
108 | |||