X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=apps%2Fpkcs8.c;h=9779081734bf36b39e91af38636e70225bf8a9b7;hb=e0371fe4dc65ec62861e0ef293305442c0d97269;hp=07359d65159f04086f0cddd12ea5f36fd18ba530;hpb=600dec15861ec31e69f3fc67f3ea8bac2527ca53;p=oweals%2Fopenssl.git

diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index 07359d6515..9779081734 100644
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -71,20 +71,46 @@ int MAIN(int argc, char **argv)
 	BIO *in = NULL, *out = NULL;
 	int topk8 = 0;
 	int pbe_nid = -1;
+	const EVP_CIPHER *cipher = NULL;
 	int iter = PKCS12_DEFAULT_ITER;
+	int informat, outformat;
 	int p8_broken = PKCS8_OK;
+	int nocrypt = 0;
 	X509_SIG *p8;
 	PKCS8_PRIV_KEY_INFO *p8inf;
 	EVP_PKEY *pkey;
 	char pass[50];
 	int badarg = 0;
 	if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
+	informat=FORMAT_PEM;
+	outformat=FORMAT_PEM;
 	ERR_load_crypto_strings();
 	SSLeay_add_all_algorithms();
 	args = argv + 1;
 	while (!badarg && *args && *args[0] == '-') {
-		if (!strcmp (*args, "-topk8")) topk8 = 1;
+		if (!strcmp(*args,"-v2")) {
+			if (args[1]) {
+				args++;
+				cipher=EVP_get_cipherbyname(*args);
+				if(!cipher) {
+					BIO_printf(bio_err,
+						 "Unknown cipher %s\n", *args);
+					badarg = 1;
+				}
+			} else badarg = 1;
+		} else if (!strcmp(*args,"-inform")) {
+			if (args[1]) {
+				args++;
+				informat=str2fmt(*args);
+			} else badarg = 1;
+		} else if (!strcmp(*args,"-outform")) {
+			if (args[1]) {
+				args++;
+				outformat=str2fmt(*args);
+			} else badarg = 1;
+		} else if (!strcmp (*args, "-topk8")) topk8 = 1;
 		else if (!strcmp (*args, "-noiter")) iter = 1;
+		else if (!strcmp (*args, "-nocrypt")) nocrypt = 1;
 		else if (!strcmp (*args, "-nooct")) p8_broken = PKCS8_NO_OCTET;
 		else if (!strcmp (*args, "-in")) {
 			if (args[1]) {
@@ -103,18 +129,22 @@ int MAIN(int argc, char **argv)
 	if (badarg) {
 		BIO_printf (bio_err, "Usage pkcs8 [options]\n");
 		BIO_printf (bio_err, "where options are\n");
-		BIO_printf (bio_err, "-in file	input file\n");
-		BIO_printf (bio_err, "-out file	output file\n");
-		BIO_printf (bio_err, "-topk8    output PKCS8 file\n");
-		BIO_printf (bio_err, "-nooct    use (broken) no octet form\n");
-		BIO_printf (bio_err, "-noiter   use 1 as iteration cound\n");
+		BIO_printf (bio_err, "-in file   input file\n");
+		BIO_printf (bio_err, "-inform X  input format (DER or PEM)\n");
+		BIO_printf (bio_err, "-outform X output format (DER or PEM)\n");
+		BIO_printf (bio_err, "-out file  output file\n");
+		BIO_printf (bio_err, "-topk8     output PKCS8 file\n");
+		BIO_printf (bio_err, "-nooct     use (broken) no octet form\n");
+		BIO_printf (bio_err, "-noiter    use 1 as iteration count\n");
+		BIO_printf (bio_err, "-nocrypt   use or expect unencrypted private key\n");
+		BIO_printf (bio_err, "-v2 alg    use PKCS#5 v2.0 and cipher \"alg\"\n");
 		return (1);
 	}
 
-	if (pbe_nid == -1) pbe_nid = NID_pbeWithMD5AndDES_CBC;
+	if ((pbe_nid == -1) && !cipher) pbe_nid = NID_pbeWithMD5AndDES_CBC;
 
 	if (infile) {
-		if (!(in = BIO_new_file (infile, "r"))) {
+		if (!(in = BIO_new_file (infile, "rb"))) {
 			BIO_printf (bio_err,
 				 "Can't open input file %s\n", infile);
 			return (1);
@@ -122,7 +152,7 @@ int MAIN(int argc, char **argv)
 	} else in = BIO_new_fp (stdin, BIO_NOCLOSE);
 
 	if (outfile) {
-		if (!(out = BIO_new_file (outfile, "w"))) {
+		if (!(out = BIO_new_file (outfile, "wb"))) {
 			BIO_printf (bio_err,
 				 "Can't open output file %s\n", outfile);
 			return (1);
@@ -135,32 +165,77 @@ int MAIN(int argc, char **argv)
 			ERR_print_errors(bio_err);
 			return (1);
 		}
+		BIO_free(in);
 		if (!(p8inf = EVP_PKEY2PKCS8(pkey))) {
 			BIO_printf (bio_err, "Error converting key\n", outfile);
 			ERR_print_errors(bio_err);
 			return (1);
 		}
 		PKCS8_set_broken(p8inf, p8_broken);
-		EVP_read_pw_string(pass, 50, "Enter Encryption Password:", 1);
-		if (!(p8 = PKCS8_encrypt(pbe_nid, pass, strlen(pass),
-				 NULL, 0, iter, p8inf))) {
-			BIO_printf (bio_err, "Error encrypting key\n", outfile);
-			ERR_print_errors(bio_err);
-			return (1);
+		if(nocrypt) {
+			if(outformat == FORMAT_PEM) 
+				PEM_write_bio_PKCS8_PRIV_KEY_INFO(out, p8inf);
+			else if(outformat == FORMAT_ASN1)
+				i2d_PKCS8_PRIV_KEY_INFO_bio(out, p8inf);
+			else {
+				BIO_printf(bio_err, "Bad format specified for key\n");
+				return (1);
+			}
+		} else {
+			EVP_read_pw_string(pass, 50, "Enter Encryption Password:", 1);
+			if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,
+					pass, strlen(pass),
+					NULL, 0, iter, p8inf))) {
+				BIO_printf (bio_err, "Error encrypting key\n",
+								 outfile);
+				ERR_print_errors(bio_err);
+				return (1);
+			}
+			if(outformat == FORMAT_PEM) 
+				PEM_write_bio_PKCS8 (out, p8);
+			else if(outformat == FORMAT_ASN1)
+				i2d_PKCS8_bio(out, p8);
+			else {
+				BIO_printf(bio_err, "Bad format specified for key\n");
+				return (1);
+			}
+			X509_SIG_free(p8);
 		}
 		PKCS8_PRIV_KEY_INFO_free (p8inf);
-		PEM_write_bio_PKCS8 (out, p8);
-		X509_SIG_free(p8);
+		EVP_PKEY_free(pkey);
+		BIO_free(out);
 		return (0);
 	}
 
-	if (!(p8 = PEM_read_bio_PKCS8 (in, NULL, NULL))) {
-		BIO_printf (bio_err, "Error reading key\n", outfile);
-		ERR_print_errors(bio_err);
-		return (1);
+	if(nocrypt) {
+		if(informat == FORMAT_PEM) 
+			p8inf = PEM_read_bio_PKCS8_PRIV_KEY_INFO(in,NULL,NULL);
+		else if(informat == FORMAT_ASN1)
+			p8inf = d2i_PKCS8_PRIV_KEY_INFO_bio(in, NULL);
+		else {
+			BIO_printf(bio_err, "Bad format specified for key\n");
+			return (1);
+		}
+	} else {
+		if(informat == FORMAT_PEM) 
+			p8 = PEM_read_bio_PKCS8(in, NULL, NULL);
+		else if(informat == FORMAT_ASN1)
+			p8 = d2i_PKCS8_bio(in, NULL);
+		else {
+			BIO_printf(bio_err, "Bad format specified for key\n");
+			return (1);
+		}
+
+		if (!p8) {
+			BIO_printf (bio_err, "Error reading key\n", outfile);
+			ERR_print_errors(bio_err);
+			return (1);
+		}
+		EVP_read_pw_string(pass, 50, "Enter Password:", 0);
+		p8inf = M_PKCS8_decrypt(p8, pass, strlen(pass));
+		X509_SIG_free(p8);
 	}
-	EVP_read_pw_string(pass, 50, "Enter Password:", 0);
-	p8inf = M_PKCS8_decrypt(p8, pass, strlen(pass));
+
 	if (!p8inf) {
 		BIO_printf(bio_err, "Error decrypting key\n", outfile);
 		ERR_print_errors(bio_err);
@@ -188,7 +263,11 @@ int MAIN(int argc, char **argv)
 	
 	PKCS8_PRIV_KEY_INFO_free(p8inf);
 
-	PEM_write_bio_PrivateKey (out, pkey, NULL, NULL, 0, NULL);
+	PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, NULL);
+
+	EVP_PKEY_free(pkey);
+	BIO_free(out);
+	BIO_free(in);
 
 	return (0);
 }