summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/pem/pem_lib.c4
-rw-r--r--src/lib/libcrypto/pem/pem_pkey.c8
-rw-r--r--src/lib/libcrypto/pem/pem_seal.c2
-rw-r--r--src/lib/libcrypto/pem/pem_sign.c2
-rw-r--r--src/lib/libssl/src/crypto/pem/pem_lib.c4
-rw-r--r--src/lib/libssl/src/crypto/pem/pem_pkey.c8
-rw-r--r--src/lib/libssl/src/crypto/pem/pem_seal.c2
-rw-r--r--src/lib/libssl/src/crypto/pem/pem_sign.c2
8 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c
index 9d5d8e714c..c670ac2acb 100644
--- a/src/lib/libcrypto/pem/pem_lib.c
+++ b/src/lib/libcrypto/pem/pem_lib.c
@@ -501,10 +501,10 @@ PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher)
501 } 501 }
502 header += 11; 502 header += 11;
503 if (*header != '4') 503 if (*header != '4')
504 return(0); 504 return (0);
505 header++; 505 header++;
506 if (*header != ',') 506 if (*header != ',')
507 return(0); 507 return (0);
508 header++; 508 header++;
509 if (strncmp(header, "ENCRYPTED", 9) != 0) { 509 if (strncmp(header, "ENCRYPTED", 9) != 0) {
510 PEMerr(PEM_F_PEM_GET_EVP_CIPHER_INFO, PEM_R_NOT_ENCRYPTED); 510 PEMerr(PEM_F_PEM_GET_EVP_CIPHER_INFO, PEM_R_NOT_ENCRYPTED);
diff --git a/src/lib/libcrypto/pem/pem_pkey.c b/src/lib/libcrypto/pem/pem_pkey.c
index 9aaff6e514..bcce39281e 100644
--- a/src/lib/libcrypto/pem/pem_pkey.c
+++ b/src/lib/libcrypto/pem/pem_pkey.c
@@ -133,7 +133,7 @@ PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, void *u)
133 ameth = EVP_PKEY_asn1_find_str(NULL, nm, slen); 133 ameth = EVP_PKEY_asn1_find_str(NULL, nm, slen);
134 if (!ameth || !ameth->old_priv_decode) 134 if (!ameth || !ameth->old_priv_decode)
135 goto p8err; 135 goto p8err;
136 ret = d2i_PrivateKey(ameth->pkey_id, x,&p, len); 136 ret = d2i_PrivateKey(ameth->pkey_id, x, &p, len);
137 } 137 }
138 138
139p8err: 139p8err:
@@ -159,7 +159,7 @@ PEM_write_bio_PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
159 (void) snprintf(pem_str, sizeof(pem_str), "%s PRIVATE KEY", 159 (void) snprintf(pem_str, sizeof(pem_str), "%s PRIVATE KEY",
160 x->ameth->pem_str); 160 x->ameth->pem_str);
161 return PEM_ASN1_write_bio((i2d_of_void *)i2d_PrivateKey, 161 return PEM_ASN1_write_bio((i2d_of_void *)i2d_PrivateKey,
162 pem_str, bp, x,enc, kstr, klen, cb, u); 162 pem_str, bp, x, enc, kstr, klen, cb, u);
163} 163}
164 164
165EVP_PKEY * 165EVP_PKEY *
@@ -214,7 +214,7 @@ PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x)
214 (void) snprintf(pem_str, sizeof(pem_str), "%s PARAMETERS", 214 (void) snprintf(pem_str, sizeof(pem_str), "%s PARAMETERS",
215 x->ameth->pem_str); 215 x->ameth->pem_str);
216 return PEM_ASN1_write_bio((i2d_of_void *)x->ameth->param_encode, 216 return PEM_ASN1_write_bio((i2d_of_void *)x->ameth->param_encode,
217 pem_str, bp, x,NULL, NULL, 0,0, NULL); 217 pem_str, bp, x, NULL, NULL, 0, 0, NULL);
218} 218}
219 219
220#ifndef OPENSSL_NO_FP_API 220#ifndef OPENSSL_NO_FP_API
@@ -229,7 +229,7 @@ PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u)
229 return (0); 229 return (0);
230 } 230 }
231 BIO_set_fp(b, fp, BIO_NOCLOSE); 231 BIO_set_fp(b, fp, BIO_NOCLOSE);
232 ret = PEM_read_bio_PrivateKey(b, x,cb, u); 232 ret = PEM_read_bio_PrivateKey(b, x, cb, u);
233 BIO_free(b); 233 BIO_free(b);
234 return (ret); 234 return (ret);
235} 235}
diff --git a/src/lib/libcrypto/pem/pem_seal.c b/src/lib/libcrypto/pem/pem_seal.c
index e39de08c9a..3c0be6d305 100644
--- a/src/lib/libcrypto/pem/pem_seal.c
+++ b/src/lib/libcrypto/pem/pem_seal.c
@@ -173,7 +173,7 @@ PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl,
173 EVP_EncodeFinal(&ctx->encode, out, &j); 173 EVP_EncodeFinal(&ctx->encode, out, &j);
174 *outl += j; 174 *outl += j;
175 175
176 if (!EVP_SignFinal(&ctx->md, s,&i, priv)) 176 if (!EVP_SignFinal(&ctx->md, s, &i, priv))
177 goto err; 177 goto err;
178 *sigl = EVP_EncodeBlock(sig, s, i); 178 *sigl = EVP_EncodeBlock(sig, s, i);
179 179
diff --git a/src/lib/libcrypto/pem/pem_sign.c b/src/lib/libcrypto/pem/pem_sign.c
index ab3e5ebc64..8a6bcc8d8d 100644
--- a/src/lib/libcrypto/pem/pem_sign.c
+++ b/src/lib/libcrypto/pem/pem_sign.c
@@ -91,7 +91,7 @@ PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
91 goto err; 91 goto err;
92 } 92 }
93 93
94 if (EVP_SignFinal(ctx, m,&m_len, pkey) <= 0) 94 if (EVP_SignFinal(ctx, m, &m_len, pkey) <= 0)
95 goto err; 95 goto err;
96 96
97 i = EVP_EncodeBlock(sigret, m, m_len); 97 i = EVP_EncodeBlock(sigret, m, m_len);
diff --git a/src/lib/libssl/src/crypto/pem/pem_lib.c b/src/lib/libssl/src/crypto/pem/pem_lib.c
index 9d5d8e714c..c670ac2acb 100644
--- a/src/lib/libssl/src/crypto/pem/pem_lib.c
+++ b/src/lib/libssl/src/crypto/pem/pem_lib.c
@@ -501,10 +501,10 @@ PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher)
501 } 501 }
502 header += 11; 502 header += 11;
503 if (*header != '4') 503 if (*header != '4')
504 return(0); 504 return (0);
505 header++; 505 header++;
506 if (*header != ',') 506 if (*header != ',')
507 return(0); 507 return (0);
508 header++; 508 header++;
509 if (strncmp(header, "ENCRYPTED", 9) != 0) { 509 if (strncmp(header, "ENCRYPTED", 9) != 0) {
510 PEMerr(PEM_F_PEM_GET_EVP_CIPHER_INFO, PEM_R_NOT_ENCRYPTED); 510 PEMerr(PEM_F_PEM_GET_EVP_CIPHER_INFO, PEM_R_NOT_ENCRYPTED);
diff --git a/src/lib/libssl/src/crypto/pem/pem_pkey.c b/src/lib/libssl/src/crypto/pem/pem_pkey.c
index 9aaff6e514..bcce39281e 100644
--- a/src/lib/libssl/src/crypto/pem/pem_pkey.c
+++ b/src/lib/libssl/src/crypto/pem/pem_pkey.c
@@ -133,7 +133,7 @@ PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, void *u)
133 ameth = EVP_PKEY_asn1_find_str(NULL, nm, slen); 133 ameth = EVP_PKEY_asn1_find_str(NULL, nm, slen);
134 if (!ameth || !ameth->old_priv_decode) 134 if (!ameth || !ameth->old_priv_decode)
135 goto p8err; 135 goto p8err;
136 ret = d2i_PrivateKey(ameth->pkey_id, x,&p, len); 136 ret = d2i_PrivateKey(ameth->pkey_id, x, &p, len);
137 } 137 }
138 138
139p8err: 139p8err:
@@ -159,7 +159,7 @@ PEM_write_bio_PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
159 (void) snprintf(pem_str, sizeof(pem_str), "%s PRIVATE KEY", 159 (void) snprintf(pem_str, sizeof(pem_str), "%s PRIVATE KEY",
160 x->ameth->pem_str); 160 x->ameth->pem_str);
161 return PEM_ASN1_write_bio((i2d_of_void *)i2d_PrivateKey, 161 return PEM_ASN1_write_bio((i2d_of_void *)i2d_PrivateKey,
162 pem_str, bp, x,enc, kstr, klen, cb, u); 162 pem_str, bp, x, enc, kstr, klen, cb, u);
163} 163}
164 164
165EVP_PKEY * 165EVP_PKEY *
@@ -214,7 +214,7 @@ PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x)
214 (void) snprintf(pem_str, sizeof(pem_str), "%s PARAMETERS", 214 (void) snprintf(pem_str, sizeof(pem_str), "%s PARAMETERS",
215 x->ameth->pem_str); 215 x->ameth->pem_str);
216 return PEM_ASN1_write_bio((i2d_of_void *)x->ameth->param_encode, 216 return PEM_ASN1_write_bio((i2d_of_void *)x->ameth->param_encode,
217 pem_str, bp, x,NULL, NULL, 0,0, NULL); 217 pem_str, bp, x, NULL, NULL, 0, 0, NULL);
218} 218}
219 219
220#ifndef OPENSSL_NO_FP_API 220#ifndef OPENSSL_NO_FP_API
@@ -229,7 +229,7 @@ PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u)
229 return (0); 229 return (0);
230 } 230 }
231 BIO_set_fp(b, fp, BIO_NOCLOSE); 231 BIO_set_fp(b, fp, BIO_NOCLOSE);
232 ret = PEM_read_bio_PrivateKey(b, x,cb, u); 232 ret = PEM_read_bio_PrivateKey(b, x, cb, u);
233 BIO_free(b); 233 BIO_free(b);
234 return (ret); 234 return (ret);
235} 235}
diff --git a/src/lib/libssl/src/crypto/pem/pem_seal.c b/src/lib/libssl/src/crypto/pem/pem_seal.c
index e39de08c9a..3c0be6d305 100644
--- a/src/lib/libssl/src/crypto/pem/pem_seal.c
+++ b/src/lib/libssl/src/crypto/pem/pem_seal.c
@@ -173,7 +173,7 @@ PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl,
173 EVP_EncodeFinal(&ctx->encode, out, &j); 173 EVP_EncodeFinal(&ctx->encode, out, &j);
174 *outl += j; 174 *outl += j;
175 175
176 if (!EVP_SignFinal(&ctx->md, s,&i, priv)) 176 if (!EVP_SignFinal(&ctx->md, s, &i, priv))
177 goto err; 177 goto err;
178 *sigl = EVP_EncodeBlock(sig, s, i); 178 *sigl = EVP_EncodeBlock(sig, s, i);
179 179
diff --git a/src/lib/libssl/src/crypto/pem/pem_sign.c b/src/lib/libssl/src/crypto/pem/pem_sign.c
index ab3e5ebc64..8a6bcc8d8d 100644
--- a/src/lib/libssl/src/crypto/pem/pem_sign.c
+++ b/src/lib/libssl/src/crypto/pem/pem_sign.c
@@ -91,7 +91,7 @@ PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
91 goto err; 91 goto err;
92 } 92 }
93 93
94 if (EVP_SignFinal(ctx, m,&m_len, pkey) <= 0) 94 if (EVP_SignFinal(ctx, m, &m_len, pkey) <= 0)
95 goto err; 95 goto err;
96 96
97 i = EVP_EncodeBlock(sigret, m, m_len); 97 i = EVP_EncodeBlock(sigret, m, m_len);