mirror of
https://github.com/openssl/openssl.git
synced 2024-12-17 22:13:45 +08:00
3b061a00e3
When generating a private key, try to make the output file be readable only by the owner. Put it in CHANGES file since it might be noticeable. Add "int private" flag to apps that write private keys, and check that it's set whenever we do write a private key. Checked via assert so that this bug (security-related) gets fixed. Thanks to Viktor for help in tracing the code-paths where private keys are written. Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
403 lines
14 KiB
C
403 lines
14 KiB
C
/*
|
|
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
|
|
* 1999-2004.
|
|
*/
|
|
/* ====================================================================
|
|
* Copyright (c) 1999 The OpenSSL Project. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
*
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
*
|
|
* 3. All advertising materials mentioning features or use of this
|
|
* software must display the following acknowledgment:
|
|
* "This product includes software developed by the OpenSSL Project
|
|
* for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
|
|
*
|
|
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
|
* endorse or promote products derived from this software without
|
|
* prior written permission. For written permission, please contact
|
|
* licensing@OpenSSL.org.
|
|
*
|
|
* 5. Products derived from this software may not be called "OpenSSL"
|
|
* nor may "OpenSSL" appear in their names without prior written
|
|
* permission of the OpenSSL Project.
|
|
*
|
|
* 6. Redistributions of any form whatsoever must retain the following
|
|
* acknowledgment:
|
|
* "This product includes software developed by the OpenSSL Project
|
|
* for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
|
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
|
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
|
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
* ====================================================================
|
|
*
|
|
* This product includes cryptographic software written by Eric Young
|
|
* (eay@cryptsoft.com). This product includes software written by Tim
|
|
* Hudson (tjh@cryptsoft.com).
|
|
*
|
|
*/
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include "apps.h"
|
|
#include <openssl/pem.h>
|
|
#include <openssl/err.h>
|
|
#include <openssl/evp.h>
|
|
#include <openssl/pkcs12.h>
|
|
|
|
typedef enum OPTION_choice {
|
|
OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
|
|
OPT_INFORM, OPT_OUTFORM, OPT_ENGINE, OPT_IN, OPT_OUT,
|
|
OPT_TOPK8, OPT_NOITER, OPT_NOCRYPT, OPT_NOOCT, OPT_NSDB, OPT_EMBED,
|
|
OPT_V2, OPT_V1, OPT_V2PRF, OPT_ITER, OPT_PASSIN, OPT_PASSOUT,
|
|
OPT_SCRYPT, OPT_SCRYPT_N, OPT_SCRYPT_R, OPT_SCRYPT_P
|
|
} OPTION_CHOICE;
|
|
|
|
OPTIONS pkcs8_options[] = {
|
|
{"help", OPT_HELP, '-', "Display this summary"},
|
|
{"inform", OPT_INFORM, 'F', "Input format (DER or PEM)"},
|
|
{"outform", OPT_OUTFORM, 'F', "Output format (DER or PEM)"},
|
|
{"in", OPT_IN, '<', "Input file"},
|
|
{"out", OPT_OUT, '>', "Output file"},
|
|
{"topk8", OPT_TOPK8, '-', "Output PKCS8 file"},
|
|
{"noiter", OPT_NOITER, '-', "Use 1 as iteration count"},
|
|
{"nocrypt", OPT_NOCRYPT, '-', "Use or expect unencrypted private key"},
|
|
{"nooct", OPT_NOOCT, '-', "Use (nonstandard) no octet format"},
|
|
{"nsdb", OPT_NSDB, '-', "Use (nonstandard) DSA Netscape DB format"},
|
|
{"embed", OPT_EMBED, '-',
|
|
"Use (nonstandard) embedded DSA parameters format"},
|
|
{"v2", OPT_V2, 's', "Use PKCS#5 v2.0 and cipher"},
|
|
{"v1", OPT_V1, 's', "Use PKCS#5 v1.5 and cipher"},
|
|
{"v2prf", OPT_V2PRF, 's'},
|
|
{"iter", OPT_ITER, 'p', "Specify the iteration count"},
|
|
{"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
|
|
{"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
|
|
#ifndef OPENSSL_NO_ENGINE
|
|
{"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
|
|
#endif
|
|
{"scrypt", OPT_SCRYPT, '-', "Use scrypt algorithm"},
|
|
{"scrypt_N", OPT_SCRYPT_N, 's', "Set scrypt N parameter"},
|
|
{"scrypt_r", OPT_SCRYPT_R, 's', "Set scrypt r parameter"},
|
|
{"scrypt_p", OPT_SCRYPT_P, 's', "Set scrypt p parameter"},
|
|
{NULL}
|
|
};
|
|
|
|
int pkcs8_main(int argc, char **argv)
|
|
{
|
|
BIO *in = NULL, *out = NULL;
|
|
ENGINE *e = NULL;
|
|
EVP_PKEY *pkey = NULL;
|
|
PKCS8_PRIV_KEY_INFO *p8inf = NULL;
|
|
X509_SIG *p8 = NULL;
|
|
const EVP_CIPHER *cipher = NULL;
|
|
char *infile = NULL, *outfile = NULL;
|
|
char *passinarg = NULL, *passoutarg = NULL, *prog;
|
|
char pass[50], *passin = NULL, *passout = NULL, *p8pass = NULL;
|
|
OPTION_CHOICE o;
|
|
int nocrypt = 0, ret = 1, iter = PKCS12_DEFAULT_ITER, p8_broken = PKCS8_OK;
|
|
int informat = FORMAT_PEM, outformat = FORMAT_PEM, topk8 = 0, pbe_nid = -1;
|
|
int private = 0;
|
|
unsigned long scrypt_N = 0, scrypt_r = 0, scrypt_p = 0;
|
|
|
|
prog = opt_init(argc, argv, pkcs8_options);
|
|
while ((o = opt_next()) != OPT_EOF) {
|
|
switch (o) {
|
|
case OPT_EOF:
|
|
case OPT_ERR:
|
|
opthelp:
|
|
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
|
|
goto end;
|
|
case OPT_HELP:
|
|
opt_help(pkcs8_options);
|
|
ret = 0;
|
|
goto end;
|
|
case OPT_INFORM:
|
|
if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &informat))
|
|
goto opthelp;
|
|
break;
|
|
case OPT_IN:
|
|
infile = opt_arg();
|
|
break;
|
|
case OPT_OUTFORM:
|
|
if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &outformat))
|
|
goto opthelp;
|
|
break;
|
|
case OPT_OUT:
|
|
outfile = opt_arg();
|
|
break;
|
|
case OPT_TOPK8:
|
|
topk8 = 1;
|
|
break;
|
|
case OPT_NOITER:
|
|
iter = 1;
|
|
break;
|
|
case OPT_NOCRYPT:
|
|
nocrypt = 1;
|
|
break;
|
|
case OPT_NOOCT:
|
|
p8_broken = PKCS8_NO_OCTET;
|
|
break;
|
|
case OPT_NSDB:
|
|
p8_broken = PKCS8_NS_DB;
|
|
break;
|
|
case OPT_EMBED:
|
|
p8_broken = PKCS8_EMBEDDED_PARAM;
|
|
break;
|
|
case OPT_V2:
|
|
if (!opt_cipher(opt_arg(), &cipher))
|
|
goto opthelp;
|
|
break;
|
|
case OPT_V1:
|
|
pbe_nid = OBJ_txt2nid(opt_arg());
|
|
if (pbe_nid == NID_undef) {
|
|
BIO_printf(bio_err,
|
|
"%s: Unknown PBE algorithm %s\n", prog, opt_arg());
|
|
goto opthelp;
|
|
}
|
|
break;
|
|
case OPT_V2PRF:
|
|
pbe_nid = OBJ_txt2nid(opt_arg());
|
|
if (!EVP_PBE_find(EVP_PBE_TYPE_PRF, pbe_nid, NULL, NULL, 0)) {
|
|
BIO_printf(bio_err,
|
|
"%s: Unknown PRF algorithm %s\n", prog, opt_arg());
|
|
goto opthelp;
|
|
}
|
|
break;
|
|
case OPT_ITER:
|
|
if (!opt_int(opt_arg(), &iter))
|
|
goto opthelp;
|
|
break;
|
|
case OPT_PASSIN:
|
|
passinarg = opt_arg();
|
|
break;
|
|
case OPT_PASSOUT:
|
|
passoutarg = opt_arg();
|
|
break;
|
|
case OPT_ENGINE:
|
|
e = setup_engine(opt_arg(), 0);
|
|
break;
|
|
case OPT_SCRYPT:
|
|
scrypt_N = 1024;
|
|
scrypt_r = 8;
|
|
scrypt_p = 16;
|
|
if (cipher == NULL)
|
|
cipher = EVP_aes_256_cbc();
|
|
break;
|
|
case OPT_SCRYPT_N:
|
|
if (!opt_ulong(opt_arg(), &scrypt_N))
|
|
goto opthelp;
|
|
break;
|
|
case OPT_SCRYPT_R:
|
|
if (!opt_ulong(opt_arg(), &scrypt_r))
|
|
goto opthelp;
|
|
break;
|
|
case OPT_SCRYPT_P:
|
|
if (!opt_ulong(opt_arg(), &scrypt_p))
|
|
goto opthelp;
|
|
break;
|
|
}
|
|
}
|
|
argc = opt_num_rest();
|
|
argv = opt_rest();
|
|
private = 1;
|
|
|
|
if (!app_passwd(passinarg, passoutarg, &passin, &passout)) {
|
|
BIO_printf(bio_err, "Error getting passwords\n");
|
|
goto end;
|
|
}
|
|
|
|
if (!app_load_modules(NULL))
|
|
goto end;
|
|
|
|
if ((pbe_nid == -1) && !cipher)
|
|
pbe_nid = NID_pbeWithMD5AndDES_CBC;
|
|
|
|
in = bio_open_default(infile, "rb");
|
|
if (in == NULL)
|
|
goto end;
|
|
out = bio_open_owner(outfile, "wb", private);
|
|
if (out == NULL)
|
|
goto end;
|
|
|
|
if (topk8) {
|
|
pkey = load_key(infile, informat, 1, passin, e, "key");
|
|
if (!pkey)
|
|
goto end;
|
|
if ((p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken)) == NULL) {
|
|
BIO_printf(bio_err, "Error converting key\n");
|
|
ERR_print_errors(bio_err);
|
|
goto end;
|
|
}
|
|
if (nocrypt) {
|
|
assert(private);
|
|
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");
|
|
goto end;
|
|
}
|
|
} else {
|
|
X509_ALGOR *pbe;
|
|
if (cipher) {
|
|
if (scrypt_N && scrypt_r && scrypt_p)
|
|
pbe = PKCS5_pbe2_set_scrypt(cipher, NULL, 0, NULL,
|
|
scrypt_N, scrypt_r, scrypt_p);
|
|
else
|
|
pbe = PKCS5_pbe2_set_iv(cipher, iter, NULL, 0, NULL,
|
|
pbe_nid);
|
|
} else {
|
|
pbe = PKCS5_pbe_set(pbe_nid, iter, NULL, 0);
|
|
}
|
|
if (pbe == NULL) {
|
|
BIO_printf(bio_err, "Error setting PBE algorithm\n");
|
|
ERR_print_errors(bio_err);
|
|
goto end;
|
|
}
|
|
if (passout)
|
|
p8pass = passout;
|
|
else {
|
|
p8pass = pass;
|
|
if (EVP_read_pw_string
|
|
(pass, sizeof pass, "Enter Encryption Password:", 1)) {
|
|
X509_ALGOR_free(pbe);
|
|
goto end;
|
|
}
|
|
}
|
|
app_RAND_load_file(NULL, 0);
|
|
p8 = PKCS8_set0_pbe(p8pass, strlen(p8pass), p8inf, pbe);
|
|
if (p8 == NULL) {
|
|
X509_ALGOR_free(pbe);
|
|
BIO_printf(bio_err, "Error encrypting key\n");
|
|
ERR_print_errors(bio_err);
|
|
goto end;
|
|
}
|
|
app_RAND_write_file(NULL);
|
|
assert(private);
|
|
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");
|
|
goto end;
|
|
}
|
|
}
|
|
|
|
ret = 0;
|
|
goto end;
|
|
}
|
|
|
|
if (nocrypt) {
|
|
if (informat == FORMAT_PEM)
|
|
p8inf = PEM_read_bio_PKCS8_PRIV_KEY_INFO(in, NULL, 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");
|
|
goto end;
|
|
}
|
|
} else {
|
|
if (informat == FORMAT_PEM)
|
|
p8 = PEM_read_bio_PKCS8(in, NULL, NULL, NULL);
|
|
else if (informat == FORMAT_ASN1)
|
|
p8 = d2i_PKCS8_bio(in, NULL);
|
|
else {
|
|
BIO_printf(bio_err, "Bad format specified for key\n");
|
|
goto end;
|
|
}
|
|
|
|
if (!p8) {
|
|
BIO_printf(bio_err, "Error reading key\n");
|
|
ERR_print_errors(bio_err);
|
|
goto end;
|
|
}
|
|
if (passin)
|
|
p8pass = passin;
|
|
else {
|
|
p8pass = pass;
|
|
EVP_read_pw_string(pass, sizeof pass, "Enter Password:", 0);
|
|
}
|
|
p8inf = PKCS8_decrypt(p8, p8pass, strlen(p8pass));
|
|
}
|
|
|
|
if (!p8inf) {
|
|
BIO_printf(bio_err, "Error decrypting key\n");
|
|
ERR_print_errors(bio_err);
|
|
goto end;
|
|
}
|
|
|
|
if ((pkey = EVP_PKCS82PKEY(p8inf)) == NULL) {
|
|
BIO_printf(bio_err, "Error converting key\n");
|
|
ERR_print_errors(bio_err);
|
|
goto end;
|
|
}
|
|
|
|
if (p8inf->broken) {
|
|
BIO_printf(bio_err, "Warning: broken key encoding: ");
|
|
switch (p8inf->broken) {
|
|
case PKCS8_NO_OCTET:
|
|
BIO_printf(bio_err, "No Octet String in PrivateKey\n");
|
|
break;
|
|
|
|
case PKCS8_EMBEDDED_PARAM:
|
|
BIO_printf(bio_err, "DSA parameters included in PrivateKey\n");
|
|
break;
|
|
|
|
case PKCS8_NS_DB:
|
|
BIO_printf(bio_err, "DSA public key include in PrivateKey\n");
|
|
break;
|
|
|
|
case PKCS8_NEG_PRIVKEY:
|
|
BIO_printf(bio_err, "DSA private key value is negative\n");
|
|
break;
|
|
|
|
default:
|
|
BIO_printf(bio_err, "Unknown broken type\n");
|
|
break;
|
|
}
|
|
}
|
|
|
|
assert(private);
|
|
if (outformat == FORMAT_PEM)
|
|
PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, NULL, passout);
|
|
else if (outformat == FORMAT_ASN1)
|
|
i2d_PrivateKey_bio(out, pkey);
|
|
else {
|
|
BIO_printf(bio_err, "Bad format specified for key\n");
|
|
goto end;
|
|
}
|
|
ret = 0;
|
|
|
|
end:
|
|
X509_SIG_free(p8);
|
|
PKCS8_PRIV_KEY_INFO_free(p8inf);
|
|
EVP_PKEY_free(pkey);
|
|
BIO_free_all(out);
|
|
BIO_free(in);
|
|
OPENSSL_free(passin);
|
|
OPENSSL_free(passout);
|
|
|
|
return ret;
|
|
}
|