summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libcrypto/evp/e_des.c6
-rw-r--r--src/lib/libcrypto/evp/e_des3.c2
-rw-r--r--src/lib/libcrypto/evp/encode.c4
-rw-r--r--src/lib/libcrypto/evp/p_sign.c2
-rw-r--r--src/lib/libssl/src/crypto/evp/e_des.c6
-rw-r--r--src/lib/libssl/src/crypto/evp/e_des3.c2
-rw-r--r--src/lib/libssl/src/crypto/evp/encode.c4
-rw-r--r--src/lib/libssl/src/crypto/evp/p_sign.c2
8 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/libcrypto/evp/e_des.c b/src/lib/libcrypto/evp/e_des.c
index ac46ba6a96..8dbc59c4c1 100644
--- a/src/lib/libcrypto/evp/e_des.c
+++ b/src/lib/libcrypto/evp/e_des.c
@@ -175,7 +175,7 @@ des_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
175 out += EVP_MAXCHUNK; 175 out += EVP_MAXCHUNK;
176 } 176 }
177 if (inl) 177 if (inl)
178 DES_cfb_encrypt(in, out, 8,(long)inl, ctx->cipher_data, 178 DES_cfb_encrypt(in, out, 8, (long)inl, ctx->cipher_data,
179 (DES_cblock *)ctx->iv, ctx->encrypt); 179 (DES_cblock *)ctx->iv, ctx->encrypt);
180 return 1; 180 return 1;
181} 181}
@@ -186,12 +186,12 @@ BLOCK_CIPHER_defs(des, DES_key_schedule, NID_des, 8, 8, 8, 64,
186 EVP_CIPHER_get_asn1_iv, 186 EVP_CIPHER_get_asn1_iv,
187 des_ctrl) 187 des_ctrl)
188 188
189BLOCK_CIPHER_def_cfb(des, DES_key_schedule, NID_des, 8,8, 1, 189BLOCK_CIPHER_def_cfb(des, DES_key_schedule, NID_des, 8, 8, 1,
190 EVP_CIPH_RAND_KEY, des_init_key, NULL, 190 EVP_CIPH_RAND_KEY, des_init_key, NULL,
191 EVP_CIPHER_set_asn1_iv, 191 EVP_CIPHER_set_asn1_iv,
192 EVP_CIPHER_get_asn1_iv, des_ctrl) 192 EVP_CIPHER_get_asn1_iv, des_ctrl)
193 193
194BLOCK_CIPHER_def_cfb(des, DES_key_schedule, NID_des, 8,8, 8, 194BLOCK_CIPHER_def_cfb(des, DES_key_schedule, NID_des, 8, 8, 8,
195 EVP_CIPH_RAND_KEY, des_init_key, NULL, 195 EVP_CIPH_RAND_KEY, des_init_key, NULL,
196 EVP_CIPHER_set_asn1_iv, 196 EVP_CIPHER_set_asn1_iv,
197 EVP_CIPHER_get_asn1_iv, des_ctrl) 197 EVP_CIPHER_get_asn1_iv, des_ctrl)
diff --git a/src/lib/libcrypto/evp/e_des3.c b/src/lib/libcrypto/evp/e_des3.c
index a6093c2ddb..92148cb33f 100644
--- a/src/lib/libcrypto/evp/e_des3.c
+++ b/src/lib/libcrypto/evp/e_des3.c
@@ -251,7 +251,7 @@ des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
251 if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1) || 251 if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1) ||
252 DES_set_key_checked(&deskey[1], &data(ctx)->ks2) || 252 DES_set_key_checked(&deskey[1], &data(ctx)->ks2) ||
253 DES_set_key_checked(&deskey[2], &data(ctx)->ks3)) 253 DES_set_key_checked(&deskey[2], &data(ctx)->ks3))
254 return 0; 254 return 0;
255#else 255#else
256 DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1); 256 DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1);
257 DES_set_key_unchecked(&deskey[1], &data(ctx)->ks2); 257 DES_set_key_unchecked(&deskey[1], &data(ctx)->ks2);
diff --git a/src/lib/libcrypto/evp/encode.c b/src/lib/libcrypto/evp/encode.c
index 2268b8d2f2..4307802f56 100644
--- a/src/lib/libcrypto/evp/encode.c
+++ b/src/lib/libcrypto/evp/encode.c
@@ -224,7 +224,7 @@ int
224EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl, 224EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
225 const unsigned char *in, int inl) 225 const unsigned char *in, int inl)
226{ 226{
227 int seof = -1, eof = 0, rv = -1, ret = 0, i,v, tmp, n, ln, exp_nl; 227 int seof = -1, eof = 0, rv = -1, ret = 0, i, v, tmp, n, ln, exp_nl;
228 unsigned char *d; 228 unsigned char *d;
229 229
230 n = ctx->num; 230 n = ctx->num;
@@ -360,7 +360,7 @@ end:
360int 360int
361EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n) 361EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n)
362{ 362{
363 int i, ret = 0, a,b, c, d; 363 int i, ret = 0, a, b, c, d;
364 unsigned long l; 364 unsigned long l;
365 365
366 /* trim white space from the start of the line. */ 366 /* trim white space from the start of the line. */
diff --git a/src/lib/libcrypto/evp/p_sign.c b/src/lib/libcrypto/evp/p_sign.c
index b064ec5fb5..9daaf1cecf 100644
--- a/src/lib/libcrypto/evp/p_sign.c
+++ b/src/lib/libcrypto/evp/p_sign.c
@@ -132,6 +132,6 @@ err:
132 EVPerr(EVP_F_EVP_SIGNFINAL, EVP_R_NO_SIGN_FUNCTION_CONFIGURED); 132 EVPerr(EVP_F_EVP_SIGNFINAL, EVP_R_NO_SIGN_FUNCTION_CONFIGURED);
133 return (0); 133 return (0);
134 } 134 }
135 return(ctx->digest->sign(ctx->digest->type, m,m_len, sigret, siglen, 135 return(ctx->digest->sign(ctx->digest->type, m, m_len, sigret, siglen,
136 pkey->pkey.ptr)); 136 pkey->pkey.ptr));
137} 137}
diff --git a/src/lib/libssl/src/crypto/evp/e_des.c b/src/lib/libssl/src/crypto/evp/e_des.c
index ac46ba6a96..8dbc59c4c1 100644
--- a/src/lib/libssl/src/crypto/evp/e_des.c
+++ b/src/lib/libssl/src/crypto/evp/e_des.c
@@ -175,7 +175,7 @@ des_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
175 out += EVP_MAXCHUNK; 175 out += EVP_MAXCHUNK;
176 } 176 }
177 if (inl) 177 if (inl)
178 DES_cfb_encrypt(in, out, 8,(long)inl, ctx->cipher_data, 178 DES_cfb_encrypt(in, out, 8, (long)inl, ctx->cipher_data,
179 (DES_cblock *)ctx->iv, ctx->encrypt); 179 (DES_cblock *)ctx->iv, ctx->encrypt);
180 return 1; 180 return 1;
181} 181}
@@ -186,12 +186,12 @@ BLOCK_CIPHER_defs(des, DES_key_schedule, NID_des, 8, 8, 8, 64,
186 EVP_CIPHER_get_asn1_iv, 186 EVP_CIPHER_get_asn1_iv,
187 des_ctrl) 187 des_ctrl)
188 188
189BLOCK_CIPHER_def_cfb(des, DES_key_schedule, NID_des, 8,8, 1, 189BLOCK_CIPHER_def_cfb(des, DES_key_schedule, NID_des, 8, 8, 1,
190 EVP_CIPH_RAND_KEY, des_init_key, NULL, 190 EVP_CIPH_RAND_KEY, des_init_key, NULL,
191 EVP_CIPHER_set_asn1_iv, 191 EVP_CIPHER_set_asn1_iv,
192 EVP_CIPHER_get_asn1_iv, des_ctrl) 192 EVP_CIPHER_get_asn1_iv, des_ctrl)
193 193
194BLOCK_CIPHER_def_cfb(des, DES_key_schedule, NID_des, 8,8, 8, 194BLOCK_CIPHER_def_cfb(des, DES_key_schedule, NID_des, 8, 8, 8,
195 EVP_CIPH_RAND_KEY, des_init_key, NULL, 195 EVP_CIPH_RAND_KEY, des_init_key, NULL,
196 EVP_CIPHER_set_asn1_iv, 196 EVP_CIPHER_set_asn1_iv,
197 EVP_CIPHER_get_asn1_iv, des_ctrl) 197 EVP_CIPHER_get_asn1_iv, des_ctrl)
diff --git a/src/lib/libssl/src/crypto/evp/e_des3.c b/src/lib/libssl/src/crypto/evp/e_des3.c
index a6093c2ddb..92148cb33f 100644
--- a/src/lib/libssl/src/crypto/evp/e_des3.c
+++ b/src/lib/libssl/src/crypto/evp/e_des3.c
@@ -251,7 +251,7 @@ des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
251 if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1) || 251 if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1) ||
252 DES_set_key_checked(&deskey[1], &data(ctx)->ks2) || 252 DES_set_key_checked(&deskey[1], &data(ctx)->ks2) ||
253 DES_set_key_checked(&deskey[2], &data(ctx)->ks3)) 253 DES_set_key_checked(&deskey[2], &data(ctx)->ks3))
254 return 0; 254 return 0;
255#else 255#else
256 DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1); 256 DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1);
257 DES_set_key_unchecked(&deskey[1], &data(ctx)->ks2); 257 DES_set_key_unchecked(&deskey[1], &data(ctx)->ks2);
diff --git a/src/lib/libssl/src/crypto/evp/encode.c b/src/lib/libssl/src/crypto/evp/encode.c
index 2268b8d2f2..4307802f56 100644
--- a/src/lib/libssl/src/crypto/evp/encode.c
+++ b/src/lib/libssl/src/crypto/evp/encode.c
@@ -224,7 +224,7 @@ int
224EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl, 224EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
225 const unsigned char *in, int inl) 225 const unsigned char *in, int inl)
226{ 226{
227 int seof = -1, eof = 0, rv = -1, ret = 0, i,v, tmp, n, ln, exp_nl; 227 int seof = -1, eof = 0, rv = -1, ret = 0, i, v, tmp, n, ln, exp_nl;
228 unsigned char *d; 228 unsigned char *d;
229 229
230 n = ctx->num; 230 n = ctx->num;
@@ -360,7 +360,7 @@ end:
360int 360int
361EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n) 361EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n)
362{ 362{
363 int i, ret = 0, a,b, c, d; 363 int i, ret = 0, a, b, c, d;
364 unsigned long l; 364 unsigned long l;
365 365
366 /* trim white space from the start of the line. */ 366 /* trim white space from the start of the line. */
diff --git a/src/lib/libssl/src/crypto/evp/p_sign.c b/src/lib/libssl/src/crypto/evp/p_sign.c
index b064ec5fb5..9daaf1cecf 100644
--- a/src/lib/libssl/src/crypto/evp/p_sign.c
+++ b/src/lib/libssl/src/crypto/evp/p_sign.c
@@ -132,6 +132,6 @@ err:
132 EVPerr(EVP_F_EVP_SIGNFINAL, EVP_R_NO_SIGN_FUNCTION_CONFIGURED); 132 EVPerr(EVP_F_EVP_SIGNFINAL, EVP_R_NO_SIGN_FUNCTION_CONFIGURED);
133 return (0); 133 return (0);
134 } 134 }
135 return(ctx->digest->sign(ctx->digest->type, m,m_len, sigret, siglen, 135 return(ctx->digest->sign(ctx->digest->type, m, m_len, sigret, siglen,
136 pkey->pkey.ptr)); 136 pkey->pkey.ptr));
137} 137}