The branch OpenSSL_1_1_0-stable has been updated via 5f028d68016178bdc2b35962df950db4f2b6280b (commit) from 9ade16edd5260e7d19fe1ac6fd7eb016dc7cbea7 (commit)
- Log ----------------------------------------------------------------- commit 5f028d68016178bdc2b35962df950db4f2b6280b Author: FdaSilvaYY <fdasilv...@gmail.com> Date: Thu Nov 10 01:22:17 2016 +0100 Fix 0 -> NULL, indentation Reviewed-by: Andy Polyakov <ap...@openssl.org> Reviewed-by: Rich Salz <rs...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3066) (cherry picked from commit a6ac1ed686346d2164c16446624c973e51d3ae92) ----------------------------------------------------------------------- Summary of changes: crypto/asn1/a_int.c | 2 +- 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() */ _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits