summaryrefslogtreecommitdiffstats
path: root/recipes-connectivity/openssl/openssl-qoriq/qoriq/0018-cryptodev-drop-redundant-function.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-connectivity/openssl/openssl-qoriq/qoriq/0018-cryptodev-drop-redundant-function.patch')
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0018-cryptodev-drop-redundant-function.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0018-cryptodev-drop-redundant-function.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0018-cryptodev-drop-redundant-function.patch
index c1f0c9db..cf6cce26 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0018-cryptodev-drop-redundant-function.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0018-cryptodev-drop-redundant-function.patch
@@ -1,4 +1,4 @@
1From 07d8dad75fb1e4c3487ae560ac51e2141aa0e0c1 Mon Sep 17 00:00:00 2001 1From dddb8bc7eea34dfc73c1f5c8863d19894d9a18ac Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@freescale.com> 2From: Cristian Stoica <cristian.stoica@freescale.com>
3Date: Thu, 19 Feb 2015 16:11:53 +0200 3Date: Thu, 19 Feb 2015 16:11:53 +0200
4Subject: [PATCH 18/48] cryptodev: drop redundant function 4Subject: [PATCH 18/48] cryptodev: drop redundant function
@@ -12,10 +12,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
12 1 file changed, 3 insertions(+), 14 deletions(-) 12 1 file changed, 3 insertions(+), 14 deletions(-)
13 13
14diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 14diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
15index e6f9f16..4cffaf1 100644 15index 455868e..d229f61 100644
16--- a/crypto/engine/eng_cryptodev.c 16--- a/crypto/engine/eng_cryptodev.c
17+++ b/crypto/engine/eng_cryptodev.c 17+++ b/crypto/engine/eng_cryptodev.c
18@@ -93,7 +93,6 @@ struct dev_crypto_state { 18@@ -94,7 +94,6 @@ struct dev_crypto_state {
19 19
20 static u_int32_t cryptodev_asymfeat = 0; 20 static u_int32_t cryptodev_asymfeat = 0;
21 21
@@ -23,7 +23,7 @@ index e6f9f16..4cffaf1 100644
23 static int open_dev_crypto(void); 23 static int open_dev_crypto(void);
24 static int get_dev_crypto(void); 24 static int get_dev_crypto(void);
25 static int get_cryptodev_ciphers(const int **cnids); 25 static int get_cryptodev_ciphers(const int **cnids);
26@@ -440,16 +439,6 @@ static void put_dev_crypto(int fd) 26@@ -441,16 +440,6 @@ static void put_dev_crypto(int fd)
27 # endif 27 # endif
28 } 28 }
29 29
@@ -40,16 +40,16 @@ index e6f9f16..4cffaf1 100644
40 /* 40 /*
41 * Find out what ciphers /dev/crypto will let us have a session for. 41 * Find out what ciphers /dev/crypto will let us have a session for.
42 * XXX note, that some of these openssl doesn't deal with yet! 42 * XXX note, that some of these openssl doesn't deal with yet!
43@@ -1919,7 +1908,7 @@ cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen, 43@@ -1923,7 +1912,7 @@ cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen,
44 { 44 {
45 int fd, ret = -1; 45 int fd, ret = -1;
46 46
47- if ((fd = get_asym_dev_crypto()) < 0) 47- if ((fd = get_asym_dev_crypto()) < 0)
48+ if ((fd = get_dev_crypto()) < 0) 48+ if ((fd = get_dev_crypto()) < 0)
49 return (ret); 49 return ret;
50 50
51 if (r) { 51 if (r) {
52@@ -2509,7 +2498,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb) 52@@ -2522,7 +2511,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
53 int p_len, q_len; 53 int p_len, q_len;
54 int i; 54 int i;
55 55
@@ -58,7 +58,7 @@ index e6f9f16..4cffaf1 100644
58 goto sw_try; 58 goto sw_try;
59 59
60 if (!rsa->n && ((rsa->n = BN_new()) == NULL)) 60 if (!rsa->n && ((rsa->n = BN_new()) == NULL))
61@@ -4098,7 +4087,7 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh) 61@@ -4111,7 +4100,7 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
62 BIGNUM *temp = NULL; 62 BIGNUM *temp = NULL;
63 unsigned char *padded_pub_key = NULL, *p = NULL; 63 unsigned char *padded_pub_key = NULL, *p = NULL;
64 64
@@ -68,5 +68,5 @@ index e6f9f16..4cffaf1 100644
68 68
69 memset(&kop, 0, sizeof kop); 69 memset(&kop, 0, sizeof kop);
70-- 70--
712.7.0 712.7.3
72 72