2015-01-22 11:40:55 +08:00
|
|
|
/*
|
2021-02-18 22:57:13 +08:00
|
|
|
* Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
|
1999-03-30 01:50:26 +08:00
|
|
|
*
|
2018-12-06 20:00:26 +08:00
|
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
2016-05-18 02:18:30 +08:00
|
|
|
* 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
|
1999-03-30 01:50:26 +08:00
|
|
|
*/
|
|
|
|
|
2005-06-01 01:36:06 +08:00
|
|
|
#include <openssl/opensslconf.h>
|
|
|
|
|
2020-03-05 05:52:22 +08:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include "apps.h"
|
|
|
|
#include "progs.h"
|
|
|
|
#include <openssl/crypto.h>
|
|
|
|
#include <openssl/err.h>
|
|
|
|
#include <openssl/pem.h>
|
|
|
|
#include <openssl/pkcs12.h>
|
2020-07-22 19:36:36 +08:00
|
|
|
#include <openssl/provider.h>
|
2021-03-06 01:08:05 +08:00
|
|
|
#include <openssl/kdf.h>
|
2020-03-05 05:52:22 +08:00
|
|
|
|
|
|
|
#define NOKEYS 0x1
|
|
|
|
#define NOCERTS 0x2
|
|
|
|
#define INFO 0x4
|
|
|
|
#define CLCERTS 0x8
|
|
|
|
#define CACERTS 0x10
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2017-07-06 08:37:10 +08:00
|
|
|
#define PASSWD_BUF_SIZE 2048
|
2020-11-26 22:39:22 +08:00
|
|
|
|
|
|
|
#define WARN_EXPORT(opt) \
|
|
|
|
BIO_printf(bio_err, "Warning: -%s option ignored with -export\n", opt);
|
|
|
|
#define WARN_NO_EXPORT(opt) \
|
|
|
|
BIO_printf(bio_err, "Warning: -%s option ignored without -export\n", opt);
|
2017-07-06 08:37:10 +08:00
|
|
|
|
2016-01-01 13:51:12 +08:00
|
|
|
static int get_cert_chain(X509 *cert, X509_STORE *store,
|
2020-08-10 20:23:46 +08:00
|
|
|
STACK_OF(X509) *untrusted_certs,
|
2016-01-01 13:51:12 +08:00
|
|
|
STACK_OF(X509) **chain);
|
2016-08-13 19:07:42 +08:00
|
|
|
int dump_certs_keys_p12(BIO *out, const PKCS12 *p12,
|
|
|
|
const char *pass, int passlen, int options,
|
|
|
|
char *pempass, const EVP_CIPHER *enc);
|
|
|
|
int dump_certs_pkeys_bags(BIO *out, const STACK_OF(PKCS12_SAFEBAG) *bags,
|
|
|
|
const char *pass, int passlen, int options,
|
|
|
|
char *pempass, const EVP_CIPHER *enc);
|
|
|
|
int dump_certs_pkeys_bag(BIO *out, const PKCS12_SAFEBAG *bags,
|
|
|
|
const char *pass, int passlen,
|
|
|
|
int options, char *pempass, const EVP_CIPHER *enc);
|
2019-09-02 08:06:29 +08:00
|
|
|
void print_attribute(BIO *out, const ASN1_TYPE *av);
|
2016-08-13 20:40:05 +08:00
|
|
|
int print_attribs(BIO *out, const STACK_OF(X509_ATTRIBUTE) *attrlst,
|
2015-01-22 11:40:55 +08:00
|
|
|
const char *name);
|
1999-03-30 01:50:26 +08:00
|
|
|
void hex_prin(BIO *out, unsigned char *buf, int len);
|
2016-08-18 00:27:05 +08:00
|
|
|
static int alg_print(const X509_ALGOR *alg);
|
1999-06-05 06:23:10 +08:00
|
|
|
int cert_load(BIO *in, STACK_OF(X509) *sk);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
static int set_pbe(int *ppbe, const char *str);
|
|
|
|
|
|
|
|
typedef enum OPTION_choice {
|
2021-05-01 21:29:00 +08:00
|
|
|
OPT_COMMON,
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
OPT_CIPHER, OPT_NOKEYS, OPT_KEYEX, OPT_KEYSIG, OPT_NOCERTS, OPT_CLCERTS,
|
|
|
|
OPT_CACERTS, OPT_NOOUT, OPT_INFO, OPT_CHAIN, OPT_TWOPASS, OPT_NOMACVER,
|
2021-02-17 15:56:36 +08:00
|
|
|
#ifndef OPENSSL_NO_DES
|
|
|
|
OPT_DESCERT,
|
|
|
|
#endif
|
|
|
|
OPT_EXPORT, OPT_ITER, OPT_NOITER, OPT_MACITER, OPT_NOMACITER,
|
2020-05-11 21:41:08 +08:00
|
|
|
OPT_NOMAC, OPT_LMK, OPT_NODES, OPT_NOENC, OPT_MACALG, OPT_CERTPBE, OPT_KEYPBE,
|
2020-08-10 20:23:46 +08:00
|
|
|
OPT_INKEY, OPT_CERTFILE, OPT_UNTRUSTED, OPT_PASSCERTS,
|
|
|
|
OPT_NAME, OPT_CSP, OPT_CANAME,
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
OPT_IN, OPT_OUT, OPT_PASSIN, OPT_PASSOUT, OPT_PASSWORD, OPT_CAPATH,
|
2019-03-07 22:26:34 +08:00
|
|
|
OPT_CAFILE, OPT_CASTORE, OPT_NOCAPATH, OPT_NOCAFILE, OPT_NOCASTORE, OPT_ENGINE,
|
2021-04-30 07:11:42 +08:00
|
|
|
OPT_R_ENUM, OPT_PROV_ENUM,
|
2021-02-17 15:56:36 +08:00
|
|
|
#ifndef OPENSSL_NO_DES
|
|
|
|
OPT_LEGACY_ALG
|
|
|
|
#endif
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
} OPTION_CHOICE;
|
|
|
|
|
2016-03-13 21:07:50 +08:00
|
|
|
const OPTIONS pkcs12_options[] = {
|
2019-11-08 04:08:30 +08:00
|
|
|
OPT_SECTION("General"),
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
{"help", OPT_HELP, '-', "Display this summary"},
|
2020-11-26 22:39:22 +08:00
|
|
|
{"in", OPT_IN, '<', "Input file"},
|
|
|
|
{"out", OPT_OUT, '>', "Output file"},
|
|
|
|
{"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
|
|
|
|
{"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
|
|
|
|
{"password", OPT_PASSWORD, 's', "Set PKCS#12 import/export password source"},
|
|
|
|
{"twopass", OPT_TWOPASS, '-', "Separate MAC, encryption passwords"},
|
|
|
|
{"nokeys", OPT_NOKEYS, '-', "Don't output private keys"},
|
|
|
|
{"nocerts", OPT_NOCERTS, '-', "Don't output certificates"},
|
|
|
|
{"noout", OPT_NOOUT, '-', "Don't output anything, just verify PKCS#12 input"},
|
2021-02-17 15:56:36 +08:00
|
|
|
#ifndef OPENSSL_NO_DES
|
2020-11-26 18:03:24 +08:00
|
|
|
{"legacy", OPT_LEGACY_ALG, '-',
|
2021-02-17 15:56:36 +08:00
|
|
|
# ifdef OPENSSL_NO_RC2
|
2020-11-26 18:03:24 +08:00
|
|
|
"Use legacy encryption algorithm 3DES_CBC for keys and certs"
|
2021-02-17 15:56:36 +08:00
|
|
|
# else
|
2020-11-26 18:03:24 +08:00
|
|
|
"Use legacy encryption: 3DES_CBC for keys, RC2_CBC for certs"
|
2021-02-17 15:56:36 +08:00
|
|
|
# endif
|
2020-11-26 18:03:24 +08:00
|
|
|
},
|
2021-02-17 15:56:36 +08:00
|
|
|
#endif
|
2020-03-05 05:52:22 +08:00
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
2019-11-08 04:08:30 +08:00
|
|
|
{"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
|
2020-03-05 05:52:22 +08:00
|
|
|
#endif
|
2020-11-26 22:39:22 +08:00
|
|
|
OPT_PROV_OPTIONS,
|
|
|
|
OPT_R_OPTIONS,
|
2020-08-10 20:23:46 +08:00
|
|
|
|
2020-11-26 22:39:22 +08:00
|
|
|
OPT_SECTION("PKCS#12 import (parsing PKCS#12)"),
|
|
|
|
{"info", OPT_INFO, '-', "Print info about PKCS#12 structure"},
|
|
|
|
{"nomacver", OPT_NOMACVER, '-', "Don't verify integrity MAC"},
|
|
|
|
{"clcerts", OPT_CLCERTS, '-', "Only output client certificates"},
|
|
|
|
{"cacerts", OPT_CACERTS, '-', "Only output CA certificates"},
|
|
|
|
{"", OPT_CIPHER, '-', "Any supported cipher for output encryption"},
|
|
|
|
{"noenc", OPT_NOENC, '-', "Don't encrypt private keys"},
|
|
|
|
{"nodes", OPT_NODES, '-', "Don't encrypt private keys; deprecated"},
|
|
|
|
|
|
|
|
OPT_SECTION("PKCS#12 output (export)"),
|
|
|
|
{"export", OPT_EXPORT, '-', "Create PKCS12 file"},
|
2020-08-10 20:23:46 +08:00
|
|
|
{"inkey", OPT_INKEY, 's', "Private key, else read from -in input file"},
|
|
|
|
{"certfile", OPT_CERTFILE, '<', "Extra certificates for PKCS12 output"},
|
|
|
|
{"passcerts", OPT_PASSCERTS, 's', "Certificate file pass phrase source"},
|
2020-11-26 22:39:22 +08:00
|
|
|
{"chain", OPT_CHAIN, '-', "Build and add certificate chain for EE cert,"},
|
|
|
|
{OPT_MORE_STR, 0, 0,
|
2021-03-12 06:04:18 +08:00
|
|
|
"which is the 1st cert from -in matching the private key (if given)"},
|
2020-11-26 22:39:22 +08:00
|
|
|
{"untrusted", OPT_UNTRUSTED, '<', "Untrusted certificates for chain building"},
|
2019-11-08 04:08:30 +08:00
|
|
|
{"CAfile", OPT_CAFILE, '<', "PEM-format file of CA's"},
|
2020-11-26 22:39:22 +08:00
|
|
|
{"CApath", OPT_CAPATH, '/', "PEM-format directory of CA's"},
|
2019-11-08 04:08:30 +08:00
|
|
|
{"CAstore", OPT_CASTORE, ':', "URI to store of CA's"},
|
|
|
|
{"no-CAfile", OPT_NOCAFILE, '-',
|
|
|
|
"Do not load the default certificates file"},
|
|
|
|
{"no-CApath", OPT_NOCAPATH, '-',
|
|
|
|
"Do not load certificates from the default certificates directory"},
|
|
|
|
{"no-CAstore", OPT_NOCASTORE, '-',
|
|
|
|
"Do not load certificates from the default certificates store"},
|
2020-08-10 20:23:46 +08:00
|
|
|
{"name", OPT_NAME, 's', "Use name as friendly name"},
|
|
|
|
{"caname", OPT_CANAME, 's',
|
|
|
|
"Use name as CA friendly name (can be repeated)"},
|
2020-11-26 22:39:22 +08:00
|
|
|
{"CSP", OPT_CSP, 's', "Microsoft CSP name"},
|
2020-08-10 20:23:46 +08:00
|
|
|
{"LMK", OPT_LMK, '-',
|
|
|
|
"Add local machine keyset attribute to private key"},
|
2020-08-10 20:23:46 +08:00
|
|
|
{"keyex", OPT_KEYEX, '-', "Set key type to MS key exchange"},
|
|
|
|
{"keysig", OPT_KEYSIG, '-', "Set key type to MS key signature"},
|
2020-11-26 22:39:22 +08:00
|
|
|
{"keypbe", OPT_KEYPBE, 's', "Private key PBE algorithm (default AES-256 CBC)"},
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
{"certpbe", OPT_CERTPBE, 's',
|
2020-07-22 19:36:36 +08:00
|
|
|
"Certificate PBE algorithm (default PBES2 with PBKDF2 and AES-256 CBC)"},
|
2021-02-17 15:56:36 +08:00
|
|
|
#ifndef OPENSSL_NO_DES
|
2020-11-26 22:39:22 +08:00
|
|
|
{"descert", OPT_DESCERT, '-',
|
|
|
|
"Encrypt output with 3DES (default PBES2 with PBKDF2 and AES-256 CBC)"},
|
2021-02-17 15:56:36 +08:00
|
|
|
#endif
|
2020-11-26 22:39:22 +08:00
|
|
|
{"macalg", OPT_MACALG, 's',
|
|
|
|
"Digest algorithm to use in MAC (default SHA1)"},
|
2020-11-26 18:03:24 +08:00
|
|
|
{"iter", OPT_ITER, 'p', "Specify the iteration count for encryption and MAC"},
|
|
|
|
{"noiter", OPT_NOITER, '-', "Don't use encryption iteration"},
|
2020-11-26 22:39:22 +08:00
|
|
|
{"nomaciter", OPT_NOMACITER, '-', "Don't use MAC iteration)"},
|
2019-12-25 02:39:55 +08:00
|
|
|
{"maciter", OPT_MACITER, '-', "Unused, kept for backwards compatibility"},
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
{"nomac", OPT_NOMAC, '-', "Don't generate MAC"},
|
|
|
|
{NULL}
|
|
|
|
};
|
2000-02-11 17:47:18 +08:00
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
int pkcs12_main(int argc, char **argv)
|
1999-03-30 01:50:26 +08:00
|
|
|
{
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
char *infile = NULL, *outfile = NULL, *keyname = NULL, *certfile = NULL;
|
2021-02-09 03:20:01 +08:00
|
|
|
char *untrusted = NULL, *ciphername = NULL, *enc_flag = NULL;
|
2020-08-15 03:58:34 +08:00
|
|
|
char *passcertsarg = NULL, *passcerts = NULL;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
char *name = NULL, *csp_name = NULL;
|
2017-07-06 08:37:10 +08:00
|
|
|
char pass[PASSWD_BUF_SIZE] = "", macpass[PASSWD_BUF_SIZE] = "";
|
2021-02-17 15:56:36 +08:00
|
|
|
int export_pkcs12 = 0, options = 0, chain = 0, twopass = 0, keytype = 0;
|
|
|
|
#ifndef OPENSSL_NO_DES
|
|
|
|
int use_legacy = 0;
|
|
|
|
#endif
|
2021-03-06 05:11:49 +08:00
|
|
|
/* use library defaults for the iter, maciter, cert, and key PBE */
|
|
|
|
int iter = 0, maciter = 0;
|
|
|
|
int cert_pbe = NID_undef;
|
|
|
|
int key_pbe = NID_undef;
|
2016-03-22 01:08:57 +08:00
|
|
|
int ret = 1, macver = 1, add_lmk = 0, private = 0;
|
|
|
|
int noprompt = 0;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
char *passinarg = NULL, *passoutarg = NULL, *passarg = NULL;
|
2017-07-05 22:58:48 +08:00
|
|
|
char *passin = NULL, *passout = NULL, *macalg = NULL;
|
2016-08-25 01:55:51 +08:00
|
|
|
char *cpass = NULL, *mpass = NULL, *badpass = NULL;
|
2019-03-07 22:26:34 +08:00
|
|
|
const char *CApath = NULL, *CAfile = NULL, *CAstore = NULL, *prog;
|
|
|
|
int noCApath = 0, noCAfile = 0, noCAstore = 0;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
ENGINE *e = NULL;
|
|
|
|
BIO *in = NULL, *out = NULL;
|
|
|
|
PKCS12 *p12 = NULL;
|
2009-07-28 05:10:00 +08:00
|
|
|
STACK_OF(OPENSSL_STRING) *canames = NULL;
|
2021-02-18 05:15:27 +08:00
|
|
|
EVP_CIPHER *default_enc = (EVP_CIPHER *)EVP_aes_256_cbc();
|
|
|
|
EVP_CIPHER *enc = (EVP_CIPHER *)default_enc;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
OPTION_CHOICE o;
|
|
|
|
|
|
|
|
prog = opt_init(argc, argv, pkcs12_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(pkcs12_options);
|
|
|
|
ret = 0;
|
|
|
|
goto end;
|
|
|
|
case OPT_NOKEYS:
|
|
|
|
options |= NOKEYS;
|
|
|
|
break;
|
|
|
|
case OPT_KEYEX:
|
|
|
|
keytype = KEY_EX;
|
|
|
|
break;
|
|
|
|
case OPT_KEYSIG:
|
|
|
|
keytype = KEY_SIG;
|
|
|
|
break;
|
|
|
|
case OPT_NOCERTS:
|
|
|
|
options |= NOCERTS;
|
|
|
|
break;
|
|
|
|
case OPT_CLCERTS:
|
|
|
|
options |= CLCERTS;
|
|
|
|
break;
|
|
|
|
case OPT_CACERTS:
|
|
|
|
options |= CACERTS;
|
|
|
|
break;
|
|
|
|
case OPT_NOOUT:
|
|
|
|
options |= (NOKEYS | NOCERTS);
|
|
|
|
break;
|
|
|
|
case OPT_INFO:
|
|
|
|
options |= INFO;
|
|
|
|
break;
|
|
|
|
case OPT_CHAIN:
|
|
|
|
chain = 1;
|
|
|
|
break;
|
|
|
|
case OPT_TWOPASS:
|
|
|
|
twopass = 1;
|
|
|
|
break;
|
|
|
|
case OPT_NOMACVER:
|
|
|
|
macver = 0;
|
|
|
|
break;
|
2021-02-17 15:56:36 +08:00
|
|
|
#ifndef OPENSSL_NO_DES
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
case OPT_DESCERT:
|
|
|
|
cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
|
|
|
|
break;
|
2021-02-17 15:56:36 +08:00
|
|
|
#endif
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
case OPT_EXPORT:
|
2020-11-26 22:39:22 +08:00
|
|
|
export_pkcs12 = 1;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
break;
|
2021-02-09 03:20:01 +08:00
|
|
|
case OPT_NODES:
|
|
|
|
case OPT_NOENC:
|
|
|
|
/*
|
|
|
|
* |enc_flag| stores the name of the option used so it
|
|
|
|
* can be printed if an error message is output.
|
|
|
|
*/
|
|
|
|
enc_flag = opt_flag() + 1;
|
|
|
|
enc = NULL;
|
|
|
|
ciphername = NULL;
|
|
|
|
break;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
case OPT_CIPHER:
|
2021-02-09 03:20:01 +08:00
|
|
|
ciphername = opt_unknown();
|
2020-11-26 22:39:22 +08:00
|
|
|
enc_flag = opt_unknown();
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
break;
|
2019-12-25 02:39:55 +08:00
|
|
|
case OPT_ITER:
|
2021-04-21 19:08:21 +08:00
|
|
|
maciter = iter = opt_int_arg();
|
2019-12-25 02:39:55 +08:00
|
|
|
break;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
case OPT_NOITER:
|
|
|
|
iter = 1;
|
|
|
|
break;
|
|
|
|
case OPT_MACITER:
|
2019-12-25 02:39:55 +08:00
|
|
|
/* no-op */
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
break;
|
|
|
|
case OPT_NOMACITER:
|
|
|
|
maciter = 1;
|
|
|
|
break;
|
|
|
|
case OPT_NOMAC:
|
2020-05-11 21:49:34 +08:00
|
|
|
cert_pbe = -1;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
maciter = -1;
|
|
|
|
break;
|
|
|
|
case OPT_MACALG:
|
|
|
|
macalg = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_CERTPBE:
|
|
|
|
if (!set_pbe(&cert_pbe, opt_arg()))
|
|
|
|
goto opthelp;
|
|
|
|
break;
|
|
|
|
case OPT_KEYPBE:
|
|
|
|
if (!set_pbe(&key_pbe, opt_arg()))
|
|
|
|
goto opthelp;
|
|
|
|
break;
|
2017-07-05 22:58:48 +08:00
|
|
|
case OPT_R_CASES:
|
|
|
|
if (!opt_rand(o))
|
|
|
|
goto end;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
break;
|
|
|
|
case OPT_INKEY:
|
|
|
|
keyname = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_CERTFILE:
|
|
|
|
certfile = opt_arg();
|
|
|
|
break;
|
2020-08-10 20:23:46 +08:00
|
|
|
case OPT_UNTRUSTED:
|
|
|
|
untrusted = opt_arg();
|
|
|
|
break;
|
2020-08-15 03:58:34 +08:00
|
|
|
case OPT_PASSCERTS:
|
|
|
|
passcertsarg = opt_arg();
|
|
|
|
break;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
case OPT_NAME:
|
|
|
|
name = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_LMK:
|
|
|
|
add_lmk = 1;
|
|
|
|
break;
|
|
|
|
case OPT_CSP:
|
|
|
|
csp_name = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_CANAME:
|
|
|
|
if (canames == NULL
|
|
|
|
&& (canames = sk_OPENSSL_STRING_new_null()) == NULL)
|
|
|
|
goto end;
|
|
|
|
sk_OPENSSL_STRING_push(canames, opt_arg());
|
|
|
|
break;
|
|
|
|
case OPT_IN:
|
|
|
|
infile = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_OUT:
|
|
|
|
outfile = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_PASSIN:
|
|
|
|
passinarg = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_PASSOUT:
|
|
|
|
passoutarg = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_PASSWORD:
|
|
|
|
passarg = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_CAPATH:
|
|
|
|
CApath = opt_arg();
|
|
|
|
break;
|
2019-03-07 22:26:34 +08:00
|
|
|
case OPT_CASTORE:
|
|
|
|
CAstore = opt_arg();
|
|
|
|
break;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
case OPT_CAFILE:
|
|
|
|
CAfile = opt_arg();
|
|
|
|
break;
|
2015-09-22 23:00:52 +08:00
|
|
|
case OPT_NOCAPATH:
|
|
|
|
noCApath = 1;
|
|
|
|
break;
|
2019-03-07 22:26:34 +08:00
|
|
|
case OPT_NOCASTORE:
|
|
|
|
noCAstore = 1;
|
|
|
|
break;
|
2015-09-22 23:00:52 +08:00
|
|
|
case OPT_NOCAFILE:
|
|
|
|
noCAfile = 1;
|
|
|
|
break;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
case OPT_ENGINE:
|
2015-04-26 03:41:29 +08:00
|
|
|
e = setup_engine(opt_arg(), 0);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
break;
|
2021-02-17 15:56:36 +08:00
|
|
|
#ifndef OPENSSL_NO_DES
|
2020-07-22 19:36:36 +08:00
|
|
|
case OPT_LEGACY_ALG:
|
|
|
|
use_legacy = 1;
|
|
|
|
break;
|
2021-02-17 15:56:36 +08:00
|
|
|
#endif
|
2020-02-25 12:29:30 +08:00
|
|
|
case OPT_PROV_CASES:
|
|
|
|
if (!opt_provider(o))
|
|
|
|
goto end;
|
|
|
|
break;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
}
|
1999-03-30 01:50:26 +08:00
|
|
|
}
|
2020-11-29 05:12:58 +08:00
|
|
|
|
|
|
|
/* No extra arguments. */
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
argc = opt_num_rest();
|
2020-11-29 05:12:58 +08:00
|
|
|
if (argc != 0)
|
|
|
|
goto opthelp;
|
2020-07-22 19:36:36 +08:00
|
|
|
|
2021-04-03 18:53:51 +08:00
|
|
|
if (!app_RAND_load())
|
|
|
|
goto end;
|
|
|
|
|
2021-02-09 03:20:01 +08:00
|
|
|
if (ciphername != NULL) {
|
|
|
|
if (!opt_cipher(ciphername, &enc))
|
|
|
|
goto opthelp;
|
|
|
|
}
|
2020-11-26 22:39:22 +08:00
|
|
|
if (export_pkcs12) {
|
|
|
|
if ((options & INFO) != 0)
|
|
|
|
WARN_EXPORT("info");
|
|
|
|
if (macver == 0)
|
|
|
|
WARN_EXPORT("nomacver");
|
|
|
|
if ((options & CLCERTS) != 0)
|
|
|
|
WARN_EXPORT("clcerts");
|
|
|
|
if ((options & CACERTS) != 0)
|
|
|
|
WARN_EXPORT("cacerts");
|
|
|
|
if (enc != default_enc)
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Warning: output encryption option -%s ignored with -export\n", enc_flag);
|
|
|
|
} else {
|
|
|
|
if (keyname != NULL)
|
|
|
|
WARN_NO_EXPORT("inkey");
|
2020-08-10 20:23:46 +08:00
|
|
|
if (certfile != NULL)
|
2020-11-26 22:39:22 +08:00
|
|
|
WARN_NO_EXPORT("certfile");
|
2020-08-10 20:23:46 +08:00
|
|
|
if (passcertsarg != NULL)
|
2020-11-26 22:39:22 +08:00
|
|
|
WARN_NO_EXPORT("passcerts");
|
|
|
|
if (chain)
|
|
|
|
WARN_NO_EXPORT("chain");
|
|
|
|
if (untrusted != NULL)
|
|
|
|
WARN_NO_EXPORT("untrusted");
|
|
|
|
if (CAfile != NULL)
|
|
|
|
WARN_NO_EXPORT("CAfile");
|
|
|
|
if (CApath != NULL)
|
|
|
|
WARN_NO_EXPORT("CApath");
|
|
|
|
if (CAstore != NULL)
|
|
|
|
WARN_NO_EXPORT("CAstore");
|
|
|
|
if (noCAfile)
|
|
|
|
WARN_NO_EXPORT("no-CAfile");
|
|
|
|
if (noCApath)
|
|
|
|
WARN_NO_EXPORT("no-CApath");
|
|
|
|
if (noCAstore)
|
|
|
|
WARN_NO_EXPORT("no-CAstore");
|
2020-08-10 20:23:46 +08:00
|
|
|
if (name != NULL)
|
2020-11-26 22:39:22 +08:00
|
|
|
WARN_NO_EXPORT("name");
|
2020-08-10 20:23:46 +08:00
|
|
|
if (canames != NULL)
|
2020-11-26 22:39:22 +08:00
|
|
|
WARN_NO_EXPORT("caname");
|
|
|
|
if (csp_name != NULL)
|
|
|
|
WARN_NO_EXPORT("CSP");
|
|
|
|
if (add_lmk)
|
|
|
|
WARN_NO_EXPORT("LMK");
|
|
|
|
if (keytype == KEY_EX)
|
|
|
|
WARN_NO_EXPORT("keyex");
|
|
|
|
if (keytype == KEY_SIG)
|
|
|
|
WARN_NO_EXPORT("keysig");
|
2021-03-06 05:11:49 +08:00
|
|
|
if (key_pbe != NID_undef)
|
2020-11-26 22:39:22 +08:00
|
|
|
WARN_NO_EXPORT("keypbe");
|
2021-03-06 05:11:49 +08:00
|
|
|
if (cert_pbe != NID_undef && cert_pbe != -1)
|
2020-11-26 22:39:22 +08:00
|
|
|
WARN_NO_EXPORT("certpbe and -descert");
|
2020-08-10 20:23:46 +08:00
|
|
|
if (macalg != NULL)
|
2020-11-26 22:39:22 +08:00
|
|
|
WARN_NO_EXPORT("macalg");
|
2021-03-06 05:11:49 +08:00
|
|
|
if (iter != 0)
|
2020-11-26 22:39:22 +08:00
|
|
|
WARN_NO_EXPORT("iter and -noiter");
|
|
|
|
if (maciter == 1)
|
|
|
|
WARN_NO_EXPORT("nomaciter");
|
|
|
|
if (cert_pbe == -1 && maciter == -1)
|
|
|
|
WARN_NO_EXPORT("nomac");
|
2020-08-10 20:23:46 +08:00
|
|
|
}
|
2021-02-17 15:56:36 +08:00
|
|
|
#ifndef OPENSSL_NO_DES
|
2020-07-22 19:36:36 +08:00
|
|
|
if (use_legacy) {
|
|
|
|
/* load the legacy provider if not loaded already*/
|
|
|
|
if (!OSSL_PROVIDER_available(app_get0_libctx(), "legacy")) {
|
|
|
|
if (!app_provider_load(app_get0_libctx(), "legacy"))
|
|
|
|
goto end;
|
|
|
|
/* load the default provider explicitly */
|
|
|
|
if (!app_provider_load(app_get0_libctx(), "default"))
|
|
|
|
goto end;
|
|
|
|
}
|
2021-03-06 05:11:49 +08:00
|
|
|
if (cert_pbe == NID_undef) {
|
2020-11-26 18:03:24 +08:00
|
|
|
/* Adapt default algorithm */
|
2021-02-17 15:56:36 +08:00
|
|
|
# ifndef OPENSSL_NO_RC2
|
2020-07-22 19:36:36 +08:00
|
|
|
cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC;
|
2021-02-17 15:56:36 +08:00
|
|
|
# else
|
2020-07-22 19:36:36 +08:00
|
|
|
cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
|
2021-02-17 15:56:36 +08:00
|
|
|
# endif
|
2020-07-22 19:36:36 +08:00
|
|
|
}
|
|
|
|
|
2021-03-06 05:11:49 +08:00
|
|
|
if (key_pbe == NID_undef)
|
2020-11-26 18:03:24 +08:00
|
|
|
key_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
|
|
|
|
if (enc == default_enc)
|
2021-02-18 05:15:27 +08:00
|
|
|
enc = (EVP_CIPHER *)EVP_des_ede3_cbc();
|
2021-03-06 05:11:49 +08:00
|
|
|
if (macalg == NULL)
|
|
|
|
macalg = "sha1";
|
2020-07-22 19:36:36 +08:00
|
|
|
}
|
2021-02-17 15:56:36 +08:00
|
|
|
#endif
|
2016-02-15 03:45:02 +08:00
|
|
|
|
2015-05-02 22:01:33 +08:00
|
|
|
private = 1;
|
1999-03-30 01:50:26 +08:00
|
|
|
|
2020-08-15 03:58:34 +08:00
|
|
|
if (!app_passwd(passcertsarg, NULL, &passcerts, NULL)) {
|
|
|
|
BIO_printf(bio_err, "Error getting certificate file password\n");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (passarg != NULL) {
|
2020-11-26 22:39:22 +08:00
|
|
|
if (export_pkcs12)
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
passoutarg = passarg;
|
2015-01-22 11:40:55 +08:00
|
|
|
else
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
passinarg = passarg;
|
2000-02-17 07:16:01 +08:00
|
|
|
}
|
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
if (!app_passwd(passinarg, passoutarg, &passin, &passout)) {
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(bio_err, "Error getting passwords\n");
|
|
|
|
goto end;
|
2000-02-17 07:16:01 +08:00
|
|
|
}
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (cpass == NULL) {
|
2020-11-26 22:39:22 +08:00
|
|
|
if (export_pkcs12)
|
2015-01-22 11:40:55 +08:00
|
|
|
cpass = passout;
|
|
|
|
else
|
|
|
|
cpass = passin;
|
2000-02-08 09:34:59 +08:00
|
|
|
}
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (cpass != NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
mpass = cpass;
|
|
|
|
noprompt = 1;
|
2019-01-29 23:04:38 +08:00
|
|
|
if (twopass) {
|
2020-11-26 22:39:22 +08:00
|
|
|
if (export_pkcs12)
|
2019-01-29 23:04:38 +08:00
|
|
|
BIO_printf(bio_err, "Option -twopass cannot be used with -passout or -password\n");
|
|
|
|
else
|
|
|
|
BIO_printf(bio_err, "Option -twopass cannot be used with -passin or -password\n");
|
|
|
|
goto end;
|
|
|
|
}
|
2000-02-08 09:34:59 +08:00
|
|
|
} else {
|
2015-01-22 11:40:55 +08:00
|
|
|
cpass = pass;
|
|
|
|
mpass = macpass;
|
1999-05-08 20:59:50 +08:00
|
|
|
}
|
|
|
|
|
1999-03-30 01:50:26 +08:00
|
|
|
if (twopass) {
|
2017-06-13 01:24:02 +08:00
|
|
|
/* To avoid bit rot */
|
2016-03-22 01:08:57 +08:00
|
|
|
if (1) {
|
2017-07-01 18:14:37 +08:00
|
|
|
#ifndef OPENSSL_NO_UI_CONSOLE
|
2017-12-08 02:39:34 +08:00
|
|
|
if (EVP_read_pw_string(
|
2020-11-26 22:39:22 +08:00
|
|
|
macpass, sizeof(macpass), "Enter MAC Password:", export_pkcs12)) {
|
2016-03-22 01:08:57 +08:00
|
|
|
BIO_printf(bio_err, "Can't read Password\n");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
#endif
|
|
|
|
BIO_printf(bio_err, "Unsupported option -twopass\n");
|
2015-01-22 11:40:55 +08:00
|
|
|
goto end;
|
|
|
|
}
|
1999-03-30 01:50:26 +08:00
|
|
|
}
|
|
|
|
|
2020-11-26 22:39:22 +08:00
|
|
|
if (export_pkcs12) {
|
2015-01-22 11:40:55 +08:00
|
|
|
EVP_PKEY *key = NULL;
|
2020-08-10 20:23:46 +08:00
|
|
|
X509 *ee_cert = NULL, *x = NULL;
|
2015-01-22 11:40:55 +08:00
|
|
|
STACK_OF(X509) *certs = NULL;
|
2020-08-10 20:23:46 +08:00
|
|
|
STACK_OF(X509) *untrusted_certs = NULL;
|
2021-02-18 05:15:27 +08:00
|
|
|
EVP_MD *macmd = NULL;
|
2015-01-22 11:40:55 +08:00
|
|
|
unsigned char *catmp = NULL;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if ((options & (NOCERTS | NOKEYS)) == (NOCERTS | NOKEYS)) {
|
2020-11-26 22:39:22 +08:00
|
|
|
BIO_printf(bio_err, "Nothing to export due to -noout or -nocerts and -nokeys\n");
|
2015-01-22 11:40:55 +08:00
|
|
|
goto export_end;
|
|
|
|
}
|
|
|
|
|
2020-08-10 20:23:46 +08:00
|
|
|
if ((options & NOCERTS) != 0) {
|
2015-01-22 11:40:55 +08:00
|
|
|
chain = 0;
|
2020-08-10 20:23:46 +08:00
|
|
|
BIO_printf(bio_err, "Warning: -chain option ignored with -nocerts\n");
|
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
if (!(options & NOKEYS)) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
key = load_key(keyname ? keyname : infile,
|
2020-08-10 20:23:46 +08:00
|
|
|
FORMAT_PEM, 1, passin, e,
|
|
|
|
keyname ?
|
|
|
|
"private key from -inkey file" :
|
|
|
|
"private key from -in file");
|
2017-06-13 01:24:02 +08:00
|
|
|
if (key == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
goto export_end;
|
|
|
|
}
|
|
|
|
|
2020-08-10 20:23:46 +08:00
|
|
|
/* Load all certs in input file */
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!(options & NOCERTS)) {
|
2021-03-06 04:05:35 +08:00
|
|
|
if (!load_certs(infile, 1, &certs, passin,
|
2020-08-10 20:23:46 +08:00
|
|
|
"certificates from -in file"))
|
2015-01-22 11:40:55 +08:00
|
|
|
goto export_end;
|
2020-08-10 20:23:46 +08:00
|
|
|
if (sk_X509_num(certs) < 1) {
|
|
|
|
BIO_printf(bio_err, "No certificate in -in file %s\n", infile);
|
|
|
|
goto export_end;
|
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (key != NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
/* Look for matching private key */
|
|
|
|
for (i = 0; i < sk_X509_num(certs); i++) {
|
|
|
|
x = sk_X509_value(certs, i);
|
|
|
|
if (X509_check_private_key(x, key)) {
|
2020-08-10 20:23:46 +08:00
|
|
|
ee_cert = x;
|
2015-01-22 11:40:55 +08:00
|
|
|
/* Zero keyid and alias */
|
2020-08-10 20:23:46 +08:00
|
|
|
X509_keyid_set1(ee_cert, NULL, 0);
|
|
|
|
X509_alias_set1(ee_cert, NULL, 0);
|
2015-01-22 11:40:55 +08:00
|
|
|
/* Remove from list */
|
|
|
|
(void)sk_X509_delete(certs, i);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2020-08-10 20:23:46 +08:00
|
|
|
if (ee_cert == NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(bio_err,
|
2020-08-10 20:23:46 +08:00
|
|
|
"No cert in -in file '%s' matches private key\n",
|
|
|
|
infile);
|
2015-01-22 11:40:55 +08:00
|
|
|
goto export_end;
|
|
|
|
}
|
2020-08-10 20:23:46 +08:00
|
|
|
} else {
|
|
|
|
ee_cert = X509_dup(sk_X509_value(certs, 0)); /* take 1st cert */
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-08-10 20:23:46 +08:00
|
|
|
/* Load any untrusted certificates for chain building */
|
|
|
|
if (untrusted != NULL) {
|
2021-03-06 04:05:35 +08:00
|
|
|
if (!load_certs(untrusted, 0, &untrusted_certs, passcerts,
|
2020-08-10 20:23:46 +08:00
|
|
|
"untrusted certificates"))
|
2015-01-22 11:40:55 +08:00
|
|
|
goto export_end;
|
|
|
|
}
|
|
|
|
|
2020-08-10 20:23:46 +08:00
|
|
|
/* If chaining get chain from end entity cert */
|
2015-01-22 11:40:55 +08:00
|
|
|
if (chain) {
|
|
|
|
int vret;
|
|
|
|
STACK_OF(X509) *chain2;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
X509_STORE *store;
|
2020-08-10 20:23:46 +08:00
|
|
|
|
|
|
|
if (ee_cert == NULL) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"No end entity certificate to check with -chain\n");
|
|
|
|
goto export_end;
|
|
|
|
}
|
|
|
|
|
2019-03-07 22:26:34 +08:00
|
|
|
if ((store = setup_verify(CAfile, noCAfile, CApath, noCApath,
|
|
|
|
CAstore, noCAstore))
|
2015-09-22 23:00:52 +08:00
|
|
|
== NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
goto export_end;
|
|
|
|
|
2020-08-10 20:23:46 +08:00
|
|
|
vret = get_cert_chain(ee_cert, store, untrusted_certs, &chain2);
|
2015-01-22 11:40:55 +08:00
|
|
|
X509_STORE_free(store);
|
|
|
|
|
2016-01-01 13:51:12 +08:00
|
|
|
if (vret == X509_V_OK) {
|
2020-09-10 16:45:39 +08:00
|
|
|
int add_certs;
|
2020-08-10 20:23:46 +08:00
|
|
|
/* Remove from chain2 the first (end entity) certificate */
|
|
|
|
X509_free(sk_X509_shift(chain2));
|
|
|
|
/* Add the remaining certs (except for duplicates) */
|
2020-09-10 16:45:39 +08:00
|
|
|
add_certs = X509_add_certs(certs, chain2, X509_ADD_FLAG_UP_REF
|
|
|
|
| X509_ADD_FLAG_NO_DUP);
|
2020-08-10 20:23:46 +08:00
|
|
|
sk_X509_pop_free(chain2, X509_free);
|
2020-09-10 16:45:39 +08:00
|
|
|
if (!add_certs)
|
|
|
|
goto export_end;
|
2015-01-22 11:40:55 +08:00
|
|
|
} else {
|
2016-01-01 13:51:12 +08:00
|
|
|
if (vret != X509_V_ERR_UNSPECIFIED)
|
2020-08-10 20:23:46 +08:00
|
|
|
BIO_printf(bio_err, "Error getting chain: %s\n",
|
2015-01-22 11:40:55 +08:00
|
|
|
X509_verify_cert_error_string(vret));
|
|
|
|
goto export_end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-08-10 20:23:46 +08:00
|
|
|
/* Add any extra certificates asked for */
|
|
|
|
if (certfile != NULL) {
|
2021-03-06 04:05:35 +08:00
|
|
|
if (!load_certs(certfile, 0, &certs, passcerts,
|
2020-08-10 20:23:46 +08:00
|
|
|
"extra certificates from -certfile"))
|
|
|
|
goto export_end;
|
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2020-08-10 20:23:46 +08:00
|
|
|
/* Add any CA names */
|
2015-01-22 11:40:55 +08:00
|
|
|
for (i = 0; i < sk_OPENSSL_STRING_num(canames); i++) {
|
|
|
|
catmp = (unsigned char *)sk_OPENSSL_STRING_value(canames, i);
|
|
|
|
X509_alias_set1(sk_X509_value(certs, i), catmp, -1);
|
|
|
|
}
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (csp_name != NULL && key != NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
EVP_PKEY_add1_attr_by_NID(key, NID_ms_csp_name,
|
|
|
|
MBSTRING_ASC, (unsigned char *)csp_name,
|
|
|
|
-1);
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (add_lmk && key != NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
EVP_PKEY_add1_attr_by_NID(key, NID_LocalKeySet, 0, NULL, -1);
|
|
|
|
|
2020-05-11 21:48:52 +08:00
|
|
|
if (!noprompt && !(enc == NULL && maciter == -1)) {
|
2017-06-13 01:24:02 +08:00
|
|
|
/* To avoid bit rot */
|
2016-03-22 01:08:57 +08:00
|
|
|
if (1) {
|
2017-07-01 18:14:37 +08:00
|
|
|
#ifndef OPENSSL_NO_UI_CONSOLE
|
2017-12-08 02:39:34 +08:00
|
|
|
if (EVP_read_pw_string(pass, sizeof(pass),
|
|
|
|
"Enter Export Password:", 1)) {
|
2016-03-22 01:08:57 +08:00
|
|
|
BIO_printf(bio_err, "Can't read Password\n");
|
|
|
|
goto export_end;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
#endif
|
|
|
|
BIO_printf(bio_err, "Password required\n");
|
|
|
|
goto export_end;
|
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2016-03-22 01:08:57 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!twopass)
|
2017-07-06 08:37:10 +08:00
|
|
|
OPENSSL_strlcpy(macpass, pass, sizeof(macpass));
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2021-02-17 15:56:36 +08:00
|
|
|
p12 = PKCS12_create_ex(cpass, name, key, ee_cert, certs,
|
|
|
|
key_pbe, cert_pbe, iter, -1, keytype,
|
|
|
|
app_get0_libctx(), app_get0_propq());
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2019-09-17 03:28:57 +08:00
|
|
|
if (p12 == NULL) {
|
2017-12-14 18:10:33 +08:00
|
|
|
BIO_printf(bio_err, "Error creating PKCS12 structure for %s\n",
|
|
|
|
outfile);
|
2015-01-22 11:40:55 +08:00
|
|
|
goto export_end;
|
|
|
|
}
|
|
|
|
|
2020-08-10 20:23:46 +08:00
|
|
|
if (macalg != NULL) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
if (!opt_md(macalg, &macmd))
|
|
|
|
goto opthelp;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (maciter != -1)
|
2021-03-06 00:22:35 +08:00
|
|
|
if (!PKCS12_set_mac(p12, mpass, -1, NULL, 0, maciter, macmd)) {
|
|
|
|
BIO_printf(bio_err, "Error creating PKCS12 MAC; no PKCS12KDF support?\n");
|
|
|
|
BIO_printf(bio_err, "Use -nomac if MAC not required and PKCS12KDF support not available.\n");
|
|
|
|
goto export_end;
|
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2015-05-02 22:01:33 +08:00
|
|
|
assert(private);
|
2015-09-04 18:49:06 +08:00
|
|
|
|
|
|
|
out = bio_open_owner(outfile, FORMAT_PKCS12, private);
|
|
|
|
if (out == NULL)
|
|
|
|
goto end;
|
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
i2d_PKCS12_bio(out, p12);
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
export_end:
|
|
|
|
|
2015-03-28 22:54:15 +08:00
|
|
|
EVP_PKEY_free(key);
|
2021-02-18 05:15:27 +08:00
|
|
|
EVP_MD_free(macmd);
|
2015-05-01 05:33:59 +08:00
|
|
|
sk_X509_pop_free(certs, X509_free);
|
2020-08-10 20:23:46 +08:00
|
|
|
sk_X509_pop_free(untrusted_certs, X509_free);
|
|
|
|
X509_free(ee_cert);
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2017-12-14 18:10:33 +08:00
|
|
|
ERR_print_errors(bio_err);
|
2015-01-22 11:40:55 +08:00
|
|
|
goto end;
|
1999-03-30 01:50:26 +08:00
|
|
|
|
1999-05-16 20:01:49 +08:00
|
|
|
}
|
1999-03-30 01:50:26 +08:00
|
|
|
|
2015-09-04 18:49:06 +08:00
|
|
|
in = bio_open_default(infile, 'r', FORMAT_PKCS12);
|
|
|
|
if (in == NULL)
|
|
|
|
goto end;
|
|
|
|
out = bio_open_owner(outfile, FORMAT_PEM, private);
|
|
|
|
if (out == NULL)
|
|
|
|
goto end;
|
|
|
|
|
2021-02-17 15:56:36 +08:00
|
|
|
p12 = PKCS12_init_ex(NID_pkcs7_data, app_get0_libctx(), app_get0_propq());
|
|
|
|
if (p12 == NULL) {
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if ((p12 = d2i_PKCS12_bio(in, &p12)) == NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
goto end;
|
1999-03-30 01:50:26 +08:00
|
|
|
}
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
|
2016-03-22 01:08:57 +08:00
|
|
|
if (!noprompt) {
|
|
|
|
if (1) {
|
2017-07-01 18:14:37 +08:00
|
|
|
#ifndef OPENSSL_NO_UI_CONSOLE
|
2017-12-08 02:39:34 +08:00
|
|
|
if (EVP_read_pw_string(pass, sizeof(pass), "Enter Import Password:",
|
2016-03-22 01:08:57 +08:00
|
|
|
0)) {
|
|
|
|
BIO_printf(bio_err, "Can't read Password\n");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
#endif
|
|
|
|
BIO_printf(bio_err, "Password required\n");
|
|
|
|
goto end;
|
|
|
|
}
|
1999-03-30 01:50:26 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
if (!twopass)
|
2017-12-08 02:39:34 +08:00
|
|
|
OPENSSL_strlcpy(macpass, pass, sizeof(macpass));
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2015-09-27 07:31:46 +08:00
|
|
|
if ((options & INFO) && PKCS12_mac_present(p12)) {
|
2016-08-18 00:27:05 +08:00
|
|
|
const ASN1_INTEGER *tmaciter;
|
|
|
|
const X509_ALGOR *macalgid;
|
2016-08-17 03:18:04 +08:00
|
|
|
const ASN1_OBJECT *macobj;
|
2017-07-26 22:25:51 +08:00
|
|
|
const ASN1_OCTET_STRING *tmac;
|
|
|
|
const ASN1_OCTET_STRING *tsalt;
|
|
|
|
|
|
|
|
PKCS12_get0_mac(&tmac, &macalgid, &tsalt, &tmaciter, p12);
|
|
|
|
/* current hash algorithms do not use parameters so extract just name,
|
|
|
|
in future alg_print() may be needed */
|
2016-07-22 22:33:15 +08:00
|
|
|
X509_ALGOR_get0(&macobj, NULL, NULL, macalgid);
|
2017-07-26 19:23:17 +08:00
|
|
|
BIO_puts(bio_err, "MAC: ");
|
2016-07-22 22:33:15 +08:00
|
|
|
i2a_ASN1_OBJECT(bio_err, macobj);
|
2017-07-26 19:23:17 +08:00
|
|
|
BIO_printf(bio_err, ", Iteration %ld\n",
|
2017-07-26 22:25:51 +08:00
|
|
|
tmaciter != NULL ? ASN1_INTEGER_get(tmaciter) : 1L);
|
|
|
|
BIO_printf(bio_err, "MAC length: %ld, salt length: %ld\n",
|
|
|
|
tmac != NULL ? ASN1_STRING_length(tmac) : 0L,
|
|
|
|
tsalt != NULL ? ASN1_STRING_length(tsalt) : 0L);
|
2015-09-27 07:31:46 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
if (macver) {
|
2021-03-06 01:08:05 +08:00
|
|
|
EVP_KDF *pkcs12kdf;
|
|
|
|
|
|
|
|
pkcs12kdf = EVP_KDF_fetch(NULL, "PKCS12KDF", NULL);
|
|
|
|
if (pkcs12kdf == NULL) {
|
|
|
|
BIO_printf(bio_err, "Error verifying PKCS12 MAC; no PKCS12KDF support.\n");
|
|
|
|
BIO_printf(bio_err, "Use -nomacver if MAC verification is not required.\n");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
EVP_KDF_free(pkcs12kdf);
|
2015-01-22 11:40:55 +08:00
|
|
|
/* If we enter empty password try no password first */
|
|
|
|
if (!mpass[0] && PKCS12_verify_mac(p12, NULL, 0)) {
|
|
|
|
/* If mac and crypto pass the same set it to NULL too */
|
|
|
|
if (!twopass)
|
|
|
|
cpass = NULL;
|
|
|
|
} else if (!PKCS12_verify_mac(p12, mpass, -1)) {
|
2016-08-25 01:55:51 +08:00
|
|
|
/*
|
|
|
|
* May be UTF8 from previous version of OpenSSL:
|
|
|
|
* convert to a UTF8 form which will translate
|
|
|
|
* to the same Unicode password.
|
|
|
|
*/
|
|
|
|
unsigned char *utmp;
|
|
|
|
int utmplen;
|
2021-03-06 01:19:12 +08:00
|
|
|
unsigned long err = ERR_peek_error();
|
|
|
|
|
|
|
|
if (ERR_GET_LIB(err) == ERR_LIB_PKCS12
|
|
|
|
&& ERR_GET_REASON(err) == PKCS12_R_MAC_ABSENT) {
|
|
|
|
BIO_printf(bio_err, "Warning: MAC is absent!\n");
|
|
|
|
goto dump;
|
|
|
|
}
|
|
|
|
|
2016-08-25 01:55:51 +08:00
|
|
|
utmp = OPENSSL_asc2uni(mpass, -1, NULL, &utmplen);
|
|
|
|
if (utmp == NULL)
|
|
|
|
goto end;
|
|
|
|
badpass = OPENSSL_uni2utf8(utmp, utmplen);
|
|
|
|
OPENSSL_free(utmp);
|
|
|
|
if (!PKCS12_verify_mac(p12, badpass, -1)) {
|
|
|
|
BIO_printf(bio_err, "Mac verify error: invalid password?\n");
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
goto end;
|
|
|
|
} else {
|
|
|
|
BIO_printf(bio_err, "Warning: using broken algorithm\n");
|
|
|
|
if (!twopass)
|
|
|
|
cpass = badpass;
|
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
1999-03-30 01:50:26 +08:00
|
|
|
}
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
|
2021-03-06 01:19:12 +08:00
|
|
|
dump:
|
2015-05-02 22:01:33 +08:00
|
|
|
assert(private);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
if (!dump_certs_keys_p12(out, p12, cpass, -1, options, passout, enc)) {
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(bio_err, "Error outputting keys and certificates\n");
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
goto end;
|
1999-03-30 01:50:26 +08:00
|
|
|
}
|
|
|
|
ret = 0;
|
2000-08-12 03:43:20 +08:00
|
|
|
end:
|
2015-04-12 04:32:54 +08:00
|
|
|
PKCS12_free(p12);
|
2016-09-29 05:39:18 +08:00
|
|
|
release_engine(e);
|
2000-01-14 05:10:43 +08:00
|
|
|
BIO_free(in);
|
On VMS, stdout may very well lead to a file that is written to in a
record-oriented fashion. That means that every write() will write a
separate record, which will be read separately by the programs trying
to read from it. This can be very confusing.
The solution is to put a BIO filter in the way that will buffer text
until a linefeed is reached, and then write everything a line at a
time, so every record written will be an actual line, not chunks of
lines and not (usually doesn't happen, but I've seen it once) several
lines in one record. Voila, BIO_f_linebuffer() is born.
Since we're so close to release time, I'm making this VMS-only for
now, just to make sure no code is needlessly broken by this. After
the release, this BIO method will be enabled on all other platforms as
well.
2000-09-20 21:55:50 +08:00
|
|
|
BIO_free_all(out);
|
2015-05-02 02:37:16 +08:00
|
|
|
sk_OPENSSL_STRING_free(canames);
|
2016-08-25 01:55:51 +08:00
|
|
|
OPENSSL_free(badpass);
|
2020-08-15 03:58:34 +08:00
|
|
|
OPENSSL_free(passcerts);
|
2015-05-01 22:02:07 +08:00
|
|
|
OPENSSL_free(passin);
|
|
|
|
OPENSSL_free(passout);
|
2017-07-06 08:37:10 +08:00
|
|
|
return ret;
|
1999-03-30 01:50:26 +08:00
|
|
|
}
|
|
|
|
|
2016-08-13 19:07:42 +08:00
|
|
|
int dump_certs_keys_p12(BIO *out, const PKCS12 *p12, const char *pass,
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
int passlen, int options, char *pempass,
|
|
|
|
const EVP_CIPHER *enc)
|
1999-03-30 01:50:26 +08:00
|
|
|
{
|
2015-01-22 11:40:55 +08:00
|
|
|
STACK_OF(PKCS7) *asafes = NULL;
|
|
|
|
STACK_OF(PKCS12_SAFEBAG) *bags;
|
|
|
|
int i, bagnid;
|
|
|
|
int ret = 0;
|
|
|
|
PKCS7 *p7;
|
|
|
|
|
2015-05-07 01:43:59 +08:00
|
|
|
if ((asafes = PKCS12_unpack_authsafes(p12)) == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
return 0;
|
|
|
|
for (i = 0; i < sk_PKCS7_num(asafes); i++) {
|
|
|
|
p7 = sk_PKCS7_value(asafes, i);
|
|
|
|
bagnid = OBJ_obj2nid(p7->type);
|
|
|
|
if (bagnid == NID_pkcs7_data) {
|
|
|
|
bags = PKCS12_unpack_p7data(p7);
|
|
|
|
if (options & INFO)
|
|
|
|
BIO_printf(bio_err, "PKCS7 Data\n");
|
|
|
|
} else if (bagnid == NID_pkcs7_encrypted) {
|
|
|
|
if (options & INFO) {
|
|
|
|
BIO_printf(bio_err, "PKCS7 Encrypted data: ");
|
2015-04-29 23:27:08 +08:00
|
|
|
alg_print(p7->d.encrypted->enc_data->algorithm);
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
bags = PKCS12_unpack_p7encdata(p7, pass, passlen);
|
2017-06-13 01:24:02 +08:00
|
|
|
} else {
|
2015-01-22 11:40:55 +08:00
|
|
|
continue;
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!bags)
|
|
|
|
goto err;
|
|
|
|
if (!dump_certs_pkeys_bags(out, bags, pass, passlen,
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
options, pempass, enc)) {
|
2015-01-22 11:40:55 +08:00
|
|
|
sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
|
|
|
|
bags = NULL;
|
|
|
|
}
|
|
|
|
ret = 1;
|
|
|
|
|
|
|
|
err:
|
2015-04-12 04:32:54 +08:00
|
|
|
sk_PKCS7_pop_free(asafes, PKCS7_free);
|
2015-01-22 11:40:55 +08:00
|
|
|
return ret;
|
1999-03-30 01:50:26 +08:00
|
|
|
}
|
|
|
|
|
2016-08-13 19:07:42 +08:00
|
|
|
int dump_certs_pkeys_bags(BIO *out, const STACK_OF(PKCS12_SAFEBAG) *bags,
|
|
|
|
const char *pass, int passlen, int options,
|
|
|
|
char *pempass, const EVP_CIPHER *enc)
|
1999-03-30 01:50:26 +08:00
|
|
|
{
|
2015-01-22 11:40:55 +08:00
|
|
|
int i;
|
|
|
|
for (i = 0; i < sk_PKCS12_SAFEBAG_num(bags); i++) {
|
|
|
|
if (!dump_certs_pkeys_bag(out,
|
|
|
|
sk_PKCS12_SAFEBAG_value(bags, i),
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
pass, passlen, options, pempass, enc))
|
2015-01-22 11:40:55 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
1999-03-30 01:50:26 +08:00
|
|
|
}
|
|
|
|
|
2016-08-13 19:07:42 +08:00
|
|
|
int dump_certs_pkeys_bag(BIO *out, const PKCS12_SAFEBAG *bag,
|
|
|
|
const char *pass, int passlen, int options,
|
|
|
|
char *pempass, const EVP_CIPHER *enc)
|
1999-03-30 01:50:26 +08:00
|
|
|
{
|
2015-01-22 11:40:55 +08:00
|
|
|
EVP_PKEY *pkey;
|
|
|
|
PKCS8_PRIV_KEY_INFO *p8;
|
2016-08-13 19:07:42 +08:00
|
|
|
const PKCS8_PRIV_KEY_INFO *p8c;
|
2015-01-22 11:40:55 +08:00
|
|
|
X509 *x509;
|
2016-08-13 19:07:42 +08:00
|
|
|
const STACK_OF(X509_ATTRIBUTE) *attrs;
|
2016-05-04 20:44:10 +08:00
|
|
|
int ret = 0;
|
2015-09-27 07:31:46 +08:00
|
|
|
|
|
|
|
attrs = PKCS12_SAFEBAG_get0_attrs(bag);
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2015-09-27 19:41:53 +08:00
|
|
|
switch (PKCS12_SAFEBAG_get_nid(bag)) {
|
2015-01-22 11:40:55 +08:00
|
|
|
case NID_keyBag:
|
|
|
|
if (options & INFO)
|
|
|
|
BIO_printf(bio_err, "Key bag\n");
|
|
|
|
if (options & NOKEYS)
|
|
|
|
return 1;
|
2015-09-27 07:31:46 +08:00
|
|
|
print_attribs(out, attrs, "Bag Attributes");
|
2016-08-13 19:07:42 +08:00
|
|
|
p8c = PKCS12_SAFEBAG_get0_p8inf(bag);
|
|
|
|
if ((pkey = EVP_PKCS82PKEY(p8c)) == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
return 0;
|
2016-08-13 19:07:42 +08:00
|
|
|
print_attribs(out, PKCS8_pkey_get0_attrs(p8c), "Key Attributes");
|
2016-05-04 20:44:10 +08:00
|
|
|
ret = PEM_write_bio_PrivateKey(out, pkey, enc, NULL, 0, NULL, pempass);
|
2015-01-22 11:40:55 +08:00
|
|
|
EVP_PKEY_free(pkey);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case NID_pkcs8ShroudedKeyBag:
|
|
|
|
if (options & INFO) {
|
2016-08-18 00:27:05 +08:00
|
|
|
const X509_SIG *tp8;
|
|
|
|
const X509_ALGOR *tp8alg;
|
2016-02-05 23:43:53 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(bio_err, "Shrouded Keybag: ");
|
2015-09-27 07:31:46 +08:00
|
|
|
tp8 = PKCS12_SAFEBAG_get0_pkcs8(bag);
|
2016-08-18 00:27:05 +08:00
|
|
|
X509_SIG_get0(tp8, &tp8alg, NULL);
|
2016-03-10 23:04:46 +08:00
|
|
|
alg_print(tp8alg);
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
if (options & NOKEYS)
|
|
|
|
return 1;
|
2015-09-27 07:31:46 +08:00
|
|
|
print_attribs(out, attrs, "Bag Attributes");
|
2015-05-07 01:43:59 +08:00
|
|
|
if ((p8 = PKCS12_decrypt_skey(bag, pass, passlen)) == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
return 0;
|
2015-05-07 01:43:59 +08:00
|
|
|
if ((pkey = EVP_PKCS82PKEY(p8)) == NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
PKCS8_PRIV_KEY_INFO_free(p8);
|
|
|
|
return 0;
|
|
|
|
}
|
2016-03-04 11:48:39 +08:00
|
|
|
print_attribs(out, PKCS8_pkey_get0_attrs(p8), "Key Attributes");
|
2015-01-22 11:40:55 +08:00
|
|
|
PKCS8_PRIV_KEY_INFO_free(p8);
|
2016-05-04 20:44:10 +08:00
|
|
|
ret = PEM_write_bio_PrivateKey(out, pkey, enc, NULL, 0, NULL, pempass);
|
2015-01-22 11:40:55 +08:00
|
|
|
EVP_PKEY_free(pkey);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case NID_certBag:
|
|
|
|
if (options & INFO)
|
|
|
|
BIO_printf(bio_err, "Certificate bag\n");
|
|
|
|
if (options & NOCERTS)
|
|
|
|
return 1;
|
2015-09-27 19:41:53 +08:00
|
|
|
if (PKCS12_SAFEBAG_get0_attr(bag, NID_localKeyID)) {
|
2015-01-22 11:40:55 +08:00
|
|
|
if (options & CACERTS)
|
|
|
|
return 1;
|
|
|
|
} else if (options & CLCERTS)
|
|
|
|
return 1;
|
2015-09-27 07:31:46 +08:00
|
|
|
print_attribs(out, attrs, "Bag Attributes");
|
2015-09-27 19:41:53 +08:00
|
|
|
if (PKCS12_SAFEBAG_get_bag_nid(bag) != NID_x509Certificate)
|
2015-01-22 11:40:55 +08:00
|
|
|
return 1;
|
2015-09-27 19:41:53 +08:00
|
|
|
if ((x509 = PKCS12_SAFEBAG_get1_cert(bag)) == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
return 0;
|
|
|
|
dump_cert_text(out, x509);
|
2016-05-04 20:44:10 +08:00
|
|
|
ret = PEM_write_bio_X509(out, x509);
|
2015-01-22 11:40:55 +08:00
|
|
|
X509_free(x509);
|
|
|
|
break;
|
|
|
|
|
2019-09-19 13:39:13 +08:00
|
|
|
case NID_secretBag:
|
2021-04-30 07:11:42 +08:00
|
|
|
if (options & INFO)
|
2019-09-19 13:39:13 +08:00
|
|
|
BIO_printf(bio_err, "Secret bag\n");
|
|
|
|
print_attribs(out, attrs, "Bag Attributes");
|
|
|
|
BIO_printf(bio_err, "Bag Type: ");
|
|
|
|
i2a_ASN1_OBJECT(bio_err, PKCS12_SAFEBAG_get0_bag_type(bag));
|
|
|
|
BIO_printf(bio_err, "\nBag Value: ");
|
|
|
|
print_attribute(out, PKCS12_SAFEBAG_get0_bag_obj(bag));
|
|
|
|
return 1;
|
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
case NID_safeContentsBag:
|
|
|
|
if (options & INFO)
|
|
|
|
BIO_printf(bio_err, "Safe Contents bag\n");
|
2015-09-27 07:31:46 +08:00
|
|
|
print_attribs(out, attrs, "Bag Attributes");
|
|
|
|
return dump_certs_pkeys_bags(out, PKCS12_SAFEBAG_get0_safes(bag),
|
|
|
|
pass, passlen, options, pempass, enc);
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
default:
|
|
|
|
BIO_printf(bio_err, "Warning unsupported bag type: ");
|
2015-09-27 07:31:46 +08:00
|
|
|
i2a_ASN1_OBJECT(bio_err, PKCS12_SAFEBAG_get0_type(bag));
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(bio_err, "\n");
|
|
|
|
return 1;
|
|
|
|
}
|
2016-05-04 20:44:10 +08:00
|
|
|
return ret;
|
1999-03-30 01:50:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Given a single certificate return a verified chain or NULL if error */
|
|
|
|
|
2016-01-01 13:51:12 +08:00
|
|
|
static int get_cert_chain(X509 *cert, X509_STORE *store,
|
2020-08-10 20:23:46 +08:00
|
|
|
STACK_OF(X509) *untrusted_certs,
|
2016-01-01 13:51:12 +08:00
|
|
|
STACK_OF(X509) **chain)
|
1999-03-30 01:50:26 +08:00
|
|
|
{
|
2016-04-15 11:59:26 +08:00
|
|
|
X509_STORE_CTX *store_ctx = NULL;
|
2016-01-01 13:51:12 +08:00
|
|
|
STACK_OF(X509) *chn = NULL;
|
2015-01-22 11:40:55 +08:00
|
|
|
int i = 0;
|
|
|
|
|
2020-09-24 17:42:23 +08:00
|
|
|
store_ctx = X509_STORE_CTX_new_ex(app_get0_libctx(), app_get0_propq());
|
2016-04-15 11:59:26 +08:00
|
|
|
if (store_ctx == NULL) {
|
|
|
|
i = X509_V_ERR_UNSPECIFIED;
|
|
|
|
goto end;
|
|
|
|
}
|
2020-08-10 20:23:46 +08:00
|
|
|
if (!X509_STORE_CTX_init(store_ctx, store, cert, untrusted_certs)) {
|
2016-04-15 11:59:26 +08:00
|
|
|
i = X509_V_ERR_UNSPECIFIED;
|
|
|
|
goto end;
|
2016-01-01 13:51:12 +08:00
|
|
|
}
|
|
|
|
|
2016-04-15 11:59:26 +08:00
|
|
|
|
|
|
|
if (X509_verify_cert(store_ctx) > 0)
|
|
|
|
chn = X509_STORE_CTX_get1_chain(store_ctx);
|
|
|
|
else if ((i = X509_STORE_CTX_get_error(store_ctx)) == 0)
|
2016-01-01 13:51:12 +08:00
|
|
|
i = X509_V_ERR_UNSPECIFIED;
|
|
|
|
|
2016-04-15 11:59:26 +08:00
|
|
|
end:
|
|
|
|
X509_STORE_CTX_free(store_ctx);
|
2015-01-22 11:40:55 +08:00
|
|
|
*chain = chn;
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
2016-08-18 00:27:05 +08:00
|
|
|
static int alg_print(const X509_ALGOR *alg)
|
1999-03-30 01:50:26 +08:00
|
|
|
{
|
2016-07-07 22:56:26 +08:00
|
|
|
int pbenid, aparamtype;
|
2016-08-17 03:18:04 +08:00
|
|
|
const ASN1_OBJECT *aoid;
|
|
|
|
const void *aparam;
|
2016-07-07 22:56:26 +08:00
|
|
|
PBEPARAM *pbe = NULL;
|
|
|
|
|
|
|
|
X509_ALGOR_get0(&aoid, &aparamtype, &aparam, alg);
|
|
|
|
|
|
|
|
pbenid = OBJ_obj2nid(aoid);
|
|
|
|
|
|
|
|
BIO_printf(bio_err, "%s", OBJ_nid2ln(pbenid));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If PBE algorithm is PBES2 decode algorithm parameters
|
|
|
|
* for additional details.
|
|
|
|
*/
|
|
|
|
if (pbenid == NID_pbes2) {
|
|
|
|
PBE2PARAM *pbe2 = NULL;
|
|
|
|
int encnid;
|
|
|
|
if (aparamtype == V_ASN1_SEQUENCE)
|
|
|
|
pbe2 = ASN1_item_unpack(aparam, ASN1_ITEM_rptr(PBE2PARAM));
|
|
|
|
if (pbe2 == NULL) {
|
2016-07-20 20:10:29 +08:00
|
|
|
BIO_puts(bio_err, ", <unsupported parameters>");
|
2016-07-07 22:56:26 +08:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
X509_ALGOR_get0(&aoid, &aparamtype, &aparam, pbe2->keyfunc);
|
|
|
|
pbenid = OBJ_obj2nid(aoid);
|
|
|
|
X509_ALGOR_get0(&aoid, NULL, NULL, pbe2->encryption);
|
|
|
|
encnid = OBJ_obj2nid(aoid);
|
|
|
|
BIO_printf(bio_err, ", %s, %s", OBJ_nid2ln(pbenid),
|
|
|
|
OBJ_nid2sn(encnid));
|
|
|
|
/* If KDF is PBKDF2 decode parameters */
|
|
|
|
if (pbenid == NID_id_pbkdf2) {
|
|
|
|
PBKDF2PARAM *kdf = NULL;
|
|
|
|
int prfnid;
|
|
|
|
if (aparamtype == V_ASN1_SEQUENCE)
|
|
|
|
kdf = ASN1_item_unpack(aparam, ASN1_ITEM_rptr(PBKDF2PARAM));
|
|
|
|
if (kdf == NULL) {
|
2016-07-20 20:10:29 +08:00
|
|
|
BIO_puts(bio_err, ", <unsupported parameters>");
|
2016-07-07 22:56:26 +08:00
|
|
|
goto done;
|
|
|
|
}
|
2015-04-29 23:27:08 +08:00
|
|
|
|
2016-07-07 22:56:26 +08:00
|
|
|
if (kdf->prf == NULL) {
|
|
|
|
prfnid = NID_hmacWithSHA1;
|
|
|
|
} else {
|
|
|
|
X509_ALGOR_get0(&aoid, NULL, NULL, kdf->prf);
|
|
|
|
prfnid = OBJ_obj2nid(aoid);
|
|
|
|
}
|
|
|
|
BIO_printf(bio_err, ", Iteration %ld, PRF %s",
|
|
|
|
ASN1_INTEGER_get(kdf->iter), OBJ_nid2sn(prfnid));
|
|
|
|
PBKDF2PARAM_free(kdf);
|
2017-08-09 00:51:41 +08:00
|
|
|
#ifndef OPENSSL_NO_SCRYPT
|
2017-07-26 22:27:06 +08:00
|
|
|
} else if (pbenid == NID_id_scrypt) {
|
|
|
|
SCRYPT_PARAMS *kdf = NULL;
|
|
|
|
|
|
|
|
if (aparamtype == V_ASN1_SEQUENCE)
|
|
|
|
kdf = ASN1_item_unpack(aparam, ASN1_ITEM_rptr(SCRYPT_PARAMS));
|
|
|
|
if (kdf == NULL) {
|
|
|
|
BIO_puts(bio_err, ", <unsupported parameters>");
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
BIO_printf(bio_err, ", Salt length: %d, Cost(N): %ld, "
|
2019-07-02 16:04:04 +08:00
|
|
|
"Block size(r): %ld, Parallelism(p): %ld",
|
2017-07-26 22:27:06 +08:00
|
|
|
ASN1_STRING_length(kdf->salt),
|
|
|
|
ASN1_INTEGER_get(kdf->costParameter),
|
|
|
|
ASN1_INTEGER_get(kdf->blockSize),
|
|
|
|
ASN1_INTEGER_get(kdf->parallelizationParameter));
|
|
|
|
SCRYPT_PARAMS_free(kdf);
|
2017-08-09 00:51:41 +08:00
|
|
|
#endif
|
2016-07-07 22:56:26 +08:00
|
|
|
}
|
|
|
|
PBE2PARAM_free(pbe2);
|
|
|
|
} else {
|
|
|
|
if (aparamtype == V_ASN1_SEQUENCE)
|
|
|
|
pbe = ASN1_item_unpack(aparam, ASN1_ITEM_rptr(PBEPARAM));
|
|
|
|
if (pbe == NULL) {
|
2016-07-20 20:10:29 +08:00
|
|
|
BIO_puts(bio_err, ", <unsupported parameters>");
|
2016-07-07 22:56:26 +08:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
BIO_printf(bio_err, ", Iteration %ld", ASN1_INTEGER_get(pbe->iter));
|
|
|
|
PBEPARAM_free(pbe);
|
|
|
|
}
|
|
|
|
done:
|
|
|
|
BIO_puts(bio_err, "\n");
|
2015-01-22 11:40:55 +08:00
|
|
|
return 1;
|
1999-03-30 01:50:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Load all certificates from a given file */
|
|
|
|
|
1999-06-05 06:23:10 +08:00
|
|
|
int cert_load(BIO *in, STACK_OF(X509) *sk)
|
1999-03-30 01:50:26 +08:00
|
|
|
{
|
2020-02-04 11:50:51 +08:00
|
|
|
int ret = 0;
|
2015-01-22 11:40:55 +08:00
|
|
|
X509 *cert;
|
2020-02-04 11:50:51 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
while ((cert = PEM_read_bio_X509(in, NULL, NULL, NULL))) {
|
|
|
|
ret = 1;
|
2020-02-04 11:50:51 +08:00
|
|
|
if (!sk_X509_push(sk, cert))
|
|
|
|
return 0;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
if (ret)
|
|
|
|
ERR_clear_error();
|
|
|
|
return ret;
|
1999-03-30 01:50:26 +08:00
|
|
|
}
|
|
|
|
|
2019-09-02 08:06:29 +08:00
|
|
|
/* Generalised x509 attribute value print */
|
|
|
|
|
|
|
|
void print_attribute(BIO *out, const ASN1_TYPE *av)
|
|
|
|
{
|
|
|
|
char *value;
|
|
|
|
|
|
|
|
switch (av->type) {
|
|
|
|
case V_ASN1_BMPSTRING:
|
|
|
|
value = OPENSSL_uni2asc(av->value.bmpstring->data,
|
|
|
|
av->value.bmpstring->length);
|
|
|
|
BIO_printf(out, "%s\n", value);
|
|
|
|
OPENSSL_free(value);
|
|
|
|
break;
|
|
|
|
|
2019-09-19 13:39:13 +08:00
|
|
|
case V_ASN1_UTF8STRING:
|
|
|
|
BIO_printf(out, "%s\n", av->value.utf8string->data);
|
|
|
|
break;
|
|
|
|
|
2019-09-02 08:06:29 +08:00
|
|
|
case V_ASN1_OCTET_STRING:
|
|
|
|
hex_prin(out, av->value.octet_string->data,
|
|
|
|
av->value.octet_string->length);
|
|
|
|
BIO_printf(out, "\n");
|
|
|
|
break;
|
|
|
|
|
|
|
|
case V_ASN1_BIT_STRING:
|
|
|
|
hex_prin(out, av->value.bit_string->data,
|
|
|
|
av->value.bit_string->length);
|
|
|
|
BIO_printf(out, "\n");
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
BIO_printf(out, "<Unsupported tag %d>\n", av->type);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-03-30 01:50:26 +08:00
|
|
|
/* Generalised attribute print: handle PKCS#8 and bag attributes */
|
|
|
|
|
2016-08-13 20:40:05 +08:00
|
|
|
int print_attribs(BIO *out, const STACK_OF(X509_ATTRIBUTE) *attrlst,
|
2015-01-22 11:40:55 +08:00
|
|
|
const char *name)
|
1999-03-30 01:50:26 +08:00
|
|
|
{
|
2015-01-22 11:40:55 +08:00
|
|
|
X509_ATTRIBUTE *attr;
|
|
|
|
ASN1_TYPE *av;
|
2019-09-02 08:06:29 +08:00
|
|
|
int i, j, attr_nid;
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!attrlst) {
|
|
|
|
BIO_printf(out, "%s: <No Attributes>\n", name);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (!sk_X509_ATTRIBUTE_num(attrlst)) {
|
|
|
|
BIO_printf(out, "%s: <Empty Attributes>\n", name);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
BIO_printf(out, "%s\n", name);
|
|
|
|
for (i = 0; i < sk_X509_ATTRIBUTE_num(attrlst); i++) {
|
2015-03-15 07:48:47 +08:00
|
|
|
ASN1_OBJECT *attr_obj;
|
2015-01-22 11:40:55 +08:00
|
|
|
attr = sk_X509_ATTRIBUTE_value(attrlst, i);
|
2015-03-15 07:48:47 +08:00
|
|
|
attr_obj = X509_ATTRIBUTE_get0_object(attr);
|
|
|
|
attr_nid = OBJ_obj2nid(attr_obj);
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(out, " ");
|
|
|
|
if (attr_nid == NID_undef) {
|
2015-03-15 07:48:47 +08:00
|
|
|
i2a_ASN1_OBJECT(out, attr_obj);
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(out, ": ");
|
2017-06-13 01:24:02 +08:00
|
|
|
} else {
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(out, "%s: ", OBJ_nid2ln(attr_nid));
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2015-03-15 07:48:47 +08:00
|
|
|
if (X509_ATTRIBUTE_count(attr)) {
|
2019-09-02 08:06:29 +08:00
|
|
|
for (j = 0; j < X509_ATTRIBUTE_count(attr); j++)
|
|
|
|
{
|
|
|
|
av = X509_ATTRIBUTE_get0_type(attr, j);
|
|
|
|
print_attribute(out, av);
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2017-06-13 01:24:02 +08:00
|
|
|
} else {
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(out, "<No Values>\n");
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
return 1;
|
1999-03-30 01:50:26 +08:00
|
|
|
}
|
|
|
|
|
1999-04-20 05:31:43 +08:00
|
|
|
void hex_prin(BIO *out, unsigned char *buf, int len)
|
1999-03-30 01:50:26 +08:00
|
|
|
{
|
2015-01-22 11:40:55 +08:00
|
|
|
int i;
|
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
BIO_printf(out, "%02X ", buf[i]);
|
1999-03-30 01:50:26 +08:00
|
|
|
}
|
1999-08-03 05:44:49 +08:00
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
static int set_pbe(int *ppbe, const char *str)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
if (!str)
|
|
|
|
return 0;
|
2015-05-07 02:56:14 +08:00
|
|
|
if (strcmp(str, "NONE") == 0) {
|
2015-01-22 11:40:55 +08:00
|
|
|
*ppbe = -1;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
*ppbe = OBJ_txt2nid(str);
|
|
|
|
if (*ppbe == NID_undef) {
|
|
|
|
BIO_printf(bio_err, "Unknown PBE algorithm %s\n", str);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|