From: Andy Polyakov <appro@openssl.org>
Date: Thu, 30 Dec 2004 11:10:11 +0000 (+0000)
Subject: Remove naming conflict between variable and label.
X-Git-Tag: OpenSSL_0_9_7g~17^2~87
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=3ffb8d42bce2056de9e41dd03176332337b02eaa;ds=sidebyside

Remove naming conflict between variable and label.
---

diff --git a/apps/apps.c b/apps/apps.c
index e08c4bdeba..1bcebc749a 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -700,7 +700,7 @@ static int load_pkcs12(BIO *err, BIO *in, const char *desc,
 	if (p12 == NULL)
 		{
 		BIO_printf(err, "Error loading PKCS12 file for %s\n", desc);	
-		goto err;
+		goto die;
 		}
 	/* See if an empty password will do */
 	if (PKCS12_verify_mac(p12, "", 0) || PKCS12_verify_mac(p12, NULL, 0))
@@ -714,7 +714,7 @@ static int load_pkcs12(BIO *err, BIO *in, const char *desc,
 			{
 			BIO_printf(err, "Passpharse callback error for %s\n",
 					desc);
-			goto err;
+			goto die;
 			}
 		if (len < PEM_BUFSIZE)
 			tpass[len] = 0;
@@ -722,12 +722,12 @@ static int load_pkcs12(BIO *err, BIO *in, const char *desc,
 			{
 			BIO_printf(err,
 	"Mac verify error (wrong password?) in PKCS12 file for %s\n", desc);	
-			goto err;
+			goto die;
 			}
 		pass = tpass;
 		}
 	ret = PKCS12_parse(p12, pass, pkey, cert, ca);
-	err:
+	die:
 	if (p12)
 		PKCS12_free(p12);
 	return ret;