diff options
| author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-11-10 01:22:17 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-03-28 16:16:49 -0400 |
| commit | a6ac1ed686346d2164c16446624c973e51d3ae92 (patch) | |
| tree | b2d4baf2a8656946221fc81f64109510ddda3053 | |
| parent | cbe952418376a25acd872db4281a0b09735001f1 (diff) | |
| download | openssl-a6ac1ed686346d2164c16446624c973e51d3ae92.zip openssl-a6ac1ed686346d2164c16446624c973e51d3ae92.tar.gz openssl-a6ac1ed686346d2164c16446624c973e51d3ae92.tar.bz2 | |
Fix 0 -> NULL, indentation
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3066)
| -rw-r--r-- | crypto/asn1/a_int.c | 2 | ||||
| -rw-r--r-- | crypto/asn1/asn1_par.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c index e0bcd6e..c40c7fa 100644 --- a/crypto/asn1/a_int.c +++ b/crypto/asn1/a_int.c @@ -522,7 +522,7 @@ static BIGNUM *asn1_string_to_bn(const ASN1_INTEGER *ai, BIGNUM *bn, } ret = BN_bin2bn(ai->data, ai->length, bn); - if (ret == 0) { + if (ret == NULL) { ASN1err(ASN1_F_ASN1_STRING_TO_BN, ASN1_R_BN_LIB); return NULL; } diff --git a/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c index 4db3df9..af045cb 100644 --- a/crypto/asn1/asn1_par.c +++ b/crypto/asn1/asn1_par.c @@ -79,8 +79,8 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, int dump_indent, dump_cont = 0; if (depth > ASN1_PARSE_MAXDEPTH) { - BIO_puts(bp, "BAD RECURSION DEPTH\n"); - return 0; + BIO_puts(bp, "BAD RECURSION DEPTH\n"); + return 0; } dump_indent = 6; /* Because we know BIO_dump_indent() */ |