root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Remove naming conflict between variable and label.

This commit is contained in:
Andy Polyakov 2004-12-30 11:10:11 +00:00
parent 25866e3982
commit 3ffb8d42bc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/apps.c
View File

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