generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove extra argument to BIO_printf().

Browse Source 
PR: 685
This commit is contained in:
Richard Levitte 2003-09-27 18:31:41 +00:00
parent ec4e600da6
commit 9c90f27dac
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/pkcs8.c
View File

@ -235,7 +235,7 @@ int MAIN(int argc, char **argv)
return (1); return (1);
} }
if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken))) { if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken))) {
BIO_printf(bio_err, "Error converting key\n", outfile); BIO_printf(bio_err, "Error converting key\n");
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
return (1); return (1);
} }
@ -259,8 +259,7 @@ int MAIN(int argc, char **argv)
if (!(p8 = PKCS8_encrypt(pbe_nid, cipher, if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,
p8pass, strlen(p8pass), p8pass, strlen(p8pass),
NULL, 0, iter, p8inf))) { NULL, 0, iter, p8inf))) {
BIO_printf(bio_err, "Error encrypting key\n", BIO_printf(bio_err, "Error encrypting key\n");
outfile);
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
return (1); return (1);
} }
@ -303,7 +302,7 @@ int MAIN(int argc, char **argv)
} }
if (!p8) { if (!p8) {
BIO_printf (bio_err, "Error reading key\n", outfile); BIO_printf (bio_err, "Error reading key\n");
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
return (1); return (1);
} }
@ -317,13 +316,13 @@ int MAIN(int argc, char **argv)
} }
if (!p8inf) { if (!p8inf) {
BIO_printf(bio_err, "Error decrypting key\n", outfile); BIO_printf(bio_err, "Error decrypting key\n");
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
return (1); return (1);
} }
if (!(pkey = EVP_PKCS82PKEY(p8inf))) { if (!(pkey = EVP_PKCS82PKEY(p8inf))) {
BIO_printf(bio_err, "Error converting key\n", outfile); BIO_printf(bio_err, "Error converting key\n");
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
return (1); return (1);
} }