From 62207f43483157557b3918ce978b518fa75c6d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 19 Mar 2014 22:23:43 +0100 Subject: [PATCH] refresh patch from git --- openssl-ibmca-1.2.0-ofb.patch | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/openssl-ibmca-1.2.0-ofb.patch b/openssl-ibmca-1.2.0-ofb.patch index 5befc0f..5093947 100644 --- a/openssl-ibmca-1.2.0-ofb.patch +++ b/openssl-ibmca-1.2.0-ofb.patch @@ -1,6 +1,16 @@ ---- e_ibmca.c.orig 2011-08-11 20:22:47.000000000 +0200 -+++ e_ibmca.c 2011-08-11 20:24:42.000000000 +0200 -@@ -883,8 +883,7 @@ typedef unsigned int (*ica_sha256_t)(uns +commit 83b8ed7b25c809fa36ec86d7041a6350dc516606 +Author: Joy Latten +Date: Wed Mar 19 15:57:10 2014 -0500 + + openssl-ibmca: openssl speed -engine ibmca -evp des-ede3-ofb segfaults + + Signed-off-by: Joy Latten + +diff --git a/e_ibmca.c b/e_ibmca.c +index b1ad975..0acbe5f 100644 +--- a/e_ibmca.c ++++ b/e_ibmca.c +@@ -883,8 +883,7 @@ typedef unsigned int (*ica_sha256_t)(unsigned int, unsigned int, unsigned char * sha256_context_t *, unsigned char *); typedef unsigned int (*ica_des_ofb_t)(const unsigned char *in_data, unsigned char *out_data, unsigned long data_length, const unsigned char *key, @@ -10,7 +20,7 @@ typedef unsigned int (*ica_des_cfb_t)(const unsigned char *in_data, unsigned char *out_data, unsigned long data_length, const unsigned char *key, unsigned char *iv, unsigned int lcfb, -@@ -894,8 +893,7 @@ typedef unsigned int (*ica_3des_cfb_t)(c +@@ -894,8 +893,7 @@ typedef unsigned int (*ica_3des_cfb_t)(const unsigned char *, unsigned char *, unsigned int, unsigned int); typedef unsigned int (*ica_3des_ofb_t)(const unsigned char *in_data, unsigned char *out_data, unsigned long data_length, const unsigned char *key, @@ -20,7 +30,7 @@ typedef unsigned int (*ica_aes_ofb_t)(const unsigned char *in_data, unsigned char *out_data, unsigned long data_length, const unsigned char *key, unsigned int key_length, unsigned char *iv, -@@ -1192,7 +1190,7 @@ static int ibmca_des_cipher(EVP_CIPHER_C +@@ -1197,7 +1195,7 @@ static int ibmca_des_cipher(EVP_CIPHER_CTX * ctx, unsigned char *out, rv = p_ica_des_cfb(in, out, len, pCtx->key, ctx->iv, 8, ICA_ENCRYPT); } else if (EVP_CIPHER_CTX_mode(ctx) == EVP_CIPH_OFB_MODE) { @@ -29,7 +39,7 @@ ICA_ENCRYPT); } else { rv = p_ica_des_encrypt(mode, len, (unsigned char *)in, -@@ -1218,7 +1216,7 @@ static int ibmca_des_cipher(EVP_CIPHER_C +@@ -1223,7 +1221,7 @@ static int ibmca_des_cipher(EVP_CIPHER_CTX * ctx, unsigned char *out, rv = p_ica_des_cfb(in, out, len, pCtx->key, ctx->iv, 8, ICA_DECRYPT); } else if (EVP_CIPHER_CTX_mode(ctx) == EVP_CIPH_OFB_MODE) { @@ -38,7 +48,7 @@ ICA_DECRYPT); } else { /* Protect against decrypt in place */ -@@ -1269,7 +1267,7 @@ static int ibmca_tdes_cipher(EVP_CIPHER_ +@@ -1279,7 +1277,7 @@ static int ibmca_tdes_cipher(EVP_CIPHER_CTX * ctx, unsigned char *out, ctx->iv, 8, ICA_ENCRYPT); } else if (EVP_CIPHER_CTX_mode(ctx) == EVP_CIPH_OFB_MODE) { rv = p_ica_3des_ofb(in, out, len, pCtx->key, @@ -47,7 +57,7 @@ } else { rv = p_ica_3des_encrypt(mode, len, (unsigned char *)in, (ica_des_vector_t *) ctx->iv, -@@ -1295,7 +1293,7 @@ static int ibmca_tdes_cipher(EVP_CIPHER_ +@@ -1305,7 +1303,7 @@ static int ibmca_tdes_cipher(EVP_CIPHER_CTX * ctx, unsigned char *out, ctx->iv, 8, ICA_DECRYPT); } else if (EVP_CIPHER_CTX_mode(ctx) == EVP_CIPH_OFB_MODE) { rv = p_ica_3des_ofb(in, out, len, pCtx->key, @@ -56,4 +66,3 @@ } else { /* Protect against decrypt in place */ /* FIXME: Again, check if EVP_CIPHER_CTX_iv_length() should be used */ -