diff options
| author | tedu <> | 2014-04-18 00:58:49 +0000 |
|---|---|---|
| committer | tedu <> | 2014-04-18 00:58:49 +0000 |
| commit | a1df5b66c7ad477a535e56a504d8da47e1998cfa (patch) | |
| tree | b216ca6fba673789f2c494699c4cf41d23337bfa /src/lib/libcrypto/asn1/x_pkey.c | |
| parent | 07f5c09b19f56c323fa22ebd5efb5a4df9f5dc4d (diff) | |
| download | openbsd-a1df5b66c7ad477a535e56a504d8da47e1998cfa.tar.gz openbsd-a1df5b66c7ad477a535e56a504d8da47e1998cfa.tar.bz2 openbsd-a1df5b66c7ad477a535e56a504d8da47e1998cfa.zip | |
lob a few more knf grenades in here to soften things up.
Diffstat (limited to 'src/lib/libcrypto/asn1/x_pkey.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/x_pkey.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/libcrypto/asn1/x_pkey.c b/src/lib/libcrypto/asn1/x_pkey.c index 37d2d93968..eac134a1ee 100644 --- a/src/lib/libcrypto/asn1/x_pkey.c +++ b/src/lib/libcrypto/asn1/x_pkey.c | |||
| @@ -81,17 +81,14 @@ X509_PKEY *d2i_X509_PKEY(X509_PKEY **a, const unsigned char **pp, long length) | |||
| 81 | 81 | ||
| 82 | ret->cipher.cipher=EVP_get_cipherbyname( | 82 | ret->cipher.cipher=EVP_get_cipherbyname( |
| 83 | OBJ_nid2ln(OBJ_obj2nid(ret->enc_algor->algorithm))); | 83 | OBJ_nid2ln(OBJ_obj2nid(ret->enc_algor->algorithm))); |
| 84 | if (ret->cipher.cipher == NULL) | 84 | if (ret->cipher.cipher == NULL) { |
| 85 | { | ||
| 86 | c.error=ASN1_R_UNSUPPORTED_CIPHER; | 85 | c.error=ASN1_R_UNSUPPORTED_CIPHER; |
| 87 | c.line=__LINE__; | 86 | c.line=__LINE__; |
| 88 | goto err; | 87 | goto err; |
| 89 | } | 88 | } |
| 90 | if (ret->enc_algor->parameter->type == V_ASN1_OCTET_STRING) | 89 | if (ret->enc_algor->parameter->type == V_ASN1_OCTET_STRING) { |
| 91 | { | ||
| 92 | i=ret->enc_algor->parameter->value.octet_string->length; | 90 | i=ret->enc_algor->parameter->value.octet_string->length; |
| 93 | if (i > EVP_MAX_IV_LENGTH) | 91 | if (i > EVP_MAX_IV_LENGTH) { |
| 94 | { | ||
| 95 | c.error=ASN1_R_IV_TOO_LARGE; | 92 | c.error=ASN1_R_IV_TOO_LARGE; |
| 96 | c.line=__LINE__; | 93 | c.line=__LINE__; |
| 97 | goto err; | 94 | goto err; |
