mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 05:21:51 +08:00
dd1abd4462
In apps/apps.c, one can set up an engine with setup_engine(). However, we freed the structural reference immediately, which means that for engines that don't already have a structural reference somewhere else (because it's a built in engine), we end up returning an invalid reference. Instead, the function release_engine() is added, and called at the end of the routines that call setup_engine(). Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1643)
105 lines
2.6 KiB
C
105 lines
2.6 KiB
C
/*
|
|
* Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#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_IN, OPT_OUT, OPT_TEXT, OPT_NOOUT, OPT_ENGINE
|
|
} OPTION_CHOICE;
|
|
|
|
const OPTIONS pkeyparam_options[] = {
|
|
{"help", OPT_HELP, '-', "Display this summary"},
|
|
{"in", OPT_IN, '<', "Input file"},
|
|
{"out", OPT_OUT, '>', "Output file"},
|
|
{"text", OPT_TEXT, '-', "Print parameters as text"},
|
|
{"noout", OPT_NOOUT, '-', "Don't output encoded parameters"},
|
|
#ifndef OPENSSL_NO_ENGINE
|
|
{"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
|
|
#endif
|
|
{NULL}
|
|
};
|
|
|
|
int pkeyparam_main(int argc, char **argv)
|
|
{
|
|
ENGINE *e = NULL;
|
|
BIO *in = NULL, *out = NULL;
|
|
EVP_PKEY *pkey = NULL;
|
|
int text = 0, noout = 0, ret = 1;
|
|
OPTION_CHOICE o;
|
|
char *infile = NULL, *outfile = NULL, *prog;
|
|
|
|
prog = opt_init(argc, argv, pkeyparam_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(pkeyparam_options);
|
|
ret = 0;
|
|
goto end;
|
|
case OPT_IN:
|
|
infile = opt_arg();
|
|
break;
|
|
case OPT_OUT:
|
|
outfile = opt_arg();
|
|
break;
|
|
case OPT_ENGINE:
|
|
e = setup_engine(opt_arg(), 0);
|
|
break;
|
|
case OPT_TEXT:
|
|
text = 1;
|
|
break;
|
|
case OPT_NOOUT:
|
|
noout = 1;
|
|
break;
|
|
}
|
|
}
|
|
argc = opt_num_rest();
|
|
if (argc != 0)
|
|
goto opthelp;
|
|
|
|
in = bio_open_default(infile, 'r', FORMAT_PEM);
|
|
if (in == NULL)
|
|
goto end;
|
|
out = bio_open_default(outfile, 'w', FORMAT_PEM);
|
|
if (out == NULL)
|
|
goto end;
|
|
pkey = PEM_read_bio_Parameters(in, NULL);
|
|
if (!pkey) {
|
|
BIO_printf(bio_err, "Error reading parameters\n");
|
|
ERR_print_errors(bio_err);
|
|
goto end;
|
|
}
|
|
|
|
if (!noout)
|
|
PEM_write_bio_Parameters(out, pkey);
|
|
|
|
if (text)
|
|
EVP_PKEY_print_params(out, pkey, 0, NULL);
|
|
|
|
ret = 0;
|
|
|
|
end:
|
|
EVP_PKEY_free(pkey);
|
|
release_engine(e);
|
|
BIO_free_all(out);
|
|
BIO_free(in);
|
|
|
|
return ret;
|
|
}
|