2016-05-18 02:18:30 +08:00
|
|
|
/*
|
2022-05-03 18:52:38 +08:00
|
|
|
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
|
1998-12-21 18:52:47 +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
|
1998-12-21 18:52:47 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include "apps.h"
|
2018-01-31 18:13:10 +08:00
|
|
|
#include "progs.h"
|
1999-04-24 06:13:45 +08:00
|
|
|
#include <openssl/bio.h>
|
|
|
|
#include <openssl/asn1.h>
|
|
|
|
#include <openssl/err.h>
|
|
|
|
#include <openssl/bn.h>
|
|
|
|
#include <openssl/evp.h>
|
|
|
|
#include <openssl/x509.h>
|
|
|
|
#include <openssl/x509v3.h>
|
|
|
|
#include <openssl/objects.h>
|
|
|
|
#include <openssl/pem.h>
|
2020-12-18 04:37:15 +08:00
|
|
|
#include <openssl/rsa.h>
|
2005-07-16 20:37:36 +08:00
|
|
|
#ifndef OPENSSL_NO_DSA
|
2015-01-22 11:40:55 +08:00
|
|
|
# include <openssl/dsa.h>
|
2005-07-16 20:37:36 +08:00
|
|
|
#endif
|
1998-12-21 18:52:47 +08:00
|
|
|
|
|
|
|
#undef POSTFIX
|
2015-01-22 11:40:55 +08:00
|
|
|
#define POSTFIX ".srl"
|
2020-12-20 00:42:51 +08:00
|
|
|
#define DEFAULT_DAYS 30 /* default cert validity period in days */
|
|
|
|
#define UNSET_DAYS -2 /* -1 is used for testing expiration checks */
|
2021-01-06 21:44:03 +08:00
|
|
|
#define EXT_COPY_UNSET -1
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2015-01-13 06:29:26 +08:00
|
|
|
static int callb(int ok, X509_STORE_CTX *ctx);
|
2021-01-09 00:43:13 +08:00
|
|
|
static ASN1_INTEGER *x509_load_serial(const char *CAfile,
|
|
|
|
const char *serialfile, int create);
|
1999-11-26 08:27:07 +08:00
|
|
|
static int purpose_print(BIO *bio, X509 *cert, X509_PURPOSE *pt);
|
2021-01-06 21:44:03 +08:00
|
|
|
static int print_x509v3_exts(BIO *bio, X509 *x, const char *ext_names);
|
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
|
|
|
|
|
|
|
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_INFORM, OPT_OUTFORM, OPT_KEYFORM, OPT_REQ, OPT_CAFORM,
|
2020-03-11 06:08:59 +08:00
|
|
|
OPT_CAKEYFORM, OPT_VFYOPT, OPT_SIGOPT, OPT_DAYS, OPT_PASSIN, OPT_EXTFILE,
|
2021-01-06 22:01:46 +08:00
|
|
|
OPT_EXTENSIONS, OPT_IN, OPT_OUT, OPT_KEY, OPT_SIGNKEY, OPT_CA, OPT_CAKEY,
|
2019-03-19 07:35:03 +08:00
|
|
|
OPT_CASERIAL, OPT_SET_SERIAL, OPT_NEW, OPT_FORCE_PUBKEY, OPT_SUBJ,
|
2021-03-02 07:33:29 +08:00
|
|
|
OPT_ADDTRUST, OPT_ADDREJECT, OPT_SETALIAS, OPT_CERTOPT, OPT_DATEOPT, OPT_NAMEOPT,
|
2020-11-12 08:10:22 +08:00
|
|
|
OPT_EMAIL, OPT_OCSP_URI, OPT_SERIAL, OPT_NEXT_SERIAL,
|
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_MODULUS, OPT_PUBKEY, OPT_X509TOREQ, OPT_TEXT, OPT_HASH,
|
|
|
|
OPT_ISSUER_HASH, OPT_SUBJECT, OPT_ISSUER, OPT_FINGERPRINT, OPT_DATES,
|
|
|
|
OPT_PURPOSE, OPT_STARTDATE, OPT_ENDDATE, OPT_CHECKEND, OPT_CHECKHOST,
|
|
|
|
OPT_CHECKEMAIL, OPT_CHECKIP, OPT_NOOUT, OPT_TRUSTOUT, OPT_CLRTRUST,
|
|
|
|
OPT_CLRREJECT, OPT_ALIAS, OPT_CACREATESERIAL, OPT_CLREXT, OPT_OCSPID,
|
2021-01-06 21:44:03 +08:00
|
|
|
OPT_SUBJECT_HASH_OLD, OPT_ISSUER_HASH_OLD, OPT_COPY_EXTENSIONS,
|
2017-07-05 22:58:48 +08:00
|
|
|
OPT_BADSIG, OPT_MD, OPT_ENGINE, OPT_NOCERT, OPT_PRESERVE_DATES,
|
2020-02-25 12:29:30 +08:00
|
|
|
OPT_R_ENUM, OPT_PROV_ENUM, OPT_EXT
|
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 x509_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"},
|
2019-11-08 04:08:30 +08:00
|
|
|
|
2020-12-20 00:42:51 +08:00
|
|
|
{"in", OPT_IN, '<',
|
2021-08-27 13:11:36 +08:00
|
|
|
"Certificate input, or CSR input file with -req (default stdin)"},
|
2020-08-16 21:25:27 +08:00
|
|
|
{"passin", OPT_PASSIN, 's', "Private key and cert file pass-phrase source"},
|
2020-12-20 00:42:51 +08:00
|
|
|
{"new", OPT_NEW, '-', "Generate a certificate from scratch"},
|
|
|
|
{"x509toreq", OPT_X509TOREQ, '-',
|
|
|
|
"Output a certification request (rather than a certificate)"},
|
|
|
|
{"req", OPT_REQ, '-', "Input is a CSR file (rather than a certificate)"},
|
2021-01-06 21:44:03 +08:00
|
|
|
{"copy_extensions", OPT_COPY_EXTENSIONS, 's',
|
|
|
|
"copy extensions when converting from CSR to x509 or vice versa"},
|
2020-12-20 00:42:51 +08:00
|
|
|
{"inform", OPT_INFORM, 'f',
|
2021-07-06 18:28:22 +08:00
|
|
|
"CSR input format to use (PEM or DER; by default try PEM first)"},
|
2020-12-20 00:42:51 +08:00
|
|
|
{"vfyopt", OPT_VFYOPT, 's', "CSR verification parameter in n:v form"},
|
2021-01-06 22:01:46 +08:00
|
|
|
{"key", OPT_KEY, 's',
|
2021-08-27 13:11:36 +08:00
|
|
|
"Key for signing, and to include unless using -force_pubkey"},
|
2020-12-20 00:42:51 +08:00
|
|
|
{"signkey", OPT_SIGNKEY, 's',
|
2021-01-06 22:01:46 +08:00
|
|
|
"Same as -key"},
|
2020-12-20 00:42:51 +08:00
|
|
|
{"keyform", OPT_KEYFORM, 'E',
|
|
|
|
"Key input format (ENGINE, other values ignored)"},
|
|
|
|
{"out", OPT_OUT, '>', "Output file - default stdout"},
|
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
|
|
|
{"outform", OPT_OUTFORM, 'f',
|
2020-05-06 19:51:50 +08:00
|
|
|
"Output format (DER or PEM) - default PEM"},
|
2020-12-20 00:42:51 +08:00
|
|
|
{"nocert", OPT_NOCERT, '-',
|
|
|
|
"No cert output (except for requested printing)"},
|
|
|
|
{"noout", OPT_NOOUT, '-', "No output (except for requested printing)"},
|
2019-11-08 04:08:30 +08:00
|
|
|
|
2020-12-20 00:42:51 +08:00
|
|
|
OPT_SECTION("Certificate printing"),
|
|
|
|
{"text", OPT_TEXT, '-', "Print the certificate in text form"},
|
2022-08-27 02:40:48 +08:00
|
|
|
{"dateopt", OPT_DATEOPT, 's',
|
|
|
|
"Datetime format used for printing. (rfc_822/iso_8601). Default is rfc_822."},
|
2020-12-20 00:42:51 +08:00
|
|
|
{"certopt", OPT_CERTOPT, 's', "Various certificate text printing options"},
|
|
|
|
{"fingerprint", OPT_FINGERPRINT, '-', "Print the certificate fingerprint"},
|
|
|
|
{"alias", OPT_ALIAS, '-', "Print certificate alias"},
|
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
|
|
|
{"serial", OPT_SERIAL, '-', "Print serial number value"},
|
2020-12-20 00:42:51 +08:00
|
|
|
{"startdate", OPT_STARTDATE, '-', "Print the notBefore field"},
|
|
|
|
{"enddate", OPT_ENDDATE, '-', "Print the notAfter field"},
|
|
|
|
{"dates", OPT_DATES, '-', "Print both notBefore and notAfter fields"},
|
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
|
|
|
{"subject", OPT_SUBJECT, '-', "Print subject DN"},
|
|
|
|
{"issuer", OPT_ISSUER, '-', "Print issuer DN"},
|
2020-12-20 00:42:51 +08:00
|
|
|
{"nameopt", OPT_NAMEOPT, 's',
|
|
|
|
"Certificate subject/issuer name printing options"},
|
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
|
|
|
{"email", OPT_EMAIL, '-', "Print email address(es)"},
|
2020-12-20 00:42:51 +08:00
|
|
|
{"hash", OPT_HASH, '-', "Synonym for -subject_hash (for backward compat)"},
|
|
|
|
{"subject_hash", OPT_HASH, '-', "Print subject hash value"},
|
2019-11-08 04:08:30 +08:00
|
|
|
#ifndef OPENSSL_NO_MD5
|
|
|
|
{"subject_hash_old", OPT_SUBJECT_HASH_OLD, '-',
|
|
|
|
"Print old-style (MD5) subject hash value"},
|
2020-12-20 00:42:51 +08:00
|
|
|
#endif
|
|
|
|
{"issuer_hash", OPT_ISSUER_HASH, '-', "Print issuer hash value"},
|
|
|
|
#ifndef OPENSSL_NO_MD5
|
2020-07-20 05:54:07 +08:00
|
|
|
{"issuer_hash_old", OPT_ISSUER_HASH_OLD, '-',
|
|
|
|
"Print old-style (MD5) issuer hash value"},
|
2019-11-08 04:08:30 +08:00
|
|
|
#endif
|
2021-01-09 00:43:13 +08:00
|
|
|
{"ext", OPT_EXT, 's',
|
|
|
|
"Restrict which X.509 extensions to print and/or copy"},
|
2020-12-20 00:42:51 +08:00
|
|
|
{"ocspid", OPT_OCSPID, '-',
|
|
|
|
"Print OCSP hash values for the subject name and public key"},
|
|
|
|
{"ocsp_uri", OPT_OCSP_URI, '-', "Print OCSP Responder URL(s)"},
|
|
|
|
{"purpose", OPT_PURPOSE, '-', "Print out certificate purposes"},
|
|
|
|
{"pubkey", OPT_PUBKEY, '-', "Print the public key in PEM format"},
|
|
|
|
{"modulus", OPT_MODULUS, '-', "Print the RSA key modulus"},
|
2019-11-08 04:08:30 +08:00
|
|
|
|
2020-12-20 00:42:51 +08:00
|
|
|
OPT_SECTION("Certificate checking"),
|
|
|
|
{"checkend", OPT_CHECKEND, 'M',
|
|
|
|
"Check whether cert expires in the next arg seconds"},
|
|
|
|
{OPT_MORE_STR, 1, 1, "Exit 1 (failure) if so, 0 if not"},
|
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
|
|
|
{"checkhost", OPT_CHECKHOST, 's', "Check certificate matches host"},
|
|
|
|
{"checkemail", OPT_CHECKEMAIL, 's', "Check certificate matches email"},
|
|
|
|
{"checkip", OPT_CHECKIP, 's', "Check certificate matches ipaddr"},
|
2020-12-20 00:42:51 +08:00
|
|
|
|
|
|
|
OPT_SECTION("Certificate output"),
|
|
|
|
{"set_serial", OPT_SET_SERIAL, 's',
|
|
|
|
"Serial number to use, overrides -CAserial"},
|
|
|
|
{"next_serial", OPT_NEXT_SERIAL, '-',
|
|
|
|
"Increment current certificate serial number"},
|
|
|
|
{"days", OPT_DAYS, 'n',
|
|
|
|
"Number of days until newly generated certificate expires - default 30"},
|
|
|
|
{"preserve_dates", OPT_PRESERVE_DATES, '-',
|
|
|
|
"Preserve existing validity dates"},
|
2019-11-08 04:08:30 +08:00
|
|
|
{"subj", OPT_SUBJ, 's', "Set or override certificate subject (and issuer)"},
|
2020-12-20 00:42:51 +08:00
|
|
|
{"force_pubkey", OPT_FORCE_PUBKEY, '<',
|
2022-08-27 02:40:48 +08:00
|
|
|
"Key to be placed in new certificate or certificate request"},
|
2021-01-09 00:43:13 +08:00
|
|
|
{"clrext", OPT_CLREXT, '-',
|
|
|
|
"Do not take over any extensions from the source certificate or request"},
|
2020-12-20 00:42:51 +08:00
|
|
|
{"extfile", OPT_EXTFILE, '<', "Config file with X509V3 extensions to add"},
|
|
|
|
{"extensions", OPT_EXTENSIONS, 's',
|
|
|
|
"Section of extfile to use - default: unnamed section"},
|
2021-01-09 00:43:13 +08:00
|
|
|
{"sigopt", OPT_SIGOPT, 's', "Signature parameter, in n:v form"},
|
2020-12-20 00:42:51 +08:00
|
|
|
{"badsig", OPT_BADSIG, '-',
|
|
|
|
"Corrupt last byte of certificate signature (for test)"},
|
|
|
|
{"", OPT_MD, '-', "Any supported digest, used for signing and printing"},
|
2019-11-08 04:08:30 +08:00
|
|
|
|
2020-12-20 00:42:51 +08:00
|
|
|
OPT_SECTION("Micro-CA"),
|
|
|
|
{"CA", OPT_CA, '<',
|
2021-01-06 22:01:46 +08:00
|
|
|
"Use the given CA certificate, conflicts with -key"},
|
2020-05-06 19:51:50 +08:00
|
|
|
{"CAform", OPT_CAFORM, 'F', "CA cert format (PEM/DER/P12); has no effect"},
|
2020-12-20 00:42:51 +08:00
|
|
|
{"CAkey", OPT_CAKEY, 's', "The corresponding CA key; default is -CA arg"},
|
|
|
|
{"CAkeyform", OPT_CAKEYFORM, 'E',
|
|
|
|
"CA key format (ENGINE, other values ignored)"},
|
|
|
|
{"CAserial", OPT_CASERIAL, 's',
|
|
|
|
"File that keeps track of CA-generated serial number"},
|
2019-11-08 04:08:30 +08:00
|
|
|
{"CAcreateserial", OPT_CACREATESERIAL, '-',
|
2020-12-20 00:42:51 +08:00
|
|
|
"Create CA serial number file if it does not exist"},
|
|
|
|
|
|
|
|
OPT_SECTION("Certificate trust output"),
|
|
|
|
{"trustout", OPT_TRUSTOUT, '-', "Mark certificate PEM output as trusted"},
|
|
|
|
{"setalias", OPT_SETALIAS, 's', "Set certificate alias (nickname)"},
|
|
|
|
{"clrtrust", OPT_CLRTRUST, '-', "Clear all trusted purposes"},
|
|
|
|
{"addtrust", OPT_ADDTRUST, 's', "Trust certificate for a given purpose"},
|
2016-08-01 01:02:50 +08:00
|
|
|
{"clrreject", OPT_CLRREJECT, '-',
|
|
|
|
"Clears all the prohibited or rejected uses of the certificate"},
|
2020-12-20 00:42:51 +08:00
|
|
|
{"addreject", OPT_ADDREJECT, 's',
|
|
|
|
"Reject certificate for a given purpose"},
|
|
|
|
|
|
|
|
OPT_R_OPTIONS,
|
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
|
|
|
{"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
|
|
|
|
#endif
|
|
|
|
OPT_PROV_OPTIONS,
|
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
|
|
|
{NULL}
|
|
|
|
};
|
2000-02-11 17:47:18 +08:00
|
|
|
|
2021-01-09 00:43:13 +08:00
|
|
|
static void warn_copying(ASN1_OBJECT *excluded, const char *names)
|
|
|
|
{
|
|
|
|
const char *sn = OBJ_nid2sn(OBJ_obj2nid(excluded));
|
|
|
|
|
|
|
|
if (names != NULL && strstr(names, sn) != NULL)
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Warning: -ext should not specify copying %s extension to CSR; ignoring this\n",
|
|
|
|
sn);
|
|
|
|
}
|
|
|
|
|
2021-08-25 14:35:40 +08:00
|
|
|
static X509_REQ *x509_to_req(X509 *cert, int ext_copy, const char *names)
|
2021-01-09 00:43:13 +08:00
|
|
|
{
|
|
|
|
const STACK_OF(X509_EXTENSION) *cert_exts = X509_get0_extensions(cert);
|
|
|
|
int i, n = sk_X509_EXTENSION_num(cert_exts /* may be NULL */);
|
|
|
|
ASN1_OBJECT *skid = OBJ_nid2obj(NID_subject_key_identifier);
|
|
|
|
ASN1_OBJECT *akid = OBJ_nid2obj(NID_authority_key_identifier);
|
|
|
|
STACK_OF(X509_EXTENSION) *exts;
|
|
|
|
X509_REQ *req = X509_to_X509_REQ(cert, NULL, NULL);
|
|
|
|
|
|
|
|
if (req == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Filter out SKID and AKID extensions, which make no sense in a CSR.
|
|
|
|
* If names is not NULL, copy only those extensions listed there.
|
|
|
|
*/
|
|
|
|
warn_copying(skid, names);
|
|
|
|
warn_copying(akid, names);
|
|
|
|
if ((exts = sk_X509_EXTENSION_new_reserve(NULL, n)) == NULL)
|
|
|
|
goto err;
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
X509_EXTENSION *ex = sk_X509_EXTENSION_value(cert_exts, i);
|
|
|
|
ASN1_OBJECT *obj = X509_EXTENSION_get_object(ex);
|
|
|
|
|
|
|
|
if (OBJ_cmp(obj, skid) != 0 && OBJ_cmp(obj, akid) != 0
|
|
|
|
&& !sk_X509_EXTENSION_push(exts, ex))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sk_X509_EXTENSION_num(exts) > 0) {
|
|
|
|
if (ext_copy != EXT_COPY_UNSET && ext_copy != EXT_COPY_NONE
|
|
|
|
&& !X509_REQ_add_extensions(req, exts)) {
|
|
|
|
BIO_printf(bio_err, "Error copying extensions from certificate\n");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sk_X509_EXTENSION_free(exts);
|
|
|
|
return req;
|
|
|
|
|
|
|
|
err:
|
|
|
|
sk_X509_EXTENSION_free(exts);
|
|
|
|
X509_REQ_free(req);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2021-10-05 18:54:15 +08:00
|
|
|
static int self_signed(X509_STORE *ctx, X509 *cert)
|
|
|
|
{
|
|
|
|
X509_STORE_CTX *xsc = X509_STORE_CTX_new();
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (xsc == NULL || !X509_STORE_CTX_init(xsc, ctx, cert, NULL)) {
|
|
|
|
BIO_printf(bio_err, "Error initialising X509 store\n");
|
|
|
|
} else {
|
|
|
|
X509_STORE_CTX_set_flags(xsc, X509_V_FLAG_CHECK_SS_SIGNATURE);
|
|
|
|
ret = X509_verify_cert(xsc) > 0;
|
|
|
|
}
|
|
|
|
X509_STORE_CTX_free(xsc);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
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 x509_main(int argc, char **argv)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
ASN1_INTEGER *sno = NULL;
|
2016-04-27 01:45:46 +08:00
|
|
|
ASN1_OBJECT *objtmp = NULL;
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO *out = 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
|
|
|
CONF *extconf = NULL;
|
2021-01-06 21:44:03 +08:00
|
|
|
int ext_copy = EXT_COPY_UNSET;
|
2021-01-09 00:43:13 +08:00
|
|
|
X509V3_CTX ext_ctx;
|
2021-01-06 22:01:46 +08:00
|
|
|
EVP_PKEY *privkey = NULL, *CAkey = NULL, *pubkey = NULL;
|
2021-02-26 19:48:43 +08:00
|
|
|
EVP_PKEY *pkey;
|
2019-03-19 07:35:03 +08:00
|
|
|
int newcert = 0;
|
2021-04-24 18:40:36 +08:00
|
|
|
char *subj = NULL, *digest = NULL;
|
2019-03-19 07:35:03 +08:00
|
|
|
X509_NAME *fsubj = NULL;
|
|
|
|
const unsigned long chtype = MBSTRING_ASC;
|
2020-09-02 19:52:23 +08:00
|
|
|
const int multirdn = 1;
|
2015-01-22 11:40:55 +08:00
|
|
|
STACK_OF(ASN1_OBJECT) *trust = NULL, *reject = NULL;
|
2020-03-11 06:08:59 +08:00
|
|
|
STACK_OF(OPENSSL_STRING) *sigopts = NULL, *vfyopts = NULL;
|
2021-01-09 00:43:13 +08:00
|
|
|
X509 *x = NULL, *xca = NULL, *issuer_cert;
|
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_REQ *req = NULL, *rq = NULL;
|
|
|
|
X509_STORE *ctx = NULL;
|
2020-12-20 00:42:51 +08:00
|
|
|
char *CAkeyfile = NULL, *CAserial = NULL, *pubkeyfile = NULL, *alias = NULL;
|
2021-01-06 21:44:03 +08:00
|
|
|
char *checkhost = NULL, *checkemail = NULL, *checkip = NULL;
|
|
|
|
char *ext_names = 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 *extsect = NULL, *extfile = NULL, *passin = NULL, *passinarg = NULL;
|
2021-01-06 22:01:46 +08:00
|
|
|
char *infile = NULL, *outfile = NULL, *privkeyfile = NULL, *CAfile = NULL;
|
2017-04-26 00:25:42 +08:00
|
|
|
char *prog;
|
2020-12-20 00:42:51 +08:00
|
|
|
int days = UNSET_DAYS; /* not explicitly set */
|
|
|
|
int x509toreq = 0, modulus = 0, print_pubkey = 0, pprint = 0;
|
2021-04-30 22:57:53 +08:00
|
|
|
int CAformat = FORMAT_UNDEF, CAkeyformat = FORMAT_UNDEF;
|
2021-03-02 07:33:29 +08:00
|
|
|
unsigned long dateopt = ASN1_DTFLGS_RFC822;
|
2017-07-05 22:58:48 +08:00
|
|
|
int fingerprint = 0, reqfile = 0, checkend = 0;
|
2021-04-30 22:57:53 +08:00
|
|
|
int informat = FORMAT_UNDEF, outformat = FORMAT_PEM, keyformat = FORMAT_UNDEF;
|
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 next_serial = 0, subject_hash = 0, issuer_hash = 0, ocspid = 0;
|
2020-12-20 00:42:51 +08:00
|
|
|
int noout = 0, CA_createserial = 0, email = 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
|
|
|
int ocsp_uri = 0, trustout = 0, clrtrust = 0, clrreject = 0, aliasout = 0;
|
2021-02-26 19:48:43 +08:00
|
|
|
int ret = 1, i, j, num = 0, badsig = 0, clrext = 0, nocert = 0;
|
2017-07-27 15:33:14 +08:00
|
|
|
int text = 0, serial = 0, subject = 0, issuer = 0, startdate = 0, ext = 0;
|
2016-01-30 04:27:00 +08:00
|
|
|
int enddate = 0;
|
|
|
|
time_t checkoffset = 0;
|
2017-04-26 00:25:42 +08:00
|
|
|
unsigned long certflag = 0;
|
2015-02-21 04:00:28 +08:00
|
|
|
int preserve_dates = 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
|
|
|
OPTION_CHOICE o;
|
|
|
|
ENGINE *e = NULL;
|
|
|
|
#ifndef OPENSSL_NO_MD5
|
|
|
|
int subject_hash_old = 0, issuer_hash_old = 0;
|
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
|
|
|
#endif
|
1998-12-21 18:52:47 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
ctx = X509_STORE_new();
|
|
|
|
if (ctx == NULL)
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2015-01-22 11:40:55 +08:00
|
|
|
X509_STORE_set_verify_cb(ctx, callb);
|
|
|
|
|
2021-08-24 18:03:12 +08:00
|
|
|
opt_set_unknown_name("digest");
|
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
|
|
|
prog = opt_init(argc, argv, x509_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);
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
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_HELP:
|
|
|
|
opt_help(x509_options);
|
|
|
|
ret = 0;
|
|
|
|
goto end;
|
|
|
|
case OPT_INFORM:
|
2020-05-06 19:51:50 +08:00
|
|
|
if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &informat))
|
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
|
|
|
goto opthelp;
|
|
|
|
break;
|
|
|
|
case OPT_IN:
|
|
|
|
infile = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_OUTFORM:
|
|
|
|
if (!opt_format(opt_arg(), OPT_FMT_ANY, &outformat))
|
|
|
|
goto opthelp;
|
|
|
|
break;
|
|
|
|
case OPT_KEYFORM:
|
2020-05-06 19:51:50 +08:00
|
|
|
if (!opt_format(opt_arg(), OPT_FMT_ANY, &keyformat))
|
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
|
|
|
goto opthelp;
|
|
|
|
break;
|
|
|
|
case OPT_CAFORM:
|
2020-05-06 19:51:50 +08:00
|
|
|
if (!opt_format(opt_arg(), OPT_FMT_ANY, &CAformat))
|
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
|
|
|
goto opthelp;
|
|
|
|
break;
|
|
|
|
case OPT_CAKEYFORM:
|
2020-05-06 19:51:50 +08:00
|
|
|
if (!opt_format(opt_arg(), OPT_FMT_ANY, &CAkeyformat))
|
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
|
|
|
goto opthelp;
|
|
|
|
break;
|
|
|
|
case OPT_OUT:
|
|
|
|
outfile = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_REQ:
|
2017-07-05 22:58:48 +08:00
|
|
|
reqfile = 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-03-02 07:33:29 +08:00
|
|
|
|
|
|
|
case OPT_DATEOPT:
|
|
|
|
if (!set_dateopt(&dateopt, opt_arg())) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Invalid date format: %s\n", opt_arg());
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2021-03-02 07:33:29 +08:00
|
|
|
}
|
|
|
|
break;
|
2021-01-06 21:44:03 +08:00
|
|
|
case OPT_COPY_EXTENSIONS:
|
|
|
|
if (!set_ext_copy(&ext_copy, opt_arg())) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Invalid extension copy option: %s\n", opt_arg());
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2021-01-06 21:44:03 +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_SIGOPT:
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!sigopts)
|
|
|
|
sigopts = sk_OPENSSL_STRING_new_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 (!sigopts || !sk_OPENSSL_STRING_push(sigopts, opt_arg()))
|
|
|
|
goto opthelp;
|
|
|
|
break;
|
2020-03-11 06:08:59 +08:00
|
|
|
case OPT_VFYOPT:
|
|
|
|
if (!vfyopts)
|
|
|
|
vfyopts = sk_OPENSSL_STRING_new_null();
|
|
|
|
if (!vfyopts || !sk_OPENSSL_STRING_push(vfyopts, opt_arg()))
|
|
|
|
goto opthelp;
|
|
|
|
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_DAYS:
|
|
|
|
days = atoi(opt_arg());
|
2020-12-20 00:42:51 +08:00
|
|
|
if (days < -1) {
|
|
|
|
BIO_printf(bio_err, "%s: -days parameter arg must be >= -1\n",
|
|
|
|
prog);
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2020-12-20 00:42:51 +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
|
|
|
break;
|
|
|
|
case OPT_PASSIN:
|
|
|
|
passinarg = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_EXTFILE:
|
|
|
|
extfile = opt_arg();
|
|
|
|
break;
|
2017-07-05 22:58:48 +08:00
|
|
|
case OPT_R_CASES:
|
|
|
|
if (!opt_rand(o))
|
|
|
|
goto end;
|
|
|
|
break;
|
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
|
|
|
case OPT_EXTENSIONS:
|
|
|
|
extsect = opt_arg();
|
|
|
|
break;
|
2021-01-06 22:01:46 +08:00
|
|
|
case OPT_KEY:
|
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_SIGNKEY:
|
2021-01-06 22:01:46 +08:00
|
|
|
privkeyfile = opt_arg();
|
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_CA:
|
|
|
|
CAfile = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_CAKEY:
|
|
|
|
CAkeyfile = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_CASERIAL:
|
|
|
|
CAserial = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_SET_SERIAL:
|
2016-08-24 18:22:47 +08:00
|
|
|
if (sno != NULL) {
|
2016-08-24 20:36:07 +08:00
|
|
|
BIO_printf(bio_err, "Serial number supplied twice\n");
|
2016-08-24 18:22:47 +08:00
|
|
|
goto opthelp;
|
|
|
|
}
|
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 ((sno = s2i_ASN1_INTEGER(NULL, opt_arg())) == NULL)
|
|
|
|
goto opthelp;
|
|
|
|
break;
|
2019-03-19 07:35:03 +08:00
|
|
|
case OPT_NEW:
|
|
|
|
newcert = 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_FORCE_PUBKEY:
|
2020-12-20 00:42:51 +08:00
|
|
|
pubkeyfile = opt_arg();
|
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-03-19 07:35:03 +08:00
|
|
|
case OPT_SUBJ:
|
|
|
|
subj = 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_ADDTRUST:
|
2021-02-26 19:48:43 +08:00
|
|
|
if (trust == NULL && (trust = sk_ASN1_OBJECT_new_null()) == NULL)
|
|
|
|
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
|
|
|
if ((objtmp = OBJ_txt2obj(opt_arg(), 0)) == NULL) {
|
2021-02-26 19:48:43 +08:00
|
|
|
BIO_printf(bio_err, "%s: Invalid trust object value %s\n",
|
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
|
|
|
prog, opt_arg());
|
|
|
|
goto opthelp;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
sk_ASN1_OBJECT_push(trust, objtmp);
|
|
|
|
trustout = 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;
|
|
|
|
case OPT_ADDREJECT:
|
2021-02-26 19:48:43 +08:00
|
|
|
if (reject == NULL && (reject = sk_ASN1_OBJECT_new_null()) == NULL)
|
|
|
|
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
|
|
|
if ((objtmp = OBJ_txt2obj(opt_arg(), 0)) == NULL) {
|
2021-02-26 19:48:43 +08:00
|
|
|
BIO_printf(bio_err, "%s: Invalid reject object value %s\n",
|
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
|
|
|
prog, opt_arg());
|
|
|
|
goto opthelp;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
sk_ASN1_OBJECT_push(reject, objtmp);
|
|
|
|
trustout = 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;
|
|
|
|
case OPT_SETALIAS:
|
|
|
|
alias = opt_arg();
|
2015-01-22 11:40:55 +08:00
|
|
|
trustout = 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;
|
|
|
|
case OPT_CERTOPT:
|
|
|
|
if (!set_cert_ex(&certflag, opt_arg()))
|
|
|
|
goto opthelp;
|
|
|
|
break;
|
|
|
|
case OPT_NAMEOPT:
|
2017-04-26 00:25:42 +08:00
|
|
|
if (!set_nameopt(opt_arg()))
|
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
|
|
|
goto opthelp;
|
|
|
|
break;
|
|
|
|
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;
|
|
|
|
case OPT_EMAIL:
|
2015-01-22 11:40:55 +08:00
|
|
|
email = ++num;
|
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_OCSP_URI:
|
2015-01-22 11:40:55 +08:00
|
|
|
ocsp_uri = ++num;
|
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_SERIAL:
|
2015-01-22 11:40:55 +08:00
|
|
|
serial = ++num;
|
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_NEXT_SERIAL:
|
2015-01-22 11:40:55 +08:00
|
|
|
next_serial = ++num;
|
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_MODULUS:
|
2015-01-22 11:40:55 +08:00
|
|
|
modulus = ++num;
|
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_PUBKEY:
|
2020-12-20 00:42:51 +08:00
|
|
|
print_pubkey = ++num;
|
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_X509TOREQ:
|
2020-12-20 00:42:51 +08:00
|
|
|
x509toreq = 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;
|
|
|
|
case OPT_TEXT:
|
2015-01-22 11:40:55 +08:00
|
|
|
text = ++num;
|
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_SUBJECT:
|
2015-01-22 11:40:55 +08:00
|
|
|
subject = ++num;
|
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_ISSUER:
|
2015-01-22 11:40:55 +08:00
|
|
|
issuer = ++num;
|
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_FINGERPRINT:
|
2015-01-22 11:40:55 +08:00
|
|
|
fingerprint = ++num;
|
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_HASH:
|
|
|
|
subject_hash = ++num;
|
|
|
|
break;
|
|
|
|
case OPT_ISSUER_HASH:
|
|
|
|
issuer_hash = ++num;
|
|
|
|
break;
|
|
|
|
case OPT_PURPOSE:
|
2015-01-22 11:40:55 +08:00
|
|
|
pprint = ++num;
|
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_STARTDATE:
|
2015-01-22 11:40:55 +08:00
|
|
|
startdate = ++num;
|
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_ENDDATE:
|
2015-01-22 11:40:55 +08:00
|
|
|
enddate = ++num;
|
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_NOOUT:
|
2015-01-22 11:40:55 +08:00
|
|
|
noout = ++num;
|
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;
|
2017-07-27 15:33:14 +08:00
|
|
|
case OPT_EXT:
|
|
|
|
ext = ++num;
|
2021-01-06 21:44:03 +08:00
|
|
|
ext_names = opt_arg();
|
2017-07-27 15:33:14 +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_NOCERT:
|
|
|
|
nocert = 1;
|
|
|
|
break;
|
|
|
|
case OPT_TRUSTOUT:
|
2015-01-22 11:40:55 +08:00
|
|
|
trustout = 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;
|
|
|
|
case OPT_CLRTRUST:
|
2015-01-22 11:40:55 +08:00
|
|
|
clrtrust = ++num;
|
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_CLRREJECT:
|
2015-01-22 11:40:55 +08:00
|
|
|
clrreject = ++num;
|
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_ALIAS:
|
2015-01-22 11:40:55 +08:00
|
|
|
aliasout = ++num;
|
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_CACREATESERIAL:
|
2022-05-30 22:53:05 +08:00
|
|
|
CA_createserial = 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;
|
|
|
|
case OPT_CLREXT:
|
2015-01-22 11:40:55 +08:00
|
|
|
clrext = 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;
|
|
|
|
case OPT_OCSPID:
|
2015-01-22 11:40:55 +08:00
|
|
|
ocspid = ++num;
|
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_BADSIG:
|
2015-01-22 11:40:55 +08:00
|
|
|
badsig = 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
|
|
|
#ifndef OPENSSL_NO_MD5
|
|
|
|
case OPT_SUBJECT_HASH_OLD:
|
|
|
|
subject_hash_old = ++num;
|
|
|
|
break;
|
|
|
|
case OPT_ISSUER_HASH_OLD:
|
|
|
|
issuer_hash_old = ++num;
|
|
|
|
break;
|
2015-05-16 01:50:38 +08:00
|
|
|
#else
|
|
|
|
case OPT_SUBJECT_HASH_OLD:
|
|
|
|
case OPT_ISSUER_HASH_OLD:
|
|
|
|
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
|
|
|
#endif
|
|
|
|
case OPT_DATES:
|
|
|
|
startdate = ++num;
|
|
|
|
enddate = ++num;
|
|
|
|
break;
|
|
|
|
case OPT_CHECKEND:
|
|
|
|
checkend = 1;
|
2016-01-30 22:39:34 +08:00
|
|
|
{
|
2021-06-21 15:25:16 +08:00
|
|
|
ossl_intmax_t temp = 0;
|
2021-05-01 20:35:21 +08:00
|
|
|
if (!opt_intmax(opt_arg(), &temp))
|
2016-01-30 22:39:34 +08:00
|
|
|
goto opthelp;
|
|
|
|
checkoffset = (time_t)temp;
|
2021-06-21 15:25:16 +08:00
|
|
|
if ((ossl_intmax_t)checkoffset != temp) {
|
2020-12-08 02:37:46 +08:00
|
|
|
BIO_printf(bio_err, "%s: Checkend time out of range %s\n",
|
2016-01-30 22:39:34 +08:00
|
|
|
prog, opt_arg());
|
|
|
|
goto opthelp;
|
|
|
|
}
|
2016-01-30 04:27:00 +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
|
|
|
break;
|
|
|
|
case OPT_CHECKHOST:
|
|
|
|
checkhost = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_CHECKEMAIL:
|
|
|
|
checkemail = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_CHECKIP:
|
|
|
|
checkip = opt_arg();
|
|
|
|
break;
|
2015-02-21 04:00:28 +08:00
|
|
|
case OPT_PRESERVE_DATES:
|
|
|
|
preserve_dates = 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_MD:
|
2021-04-24 18:40:36 +08:00
|
|
|
digest = opt_unknown();
|
2021-02-09 03:03:35 +08:00
|
|
|
break;
|
2015-01-22 11:40:55 +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
|
|
|
}
|
2020-11-29 05:12:58 +08:00
|
|
|
/* No extra arguments. */
|
2021-08-27 21:33:18 +08:00
|
|
|
if (!opt_check_rest_arg(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
|
|
|
goto opthelp;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2021-04-03 18:53:51 +08:00
|
|
|
if (!app_RAND_load())
|
|
|
|
goto end;
|
|
|
|
|
2021-08-27 21:33:18 +08:00
|
|
|
if (!opt_check_md(digest))
|
|
|
|
goto opthelp;
|
|
|
|
|
2020-12-20 00:42:51 +08:00
|
|
|
if (preserve_dates && days != UNSET_DAYS) {
|
|
|
|
BIO_printf(bio_err, "Cannot use -preserve_dates with -days option\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2020-12-20 00:42:51 +08:00
|
|
|
}
|
|
|
|
if (days == UNSET_DAYS)
|
|
|
|
days = DEFAULT_DAYS;
|
|
|
|
|
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, NULL, &passin, NULL)) {
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(bio_err, "Error getting password\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
2020-09-24 17:42:23 +08:00
|
|
|
if (!X509_STORE_set_default_paths_ex(ctx, app_get0_libctx(),
|
2020-12-11 00:31:10 +08:00
|
|
|
app_get0_propq()))
|
2015-01-22 11:40:55 +08:00
|
|
|
goto end;
|
|
|
|
|
2019-03-19 07:35:03 +08:00
|
|
|
if (newcert && infile != NULL) {
|
2020-12-20 00:42:51 +08:00
|
|
|
BIO_printf(bio_err, "The -in option cannot be used with -new\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2020-12-20 00:42:51 +08:00
|
|
|
}
|
|
|
|
if (newcert && reqfile) {
|
2022-08-27 02:40:48 +08:00
|
|
|
BIO_printf(bio_err, "The -req option cannot be used with -new\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2019-03-19 07:35:03 +08:00
|
|
|
}
|
2021-01-06 22:01:46 +08:00
|
|
|
if (privkeyfile != NULL) {
|
|
|
|
privkey = load_key(privkeyfile, keyformat, 0, passin, e, "private key");
|
|
|
|
if (privkey == NULL)
|
2020-12-20 00:42:51 +08:00
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if (pubkeyfile != NULL) {
|
|
|
|
if ((pubkey = load_pubkey(pubkeyfile, keyformat, 0, NULL, e,
|
|
|
|
"explicitly set public key")) == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
2020-12-20 00:42:51 +08:00
|
|
|
if (newcert) {
|
|
|
|
if (subj == NULL) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"The -new option requires a subject to be set using -subj\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2020-12-20 00:42:51 +08:00
|
|
|
}
|
2021-01-06 22:01:46 +08:00
|
|
|
if (privkeyfile == NULL && pubkeyfile == NULL) {
|
2020-12-20 00:42:51 +08:00
|
|
|
BIO_printf(bio_err,
|
2021-08-27 13:11:36 +08:00
|
|
|
"The -new option requires using the -key or -force_pubkey option\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2020-12-20 00:42:51 +08:00
|
|
|
}
|
2019-03-19 07:35:03 +08:00
|
|
|
}
|
2020-06-27 16:28:45 +08:00
|
|
|
if (subj != NULL
|
|
|
|
&& (fsubj = parse_name(subj, chtype, multirdn, "subject")) == NULL)
|
2019-03-19 07:35:03 +08:00
|
|
|
goto end;
|
|
|
|
|
2020-12-20 00:42:51 +08:00
|
|
|
if (CAkeyfile == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
CAkeyfile = CAfile;
|
2020-12-20 00:42:51 +08:00
|
|
|
if (CAfile != NULL) {
|
2021-01-06 22:01:46 +08:00
|
|
|
if (privkeyfile != NULL) {
|
2021-08-27 13:11:36 +08:00
|
|
|
BIO_printf(bio_err, "Cannot use both -key/-signkey and -CA option\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2020-12-20 00:42:51 +08:00
|
|
|
}
|
2022-05-31 16:03:10 +08:00
|
|
|
} else {
|
|
|
|
#define WARN_NO_CA(opt) BIO_printf(bio_err, \
|
|
|
|
"Warning: ignoring " opt " option since -CA option is not given\n");
|
|
|
|
if (CAkeyfile != NULL)
|
|
|
|
WARN_NO_CA("-CAkey");
|
|
|
|
if (CAkeyformat != FORMAT_UNDEF)
|
|
|
|
WARN_NO_CA("-CAkeyform");
|
|
|
|
if (CAformat != FORMAT_UNDEF)
|
|
|
|
WARN_NO_CA("-CAform");
|
|
|
|
if (CAserial != NULL)
|
|
|
|
WARN_NO_CA("-CAserial");
|
|
|
|
if (CA_createserial)
|
|
|
|
WARN_NO_CA("-CAcreateserial");
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
2020-12-20 00:42:51 +08:00
|
|
|
if (extfile == NULL) {
|
|
|
|
if (extsect != NULL)
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Warning: ignoring -extensions option without -extfile\n");
|
|
|
|
} else {
|
2015-01-22 11:40:55 +08:00
|
|
|
X509V3_CTX ctx2;
|
2020-12-20 00:42:51 +08:00
|
|
|
|
2015-05-29 01:52:55 +08:00
|
|
|
if ((extconf = app_load_config(extfile)) == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
goto end;
|
2017-06-13 01:24:02 +08:00
|
|
|
if (extsect == NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
extsect = NCONF_get_string(extconf, "default", "extensions");
|
2017-06-13 01:24:02 +08:00
|
|
|
if (extsect == NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
ERR_clear_error();
|
|
|
|
extsect = "default";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
X509V3_set_ctx_test(&ctx2);
|
|
|
|
X509V3_set_nconf(&ctx2, extconf);
|
|
|
|
if (!X509V3_EXT_add_nconf(extconf, &ctx2, extsect, NULL)) {
|
|
|
|
BIO_printf(bio_err,
|
2020-12-08 02:37:46 +08:00
|
|
|
"Error checking extension section %s\n", extsect);
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (reqfile) {
|
2021-08-27 13:11:36 +08:00
|
|
|
if (infile == NULL)
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Warning: Reading cert request from stdin since no -in option is given\n");
|
2021-07-06 18:28:22 +08:00
|
|
|
req = load_csr_autofmt(infile, informat, "certificate request input");
|
2020-04-22 20:58:41 +08:00
|
|
|
if (req == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
goto end;
|
|
|
|
|
2016-04-04 05:37:32 +08:00
|
|
|
if ((pkey = X509_REQ_get0_pubkey(req)) == NULL) {
|
2021-02-26 19:48:43 +08:00
|
|
|
BIO_printf(bio_err, "Error unpacking public key from CSR\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2020-03-11 06:08:59 +08:00
|
|
|
i = do_X509_REQ_verify(req, pkey, vfyopts);
|
2021-02-26 19:48:43 +08:00
|
|
|
if (i <= 0) {
|
|
|
|
BIO_printf(bio_err, i < 0
|
|
|
|
? "Error while verifying certificate request self-signature\n"
|
|
|
|
: "Certificate request self-signature did not match the contents\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2022-02-06 22:01:14 +08:00
|
|
|
BIO_printf(bio_err, "Certificate request self-signature ok\n");
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2022-02-06 22:01:14 +08:00
|
|
|
print_name(bio_err, "subject=", X509_REQ_get_subject_name(req));
|
2021-01-06 21:44:03 +08:00
|
|
|
} else if (!x509toreq && ext_copy != EXT_COPY_UNSET) {
|
2021-01-09 00:43:13 +08:00
|
|
|
BIO_printf(bio_err, "Warning: ignoring -copy_extensions since neither -x509toreq nor -req is given\n");
|
2019-03-19 07:35:03 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (reqfile || newcert) {
|
2020-12-20 00:42:51 +08:00
|
|
|
if (preserve_dates)
|
2019-03-19 07:35:03 +08:00
|
|
|
BIO_printf(bio_err,
|
2020-12-20 00:42:51 +08:00
|
|
|
"Warning: ignoring -preserve_dates option with -req or -new\n");
|
|
|
|
preserve_dates = 0;
|
2021-01-06 22:01:46 +08:00
|
|
|
if (privkeyfile == NULL && CAkeyfile == NULL) {
|
2020-12-20 00:42:51 +08:00
|
|
|
BIO_printf(bio_err,
|
2021-01-06 22:01:46 +08:00
|
|
|
"We need a private key to sign with, use -key or -CAkey or -CA with private key\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2019-03-19 07:35:03 +08:00
|
|
|
}
|
2020-09-24 17:42:23 +08:00
|
|
|
if ((x = X509_new_ex(app_get0_libctx(), app_get0_propq())) == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
goto end;
|
2022-05-20 12:23:54 +08:00
|
|
|
if (CAfile == NULL && sno == NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
sno = ASN1_INTEGER_new();
|
2015-10-30 19:18:04 +08:00
|
|
|
if (sno == NULL || !rand_serial(NULL, sno))
|
2015-01-22 11:40:55 +08:00
|
|
|
goto end;
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
2021-01-09 00:43:13 +08:00
|
|
|
if (req != NULL && ext_copy != EXT_COPY_UNSET) {
|
|
|
|
if (clrext && ext_copy != EXT_COPY_NONE) {
|
2021-01-06 21:44:03 +08:00
|
|
|
BIO_printf(bio_err, "Must not use -clrext together with -copy_extensions\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2021-01-06 21:44:03 +08:00
|
|
|
} else if (!copy_extensions(x, req, ext_copy)) {
|
|
|
|
BIO_printf(bio_err, "Error copying extensions from request\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2021-01-06 21:44:03 +08:00
|
|
|
}
|
|
|
|
}
|
2017-06-13 01:24:02 +08:00
|
|
|
} else {
|
2021-08-27 13:11:36 +08:00
|
|
|
if (infile == NULL)
|
|
|
|
BIO_printf(bio_err,
|
2022-08-27 02:40:48 +08:00
|
|
|
"Warning: Reading certificate from stdin since no -in or -new option is given\n");
|
2021-04-30 22:57:53 +08:00
|
|
|
x = load_cert_pass(infile, informat, 1, passin, "certificate");
|
2019-02-03 14:57:59 +08:00
|
|
|
if (x == NULL)
|
|
|
|
goto end;
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
2020-12-20 00:42:51 +08:00
|
|
|
if ((fsubj != NULL || req != NULL)
|
|
|
|
&& !X509_set_subject_name(x, fsubj != NULL ? fsubj :
|
|
|
|
X509_REQ_get_subject_name(req)))
|
|
|
|
goto end;
|
2021-01-06 22:01:46 +08:00
|
|
|
if ((pubkey != NULL || privkey != NULL || req != NULL)
|
2020-12-20 00:42:51 +08:00
|
|
|
&& !X509_set_pubkey(x, pubkey != NULL ? pubkey :
|
2021-01-06 22:01:46 +08:00
|
|
|
privkey != NULL ? privkey :
|
2020-12-20 00:42:51 +08:00
|
|
|
X509_REQ_get0_pubkey(req)))
|
|
|
|
goto end;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2020-12-20 00:42:51 +08:00
|
|
|
if (CAfile != NULL) {
|
2021-04-30 22:57:53 +08:00
|
|
|
xca = load_cert_pass(CAfile, CAformat, 1, passin, "CA certificate");
|
2015-01-22 11:40:55 +08:00
|
|
|
if (xca == NULL)
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
2018-03-25 20:00:33 +08:00
|
|
|
out = bio_open_default(outfile, 'w', outformat);
|
|
|
|
if (out == NULL)
|
|
|
|
goto end;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
if (alias)
|
|
|
|
X509_alias_set1(x, (unsigned char *)alias, -1);
|
|
|
|
|
|
|
|
if (clrtrust)
|
|
|
|
X509_trust_clear(x);
|
|
|
|
if (clrreject)
|
|
|
|
X509_reject_clear(x);
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (trust != NULL) {
|
2021-02-26 19:48:43 +08:00
|
|
|
for (i = 0; i < sk_ASN1_OBJECT_num(trust); i++)
|
|
|
|
X509_add1_trust_object(x, sk_ASN1_OBJECT_value(trust, i));
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (reject != NULL) {
|
2021-02-26 19:48:43 +08:00
|
|
|
for (i = 0; i < sk_ASN1_OBJECT_num(reject); i++)
|
|
|
|
X509_add1_reject_object(x, sk_ASN1_OBJECT_value(reject, i));
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
2021-01-09 00:43:13 +08:00
|
|
|
if (clrext && ext_names != NULL)
|
|
|
|
BIO_printf(bio_err, "Warning: Ignoring -ext since -clrext is given\n");
|
|
|
|
for (i = X509_get_ext_count(x) - 1; i >= 0; i--) {
|
|
|
|
X509_EXTENSION *ex = X509_get_ext(x, i);
|
|
|
|
const char *sn = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ex)));
|
|
|
|
|
|
|
|
if (clrext || (ext_names != NULL && strstr(ext_names, sn) == NULL))
|
|
|
|
X509_EXTENSION_free(X509_delete_ext(x, i));
|
|
|
|
}
|
|
|
|
|
|
|
|
issuer_cert = x;
|
|
|
|
if (CAfile != NULL) {
|
|
|
|
issuer_cert = xca;
|
|
|
|
if (sno == NULL)
|
|
|
|
sno = x509_load_serial(CAfile, CAserial, CA_createserial);
|
|
|
|
if (sno == NULL)
|
|
|
|
goto end;
|
2021-10-05 18:54:15 +08:00
|
|
|
if (!x509toreq && !reqfile && !newcert && !self_signed(ctx, x))
|
|
|
|
goto end;
|
2021-08-18 05:13:28 +08:00
|
|
|
} else {
|
|
|
|
if (privkey != NULL && !cert_matches_key(x, privkey))
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Warning: Signature key and public key of cert do not match\n");
|
2021-01-09 00:43:13 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (sno != NULL && !X509_set_serialNumber(x, sno))
|
|
|
|
goto end;
|
|
|
|
|
2021-01-06 22:01:46 +08:00
|
|
|
if (reqfile || newcert || privkey != NULL || CAfile != NULL) {
|
2021-02-26 18:42:49 +08:00
|
|
|
if (!preserve_dates && !set_cert_times(x, NULL, NULL, days))
|
|
|
|
goto end;
|
|
|
|
if (!X509_set_issuer_name(x, X509_get_subject_name(issuer_cert)))
|
|
|
|
goto end;
|
|
|
|
}
|
2021-01-09 00:43:13 +08:00
|
|
|
|
2021-08-27 17:34:23 +08:00
|
|
|
X509V3_set_ctx(&ext_ctx, issuer_cert, x, NULL, NULL, X509V3_CTX_REPLACE);
|
|
|
|
/* prepare fallback for AKID, but only if issuer cert equals subject cert */
|
|
|
|
if (CAfile == NULL) {
|
|
|
|
if (!X509V3_set_issuer_pkey(&ext_ctx, privkey))
|
|
|
|
goto end;
|
|
|
|
}
|
2021-08-25 14:35:40 +08:00
|
|
|
if (extconf != NULL && !x509toreq) {
|
2021-01-09 00:43:13 +08:00
|
|
|
X509V3_set_nconf(&ext_ctx, extconf);
|
|
|
|
if (!X509V3_EXT_add_nconf(extconf, &ext_ctx, extsect, x)) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Error adding extensions from section %s\n", extsect);
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2021-01-09 00:43:13 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* At this point the contents of the certificate x have been finished. */
|
|
|
|
|
2021-02-26 19:48:43 +08:00
|
|
|
pkey = X509_get0_pubkey(x);
|
|
|
|
if ((print_pubkey != 0 || modulus != 0) && pkey == NULL) {
|
|
|
|
BIO_printf(bio_err, "Error getting public key\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2021-02-26 19:48:43 +08:00
|
|
|
}
|
|
|
|
|
2021-01-09 00:43:13 +08:00
|
|
|
if (x509toreq) { /* also works in conjunction with -req */
|
2021-01-06 22:01:46 +08:00
|
|
|
if (privkey == NULL) {
|
2021-08-27 13:11:36 +08:00
|
|
|
BIO_printf(bio_err, "Must specify request signing key using -key\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2020-12-20 00:42:51 +08:00
|
|
|
}
|
2021-01-09 00:43:13 +08:00
|
|
|
if (clrext && ext_copy != EXT_COPY_NONE) {
|
|
|
|
BIO_printf(bio_err, "Must not use -clrext together with -copy_extensions\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2021-01-06 21:44:03 +08:00
|
|
|
}
|
2021-08-25 14:35:40 +08:00
|
|
|
if ((rq = x509_to_req(x, ext_copy, ext_names)) == NULL)
|
|
|
|
goto end;
|
|
|
|
if (extconf != NULL) {
|
|
|
|
X509V3_set_nconf(&ext_ctx, extconf);
|
|
|
|
if (!X509V3_EXT_REQ_add_nconf(extconf, &ext_ctx, extsect, rq)) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Error adding request extensions from section %s\n", extsect);
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2021-08-25 14:35:40 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!do_X509_REQ_sign(rq, privkey, digest, sigopts))
|
2020-12-20 00:42:51 +08:00
|
|
|
goto end;
|
|
|
|
if (!noout) {
|
|
|
|
if (outformat == FORMAT_ASN1) {
|
|
|
|
X509_REQ_print_ex(out, rq, get_nameopt(), X509_FLAG_COMPAT);
|
|
|
|
i = i2d_X509_bio(out, x);
|
|
|
|
} else {
|
|
|
|
i = PEM_write_bio_X509_REQ(out, rq);
|
|
|
|
}
|
|
|
|
if (!i) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Unable to write certificate request\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2020-12-20 00:42:51 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
noout = 1;
|
|
|
|
} else if (CAfile != NULL) {
|
|
|
|
if ((CAkey = load_key(CAkeyfile, CAkeyformat,
|
|
|
|
0, passin, e, "CA private key")) == NULL)
|
|
|
|
goto end;
|
2021-01-09 00:43:13 +08:00
|
|
|
if (!X509_check_private_key(xca, CAkey)) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"CA certificate and CA private key do not match\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2021-01-09 00:43:13 +08:00
|
|
|
}
|
|
|
|
|
2022-09-25 05:59:12 +08:00
|
|
|
if (!do_X509_sign(x, 0, CAkey, digest, sigopts, &ext_ctx))
|
2020-12-20 00:42:51 +08:00
|
|
|
goto end;
|
2022-08-27 02:40:48 +08:00
|
|
|
} else if (privkey != NULL) {
|
|
|
|
if (!do_X509_sign(x, 0, privkey, digest, sigopts, &ext_ctx))
|
|
|
|
goto end;
|
2020-12-20 00:42:51 +08:00
|
|
|
}
|
2016-08-16 22:19:55 +08:00
|
|
|
if (badsig) {
|
2016-08-17 21:10:52 +08:00
|
|
|
const ASN1_BIT_STRING *signature;
|
|
|
|
|
2016-08-16 22:19:55 +08:00
|
|
|
X509_get0_signature(&signature, NULL, x);
|
2016-08-17 19:34:22 +08:00
|
|
|
corrupt_signature(signature);
|
2016-08-16 22:19:55 +08:00
|
|
|
}
|
|
|
|
|
2021-02-26 18:51:43 +08:00
|
|
|
/* Process print options in the given order, as indicated by index i */
|
|
|
|
for (i = 1; i <= num; i++) {
|
2021-02-26 19:48:43 +08:00
|
|
|
if (i == issuer) {
|
|
|
|
print_name(out, "issuer=", X509_get_issuer_name(x));
|
|
|
|
} else if (i == subject) {
|
|
|
|
print_name(out, "subject=", X509_get_subject_name(x));
|
|
|
|
} else if (i == serial) {
|
2021-02-26 18:51:43 +08:00
|
|
|
BIO_printf(out, "serial=");
|
|
|
|
i2a_ASN1_INTEGER(out, X509_get0_serialNumber(x));
|
|
|
|
BIO_printf(out, "\n");
|
2021-02-26 19:48:43 +08:00
|
|
|
} else if (i == next_serial) {
|
2021-02-26 20:26:37 +08:00
|
|
|
ASN1_INTEGER *ser;
|
|
|
|
BIGNUM *bnser = ASN1_INTEGER_to_BN(X509_get0_serialNumber(x), NULL);
|
2021-02-26 18:51:43 +08:00
|
|
|
|
2021-02-26 19:48:43 +08:00
|
|
|
if (bnser == NULL)
|
2021-02-26 18:51:43 +08:00
|
|
|
goto end;
|
2021-02-26 20:26:37 +08:00
|
|
|
if (!BN_add_word(bnser, 1)
|
|
|
|
|| (ser = BN_to_ASN1_INTEGER(bnser, NULL)) == NULL) {
|
|
|
|
BN_free(bnser);
|
2021-02-26 18:51:43 +08:00
|
|
|
goto end;
|
2021-02-26 20:26:37 +08:00
|
|
|
}
|
2021-02-26 18:51:43 +08:00
|
|
|
BN_free(bnser);
|
|
|
|
i2a_ASN1_INTEGER(out, ser);
|
|
|
|
ASN1_INTEGER_free(ser);
|
|
|
|
BIO_puts(out, "\n");
|
2021-02-26 19:48:43 +08:00
|
|
|
} else if (i == email || i == ocsp_uri) {
|
|
|
|
STACK_OF(OPENSSL_STRING) *emlst =
|
|
|
|
i == email ? X509_get1_email(x) : X509_get1_ocsp(x);
|
2021-02-26 18:51:43 +08:00
|
|
|
|
|
|
|
for (j = 0; j < sk_OPENSSL_STRING_num(emlst); j++)
|
|
|
|
BIO_printf(out, "%s\n", sk_OPENSSL_STRING_value(emlst, j));
|
|
|
|
X509_email_free(emlst);
|
2021-02-26 19:48:43 +08:00
|
|
|
} else if (i == aliasout) {
|
|
|
|
unsigned char *alstr = X509_alias_get0(x, NULL);
|
2021-02-26 18:51:43 +08:00
|
|
|
|
|
|
|
if (alstr)
|
|
|
|
BIO_printf(out, "%s\n", alstr);
|
|
|
|
else
|
|
|
|
BIO_puts(out, "<No Alias>\n");
|
2021-02-26 19:48:43 +08:00
|
|
|
} else if (i == subject_hash) {
|
2021-02-26 18:51:43 +08:00
|
|
|
BIO_printf(out, "%08lx\n", X509_subject_name_hash(x));
|
2010-01-13 01:29:34 +08:00
|
|
|
#ifndef OPENSSL_NO_MD5
|
2021-02-26 19:48:43 +08:00
|
|
|
} else if (i == subject_hash_old) {
|
2021-02-26 18:51:43 +08:00
|
|
|
BIO_printf(out, "%08lx\n", X509_subject_name_hash_old(x));
|
2010-01-13 01:29:34 +08:00
|
|
|
#endif
|
2021-02-26 19:48:43 +08:00
|
|
|
} else if (i == issuer_hash) {
|
2021-02-26 18:51:43 +08:00
|
|
|
BIO_printf(out, "%08lx\n", X509_issuer_name_hash(x));
|
2010-01-13 01:29:34 +08:00
|
|
|
#ifndef OPENSSL_NO_MD5
|
2021-02-26 19:48:43 +08:00
|
|
|
} else if (i == issuer_hash_old) {
|
2021-02-26 18:51:43 +08:00
|
|
|
BIO_printf(out, "%08lx\n", X509_issuer_name_hash_old(x));
|
2010-01-13 01:29:34 +08:00
|
|
|
#endif
|
2021-02-26 19:48:43 +08:00
|
|
|
} else if (i == pprint) {
|
2021-02-26 18:51:43 +08:00
|
|
|
BIO_printf(out, "Certificate purposes:\n");
|
2021-02-26 19:48:43 +08:00
|
|
|
for (j = 0; j < X509_PURPOSE_get_count(); j++)
|
|
|
|
purpose_print(out, x, X509_PURPOSE_get0(j));
|
|
|
|
} else if (i == modulus) {
|
2021-02-26 18:51:43 +08:00
|
|
|
BIO_printf(out, "Modulus=");
|
2022-03-25 22:13:16 +08:00
|
|
|
if (EVP_PKEY_is_a(pkey, "RSA") || EVP_PKEY_is_a(pkey, "RSA-PSS")) {
|
2021-06-24 23:47:30 +08:00
|
|
|
BIGNUM *n = NULL;
|
2021-02-26 18:51:43 +08:00
|
|
|
|
|
|
|
/* Every RSA key has an 'n' */
|
|
|
|
EVP_PKEY_get_bn_param(pkey, "n", &n);
|
|
|
|
BN_print(out, n);
|
|
|
|
BN_free(n);
|
|
|
|
} else if (EVP_PKEY_is_a(pkey, "DSA")) {
|
2021-06-25 07:28:26 +08:00
|
|
|
BIGNUM *dsapub = NULL;
|
2021-02-26 18:51:43 +08:00
|
|
|
|
2021-02-26 19:48:43 +08:00
|
|
|
/* Every DSA key has a 'pub' */
|
2021-02-26 18:51:43 +08:00
|
|
|
EVP_PKEY_get_bn_param(pkey, "pub", &dsapub);
|
|
|
|
BN_print(out, dsapub);
|
|
|
|
BN_free(dsapub);
|
|
|
|
} else {
|
|
|
|
BIO_printf(out, "No modulus for this public key type");
|
|
|
|
}
|
|
|
|
BIO_printf(out, "\n");
|
2021-02-26 19:48:43 +08:00
|
|
|
} else if (i == print_pubkey) {
|
2021-02-26 18:51:43 +08:00
|
|
|
PEM_write_bio_PUBKEY(out, pkey);
|
2021-02-26 19:48:43 +08:00
|
|
|
} else if (i == text) {
|
2021-02-26 18:51:43 +08:00
|
|
|
X509_print_ex(out, x, get_nameopt(), certflag);
|
2021-02-26 19:48:43 +08:00
|
|
|
} else if (i == startdate) {
|
2021-02-26 18:51:43 +08:00
|
|
|
BIO_puts(out, "notBefore=");
|
2021-03-02 07:33:29 +08:00
|
|
|
ASN1_TIME_print_ex(out, X509_get0_notBefore(x), dateopt);
|
2021-02-26 18:51:43 +08:00
|
|
|
BIO_puts(out, "\n");
|
2021-02-26 19:48:43 +08:00
|
|
|
} else if (i == enddate) {
|
2021-02-26 18:51:43 +08:00
|
|
|
BIO_puts(out, "notAfter=");
|
2021-03-02 07:33:29 +08:00
|
|
|
ASN1_TIME_print_ex(out, X509_get0_notAfter(x), dateopt);
|
2021-02-26 18:51:43 +08:00
|
|
|
BIO_puts(out, "\n");
|
2021-02-26 19:48:43 +08:00
|
|
|
} else if (i == fingerprint) {
|
2021-02-26 18:51:43 +08:00
|
|
|
unsigned int n;
|
|
|
|
unsigned char md[EVP_MAX_MD_SIZE];
|
2021-04-24 18:40:36 +08:00
|
|
|
const char *fdigname = digest;
|
|
|
|
EVP_MD *fdig;
|
|
|
|
int digres;
|
2021-02-26 18:51:43 +08:00
|
|
|
|
2021-04-24 18:40:36 +08:00
|
|
|
if (fdigname == NULL)
|
|
|
|
fdigname = "SHA1";
|
2021-02-26 18:51:43 +08:00
|
|
|
|
2021-04-24 18:40:36 +08:00
|
|
|
if ((fdig = EVP_MD_fetch(app_get0_libctx(), fdigname,
|
|
|
|
app_get0_propq())) == NULL) {
|
|
|
|
BIO_printf(bio_err, "Unknown digest\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2021-04-24 18:40:36 +08:00
|
|
|
}
|
|
|
|
digres = X509_digest(x, fdig, md, &n);
|
|
|
|
EVP_MD_free(fdig);
|
|
|
|
if (!digres) {
|
2021-02-26 18:51:43 +08:00
|
|
|
BIO_printf(bio_err, "Out of memory\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2021-02-26 18:51:43 +08:00
|
|
|
}
|
2021-04-24 18:40:36 +08:00
|
|
|
|
|
|
|
BIO_printf(out, "%s Fingerprint=", fdigname);
|
2021-02-26 20:26:37 +08:00
|
|
|
for (j = 0; j < (int)n; j++)
|
2021-02-26 18:51:43 +08:00
|
|
|
BIO_printf(out, "%02X%c", md[j], (j + 1 == (int)n) ? '\n' : ':');
|
2021-02-26 19:48:43 +08:00
|
|
|
} else if (i == ocspid) {
|
2021-02-26 18:51:43 +08:00
|
|
|
X509_ocspid_print(out, x);
|
2021-02-26 19:48:43 +08:00
|
|
|
} else if (i == ext) {
|
2021-02-26 18:51:43 +08:00
|
|
|
print_x509v3_exts(out, x, ext_names);
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (checkend) {
|
|
|
|
time_t tcheck = time(NULL) + checkoffset;
|
|
|
|
|
2021-02-26 19:48:43 +08:00
|
|
|
ret = X509_cmp_time(X509_get0_notAfter(x), &tcheck) < 0;
|
|
|
|
if (ret)
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(out, "Certificate will expire\n");
|
2021-02-26 19:48:43 +08:00
|
|
|
else
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(out, "Certificate will not expire\n");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
2021-11-24 07:23:25 +08:00
|
|
|
if (!check_cert_attributes(out, x, checkhost, checkemail, checkip, 1))
|
|
|
|
goto err;
|
2015-01-22 11:40:55 +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 (noout || nocert) {
|
2015-01-22 11:40:55 +08:00
|
|
|
ret = 0;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (outformat == FORMAT_ASN1) {
|
2015-01-22 11:40:55 +08:00
|
|
|
i = i2d_X509_bio(out, x);
|
2017-06-13 01:24:02 +08:00
|
|
|
} else if (outformat == FORMAT_PEM) {
|
2015-01-22 11:40:55 +08:00
|
|
|
if (trustout)
|
|
|
|
i = PEM_write_bio_X509_AUX(out, x);
|
|
|
|
else
|
|
|
|
i = PEM_write_bio_X509(out, x);
|
|
|
|
} else {
|
2020-12-08 02:37:46 +08:00
|
|
|
BIO_printf(bio_err, "Bad output format specified for outfile\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
if (!i) {
|
2020-12-08 02:37:46 +08:00
|
|
|
BIO_printf(bio_err, "Unable to write certificate\n");
|
2021-11-24 07:23:25 +08:00
|
|
|
goto err;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2021-11-24 07:23:25 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
ret = 0;
|
2021-11-24 07:23:25 +08:00
|
|
|
goto end;
|
|
|
|
|
|
|
|
err:
|
|
|
|
ERR_print_errors(bio_err);
|
2020-12-11 00:31:10 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
end:
|
|
|
|
NCONF_free(extconf);
|
|
|
|
BIO_free_all(out);
|
|
|
|
X509_STORE_free(ctx);
|
2019-03-19 07:35:03 +08:00
|
|
|
X509_NAME_free(fsubj);
|
2015-01-22 11:40:55 +08:00
|
|
|
X509_REQ_free(req);
|
|
|
|
X509_free(x);
|
|
|
|
X509_free(xca);
|
2021-01-06 22:01:46 +08:00
|
|
|
EVP_PKEY_free(privkey);
|
2020-12-20 00:42:51 +08:00
|
|
|
EVP_PKEY_free(CAkey);
|
|
|
|
EVP_PKEY_free(pubkey);
|
2015-05-02 02:37:16 +08:00
|
|
|
sk_OPENSSL_STRING_free(sigopts);
|
2020-03-11 06:08:59 +08:00
|
|
|
sk_OPENSSL_STRING_free(vfyopts);
|
2015-01-22 11:40:55 +08:00
|
|
|
X509_REQ_free(rq);
|
|
|
|
ASN1_INTEGER_free(sno);
|
|
|
|
sk_ASN1_OBJECT_pop_free(trust, ASN1_OBJECT_free);
|
|
|
|
sk_ASN1_OBJECT_pop_free(reject, ASN1_OBJECT_free);
|
2016-09-29 05:39:18 +08:00
|
|
|
release_engine(e);
|
2020-08-16 21:25:27 +08:00
|
|
|
clear_free(passin);
|
2017-07-06 08:37:10 +08:00
|
|
|
return ret;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
2017-07-06 08:37:10 +08:00
|
|
|
static ASN1_INTEGER *x509_load_serial(const char *CAfile,
|
|
|
|
const char *serialfile, int create)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
2017-07-06 08:37:10 +08:00
|
|
|
char *buf = NULL;
|
2015-01-22 11:40:55 +08:00
|
|
|
ASN1_INTEGER *bs = NULL;
|
|
|
|
BIGNUM *serial = NULL;
|
2022-05-30 22:53:05 +08:00
|
|
|
int defaultfile = 0, file_exists;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
if (serialfile == NULL) {
|
2018-06-23 06:01:17 +08:00
|
|
|
const char *p = strrchr(CAfile, '.');
|
2017-07-06 08:37:10 +08:00
|
|
|
size_t len = p != NULL ? (size_t)(p - CAfile) : strlen(CAfile);
|
|
|
|
|
|
|
|
buf = app_malloc(len + sizeof(POSTFIX), "serial# buffer");
|
|
|
|
memcpy(buf, CAfile, len);
|
|
|
|
memcpy(buf + len, POSTFIX, sizeof(POSTFIX));
|
|
|
|
serialfile = buf;
|
2022-05-30 22:53:05 +08:00
|
|
|
defaultfile = 1;
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2022-05-30 22:53:05 +08:00
|
|
|
serial = load_serial(serialfile, &file_exists, create || defaultfile, NULL);
|
2015-01-22 11:40:55 +08:00
|
|
|
if (serial == NULL)
|
|
|
|
goto end;
|
|
|
|
|
|
|
|
if (!BN_add_word(serial, 1)) {
|
2020-12-08 02:37:46 +08:00
|
|
|
BIO_printf(bio_err, "Serial number increment failure\n");
|
2015-01-22 11:40:55 +08:00
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
2022-05-30 22:53:05 +08:00
|
|
|
if (file_exists || create)
|
|
|
|
save_serial(serialfile, NULL, serial, &bs);
|
|
|
|
else
|
|
|
|
bs = BN_to_ASN1_INTEGER(serial, NULL);
|
2001-02-19 21:38:32 +08:00
|
|
|
|
2003-04-04 00:33:03 +08:00
|
|
|
end:
|
2015-05-01 22:02:07 +08:00
|
|
|
OPENSSL_free(buf);
|
2015-01-22 11:40:55 +08:00
|
|
|
BN_free(serial);
|
|
|
|
return bs;
|
|
|
|
}
|
2001-02-19 21:38:32 +08:00
|
|
|
|
2015-01-13 06:29:26 +08:00
|
|
|
static int callb(int ok, X509_STORE_CTX *ctx)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
int err;
|
|
|
|
X509 *err_cert;
|
|
|
|
|
|
|
|
/*
|
2019-12-23 22:40:47 +08:00
|
|
|
* It is ok to use a self-signed certificate. This case will catch both
|
|
|
|
* the initial ok == 0 and the final ok == 1 calls to this function.
|
2015-01-22 11:40:55 +08:00
|
|
|
*/
|
|
|
|
err = X509_STORE_CTX_get_error(ctx);
|
|
|
|
if (err == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* BAD we should have gotten an error. Normally if everything worked
|
|
|
|
* X509_STORE_CTX_get_error(ctx) will still be set to
|
|
|
|
* DEPTH_ZERO_SELF_....
|
|
|
|
*/
|
|
|
|
if (ok) {
|
|
|
|
BIO_printf(bio_err,
|
2020-12-08 02:37:46 +08:00
|
|
|
"Error with certificate to be certified - should be self-signed\n");
|
2015-01-22 11:40:55 +08:00
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
err_cert = X509_STORE_CTX_get_current_cert(ctx);
|
2021-02-26 19:48:43 +08:00
|
|
|
print_name(bio_err, "subject=", X509_get_subject_name(err_cert));
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(bio_err,
|
2020-12-08 02:37:46 +08:00
|
|
|
"Error with certificate - error %d at depth %d\n%s\n", err,
|
2015-01-22 11:40:55 +08:00
|
|
|
X509_STORE_CTX_get_error_depth(ctx),
|
|
|
|
X509_verify_cert_error_string(err));
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
1998-12-21 18:52:47 +08:00
|
|
|
|
1999-11-26 08:27:07 +08:00
|
|
|
static int purpose_print(BIO *bio, X509 *cert, X509_PURPOSE *pt)
|
1999-10-13 09:11:56 +08:00
|
|
|
{
|
2015-01-22 11:40:55 +08:00
|
|
|
int id, i, idret;
|
2016-06-08 06:05:05 +08:00
|
|
|
const char *pname;
|
2015-01-22 11:40:55 +08:00
|
|
|
id = X509_PURPOSE_get_id(pt);
|
|
|
|
pname = X509_PURPOSE_get0_name(pt);
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
|
idret = X509_check_purpose(cert, id, i);
|
|
|
|
BIO_printf(bio, "%s%s : ", pname, i ? " CA" : "");
|
|
|
|
if (idret == 1)
|
|
|
|
BIO_printf(bio, "Yes\n");
|
|
|
|
else if (idret == 0)
|
|
|
|
BIO_printf(bio, "No\n");
|
|
|
|
else
|
|
|
|
BIO_printf(bio, "Yes (WARNING code=%d)\n", idret);
|
|
|
|
}
|
|
|
|
return 1;
|
1999-10-13 09:11:56 +08:00
|
|
|
}
|
2017-07-27 15:33:14 +08:00
|
|
|
|
|
|
|
static int parse_ext_names(char *names, const char **result)
|
|
|
|
{
|
|
|
|
char *p, *q;
|
|
|
|
int cnt = 0, len = 0;
|
|
|
|
|
|
|
|
p = q = names;
|
|
|
|
len = strlen(names);
|
|
|
|
|
|
|
|
while (q - names <= len) {
|
|
|
|
if (*q != ',' && *q != '\0') {
|
|
|
|
q++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (p != q) {
|
|
|
|
/* found */
|
|
|
|
if (result != NULL) {
|
|
|
|
result[cnt] = p;
|
|
|
|
*q = '\0';
|
|
|
|
}
|
|
|
|
cnt++;
|
|
|
|
}
|
|
|
|
p = ++q;
|
|
|
|
}
|
|
|
|
|
|
|
|
return cnt;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int print_x509v3_exts(BIO *bio, X509 *x, const char *ext_names)
|
|
|
|
{
|
|
|
|
const STACK_OF(X509_EXTENSION) *exts = NULL;
|
|
|
|
STACK_OF(X509_EXTENSION) *exts2 = NULL;
|
|
|
|
X509_EXTENSION *ext = NULL;
|
|
|
|
ASN1_OBJECT *obj;
|
|
|
|
int i, j, ret = 0, num, nn = 0;
|
|
|
|
const char *sn, **names = NULL;
|
|
|
|
char *tmp_ext_names = NULL;
|
|
|
|
|
|
|
|
exts = X509_get0_extensions(x);
|
|
|
|
if ((num = sk_X509_EXTENSION_num(exts)) <= 0) {
|
2020-12-24 18:25:47 +08:00
|
|
|
BIO_printf(bio_err, "No extensions in certificate\n");
|
2017-07-27 15:33:14 +08:00
|
|
|
ret = 1;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* parse comma separated ext name string */
|
|
|
|
if ((tmp_ext_names = OPENSSL_strdup(ext_names)) == NULL)
|
|
|
|
goto end;
|
|
|
|
if ((nn = parse_ext_names(tmp_ext_names, NULL)) == 0) {
|
|
|
|
BIO_printf(bio, "Invalid extension names: %s\n", ext_names);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if ((names = OPENSSL_malloc(sizeof(char *) * nn)) == NULL)
|
|
|
|
goto end;
|
|
|
|
parse_ext_names(tmp_ext_names, names);
|
|
|
|
|
|
|
|
for (i = 0; i < num; i++) {
|
|
|
|
ext = sk_X509_EXTENSION_value(exts, i);
|
|
|
|
|
|
|
|
/* check if this ext is what we want */
|
|
|
|
obj = X509_EXTENSION_get_object(ext);
|
|
|
|
sn = OBJ_nid2sn(OBJ_obj2nid(obj));
|
|
|
|
if (sn == NULL || strcmp(sn, "UNDEF") == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
for (j = 0; j < nn; j++) {
|
|
|
|
if (strcmp(sn, names[j]) == 0) {
|
|
|
|
/* push the extension into a new stack */
|
|
|
|
if (exts2 == NULL
|
|
|
|
&& (exts2 = sk_X509_EXTENSION_new_null()) == NULL)
|
|
|
|
goto end;
|
|
|
|
if (!sk_X509_EXTENSION_push(exts2, ext))
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!sk_X509_EXTENSION_num(exts2)) {
|
|
|
|
BIO_printf(bio, "No extensions matched with %s\n", ext_names);
|
|
|
|
ret = 1;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = X509V3_extensions_print(bio, NULL, exts2, 0, 0);
|
|
|
|
end:
|
|
|
|
sk_X509_EXTENSION_free(exts2);
|
|
|
|
OPENSSL_free(names);
|
|
|
|
OPENSSL_free(tmp_ext_names);
|
|
|
|
return ret;
|
|
|
|
}
|