resolve conflicts

1 files changed, 6 insertions, 6 deletions

diff --git a/src/lib/libcrypto/asn1/tasn_prn.c b/src/lib/libcrypto/asn1/tasn_prn.c
index 453698012d..542a091a66 100644
--- a/src/lib/libcrypto/asn1/tasn_prn.c
+++ b/src/lib/libcrypto/asn1/tasn_prn.c
@@ -446,11 +446,11 @@ static int asn1_print_fsname(BIO *out, int indent,
         return 1;
         }
 
-static int asn1_print_boolean_ctx(BIO *out, const int bool,
+static int asn1_print_boolean_ctx(BIO *out, int boolval,
                                                         const ASN1_PCTX *pctx)
         {
         const char *str;
-        switch (bool)
+        switch (boolval)
                 {
                 case -1:
                 str = "BOOL ABSENT";
@@ -574,10 +574,10 @@ static int asn1_primitive_print(BIO *out, ASN1_VALUE **fld,
                 {
                 case V_ASN1_BOOLEAN:
                         {
-                        int bool = *(int *)fld;
-                        if (bool == -1)
-                                bool = it->size;
-                        ret = asn1_print_boolean_ctx(out, bool, pctx);
+                        int boolval = *(int *)fld;
+                        if (boolval == -1)
+                                boolval = it->size;
+                        ret = asn1_print_boolean_ctx(out, boolval, pctx);
                         }
                 break;