mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 12:04:38 +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>
227 lines
7.5 KiB
C
227 lines
7.5 KiB
C
/*
|
|
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
|
|
* 2006
|
|
*/
|
|
/* ====================================================================
|
|
* Copyright (c) 2006 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 <string.h>
|
|
#include "apps.h"
|
|
#include <openssl/pem.h>
|
|
#include <openssl/err.h>
|
|
#include <openssl/evp.h>
|
|
|
|
typedef enum OPTION_choice {
|
|
OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
|
|
OPT_INFORM, OPT_OUTFORM, OPT_PASSIN, OPT_PASSOUT, OPT_ENGINE,
|
|
OPT_IN, OPT_OUT, OPT_PUBIN, OPT_PUBOUT, OPT_TEXT_PUB,
|
|
OPT_TEXT, OPT_NOOUT, OPT_MD
|
|
} OPTION_CHOICE;
|
|
|
|
OPTIONS pkey_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)"},
|
|
{"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
|
|
{"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
|
|
{"in", OPT_IN, '<', "Input file"},
|
|
{"out", OPT_OUT, '>', "Output file"},
|
|
{"pubin", OPT_PUBIN, '-',
|
|
"Read public key from input (default is private key)"},
|
|
{"pubout", OPT_PUBOUT, '-', "Output public key, not private"},
|
|
{"text_pub", OPT_TEXT_PUB, '-', "Only output public key components"},
|
|
{"text", OPT_TEXT, '-', "Output in plaintext as well"},
|
|
{"noout", OPT_NOOUT, '-', "Don't output the key"},
|
|
{"", OPT_MD, '-', "Any supported cipher"},
|
|
#ifndef OPENSSL_NO_ENGINE
|
|
{"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
|
|
#endif
|
|
{NULL}
|
|
};
|
|
|
|
int pkey_main(int argc, char **argv)
|
|
{
|
|
BIO *in = NULL, *out = NULL;
|
|
ENGINE *e = NULL;
|
|
EVP_PKEY *pkey = NULL;
|
|
const EVP_CIPHER *cipher = NULL;
|
|
char *infile = NULL, *outfile = NULL, *passin = NULL, *passout = NULL;
|
|
char *passinarg = NULL, *passoutarg = NULL, *prog;
|
|
OPTION_CHOICE o;
|
|
int informat = FORMAT_PEM, outformat = FORMAT_PEM;
|
|
int pubin = 0, pubout = 0, pubtext = 0, text = 0, noout = 0, ret = 1;
|
|
int private = 0;
|
|
|
|
prog = opt_init(argc, argv, pkey_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(pkey_options);
|
|
ret = 0;
|
|
goto end;
|
|
case OPT_INFORM:
|
|
if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &informat))
|
|
goto opthelp;
|
|
break;
|
|
case OPT_OUTFORM:
|
|
if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &outformat))
|
|
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_IN:
|
|
infile = opt_arg();
|
|
break;
|
|
case OPT_OUT:
|
|
outfile = opt_arg();
|
|
break;
|
|
case OPT_PUBIN:
|
|
pubin = pubout = pubtext = 1;
|
|
break;
|
|
case OPT_PUBOUT:
|
|
pubout = 1;
|
|
break;
|
|
case OPT_TEXT_PUB:
|
|
pubtext = text = 1;
|
|
break;
|
|
case OPT_TEXT:
|
|
text = 1;
|
|
break;
|
|
case OPT_NOOUT:
|
|
noout = 1;
|
|
break;
|
|
case OPT_MD:
|
|
if (!opt_cipher(opt_unknown(), &cipher))
|
|
goto opthelp;
|
|
}
|
|
}
|
|
argc = opt_num_rest();
|
|
argv = opt_rest();
|
|
private = !noout && !pubout ? 1 : 0;
|
|
if (text && !pubtext)
|
|
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;
|
|
|
|
out = bio_open_owner(outfile, "wb", private);
|
|
if (out == NULL)
|
|
goto end;
|
|
|
|
if (pubin)
|
|
pkey = load_pubkey(infile, informat, 1, passin, e, "Public Key");
|
|
else
|
|
pkey = load_key(infile, informat, 1, passin, e, "key");
|
|
if (!pkey)
|
|
goto end;
|
|
|
|
if (!noout) {
|
|
if (outformat == FORMAT_PEM) {
|
|
assert(private);
|
|
if (pubout)
|
|
PEM_write_bio_PUBKEY(out, pkey);
|
|
else
|
|
PEM_write_bio_PrivateKey(out, pkey, cipher,
|
|
NULL, 0, NULL, passout);
|
|
} else if (outformat == FORMAT_ASN1) {
|
|
assert(private);
|
|
if (pubout)
|
|
i2d_PUBKEY_bio(out, pkey);
|
|
else
|
|
i2d_PrivateKey_bio(out, pkey);
|
|
} else {
|
|
BIO_printf(bio_err, "Bad format specified for key\n");
|
|
goto end;
|
|
}
|
|
|
|
}
|
|
|
|
if (text) {
|
|
if (pubtext)
|
|
EVP_PKEY_print_public(out, pkey, 0, NULL);
|
|
else {
|
|
assert(private);
|
|
EVP_PKEY_print_private(out, pkey, 0, NULL);
|
|
}
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
end:
|
|
EVP_PKEY_free(pkey);
|
|
BIO_free_all(out);
|
|
BIO_free(in);
|
|
OPENSSL_free(passin);
|
|
OPENSSL_free(passout);
|
|
|
|
return ret;
|
|
}
|