From: FdaSilvaYY <fdasilvayy@gmail.com>
Date: Thu, 10 Nov 2016 00:22:17 +0000 (+0100)
Subject: Fix 0 -> NULL, indentation
X-Git-Tag: OpenSSL_1_1_0f~113
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5f028d68016178bdc2b35962df950db4f2b6280b;p=oweals%2Fopenssl.git

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)
(cherry picked from commit a6ac1ed686346d2164c16446624c973e51d3ae92)
---

diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c
index e0bcd6e502..c40c7faed2 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 4db3df9b8d..af045cb15e 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() */