2016-05-18 02:18:30 +08:00
|
|
|
/*
|
2018-02-13 20:51:29 +08:00
|
|
|
* Copyright 1995-2018 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 <time.h>
|
|
|
|
#include <string.h>
|
2018-07-06 07:57:22 +08:00
|
|
|
#include <ctype.h>
|
1998-12-21 18:52:47 +08:00
|
|
|
#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/evp.h>
|
|
|
|
#include <openssl/conf.h>
|
|
|
|
#include <openssl/err.h>
|
|
|
|
#include <openssl/asn1.h>
|
|
|
|
#include <openssl/x509.h>
|
|
|
|
#include <openssl/x509v3.h>
|
|
|
|
#include <openssl/objects.h>
|
|
|
|
#include <openssl/pem.h>
|
2005-07-16 20:37:36 +08:00
|
|
|
#include <openssl/bn.h>
|
2018-07-06 07:57:22 +08:00
|
|
|
#include <openssl/lhash.h>
|
2005-07-16 20:37:36 +08:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
2015-01-22 11:40:55 +08:00
|
|
|
# include <openssl/rsa.h>
|
2005-07-16 20:37:36 +08:00
|
|
|
#endif
|
|
|
|
#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
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
#define SECTION "req"
|
1998-12-21 18:52:47 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
#define BITS "default_bits"
|
|
|
|
#define KEYFILE "default_keyfile"
|
|
|
|
#define PROMPT "prompt"
|
|
|
|
#define DISTINGUISHED_NAME "distinguished_name"
|
|
|
|
#define ATTRIBUTES "attributes"
|
|
|
|
#define V3_EXTENSIONS "x509_extensions"
|
|
|
|
#define REQ_EXTENSIONS "req_extensions"
|
|
|
|
#define STRING_MASK "string_mask"
|
|
|
|
#define UTF8_IN "utf8"
|
1998-12-21 18:52:47 +08:00
|
|
|
|
2016-02-03 00:12:45 +08:00
|
|
|
#define DEFAULT_KEY_LENGTH 2048
|
|
|
|
#define MIN_KEY_LENGTH 512
|
1998-12-21 18:52:47 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, char *dn, int mutlirdn,
|
|
|
|
int attribs, unsigned long chtype);
|
2016-08-05 05:52:22 +08:00
|
|
|
static int build_subject(X509_REQ *req, const char *subj, unsigned long chtype,
|
2015-01-22 11:40:55 +08:00
|
|
|
int multirdn);
|
2000-01-06 09:26:48 +08:00
|
|
|
static int prompt_info(X509_REQ *req,
|
2016-08-05 05:52:22 +08:00
|
|
|
STACK_OF(CONF_VALUE) *dn_sk, const char *dn_sect,
|
|
|
|
STACK_OF(CONF_VALUE) *attr_sk, const char *attr_sect,
|
2015-01-22 11:40:55 +08:00
|
|
|
int attribs, unsigned long chtype);
|
2000-01-06 09:26:48 +08:00
|
|
|
static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *sk,
|
2015-01-22 11:40:55 +08:00
|
|
|
STACK_OF(CONF_VALUE) *attr, int attribs,
|
|
|
|
unsigned long chtype);
|
2005-04-06 03:11:19 +08:00
|
|
|
static int add_attribute_object(X509_REQ *req, char *text, const char *def,
|
2015-01-22 11:40:55 +08:00
|
|
|
char *value, int nid, int n_min, int n_max,
|
|
|
|
unsigned long chtype);
|
|
|
|
static int add_DN_object(X509_NAME *n, char *text, const char *def,
|
|
|
|
char *value, int nid, int n_min, int n_max,
|
|
|
|
unsigned long chtype, int mval);
|
2006-05-12 05:39:00 +08:00
|
|
|
static int genpkey_cb(EVP_PKEY_CTX *ctx);
|
2018-04-06 20:42:31 +08:00
|
|
|
static int build_data(char *text, const char *def,
|
|
|
|
char *value, int n_min, int n_max,
|
|
|
|
char *buf, const int buf_size,
|
|
|
|
const char *desc1, const char *desc2
|
|
|
|
);
|
2015-01-22 11:40:55 +08:00
|
|
|
static int req_check_len(int len, int n_min, int n_max);
|
2005-04-06 03:11:19 +08:00
|
|
|
static int check_end(const char *str, const char *end);
|
2017-07-05 12:40:39 +08:00
|
|
|
static int join(char buf[], size_t buf_size, const char *name,
|
|
|
|
const char *tail, const char *desc);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
|
2015-01-22 11:40:55 +08:00
|
|
|
int *pkey_type, long *pkeylen,
|
|
|
|
char **palgnam, ENGINE *keygen_engine);
|
|
|
|
static CONF *req_conf = NULL;
|
2017-12-28 01:29:36 +08:00
|
|
|
static CONF *addext_conf = NULL;
|
2015-01-22 11:40:55 +08:00
|
|
|
static int batch = 0;
|
1998-12-21 18:52:47 +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
|
|
|
typedef enum OPTION_choice {
|
|
|
|
OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
|
|
|
|
OPT_INFORM, OPT_OUTFORM, OPT_ENGINE, OPT_KEYGEN_ENGINE, OPT_KEY,
|
|
|
|
OPT_PUBKEY, OPT_NEW, OPT_CONFIG, OPT_KEYFORM, OPT_IN, OPT_OUT,
|
2017-07-05 22:58:48 +08:00
|
|
|
OPT_KEYOUT, OPT_PASSIN, OPT_PASSOUT, OPT_NEWKEY,
|
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_PKEYOPT, OPT_SIGOPT, OPT_BATCH, OPT_NEWHDR, OPT_MODULUS,
|
|
|
|
OPT_VERIFY, OPT_NODES, OPT_NOOUT, OPT_VERBOSE, OPT_UTF8,
|
2015-06-15 12:55:34 +08:00
|
|
|
OPT_NAMEOPT, OPT_REQOPT, OPT_SUBJ, OPT_SUBJECT, OPT_TEXT, OPT_X509,
|
2017-12-28 01:29:36 +08:00
|
|
|
OPT_MULTIVALUE_RDN, OPT_DAYS, OPT_SET_SERIAL, OPT_ADDEXT, OPT_EXTENSIONS,
|
2017-07-05 22:58:48 +08:00
|
|
|
OPT_REQEXTS, OPT_PRECERT, OPT_MD,
|
|
|
|
OPT_R_ENUM
|
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 req_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
|
|
|
{"help", OPT_HELP, '-', "Display this summary"},
|
|
|
|
{"inform", OPT_INFORM, 'F', "Input format - DER or PEM"},
|
|
|
|
{"outform", OPT_OUTFORM, 'F', "Output format - DER or PEM"},
|
|
|
|
{"in", OPT_IN, '<', "Input file"},
|
|
|
|
{"out", OPT_OUT, '>', "Output file"},
|
2016-02-11 23:51:31 +08:00
|
|
|
{"key", OPT_KEY, 's', "Private key to use"},
|
|
|
|
{"keyform", OPT_KEYFORM, 'f', "Key file format"},
|
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
|
|
|
{"pubkey", OPT_PUBKEY, '-', "Output public key"},
|
|
|
|
{"new", OPT_NEW, '-', "New request"},
|
|
|
|
{"config", OPT_CONFIG, '<', "Request template file"},
|
|
|
|
{"keyout", OPT_KEYOUT, '>', "File to send the key to"},
|
|
|
|
{"passin", OPT_PASSIN, 's', "Private key password source"},
|
2016-02-19 01:23:27 +08:00
|
|
|
{"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
|
2017-07-05 22:58:48 +08:00
|
|
|
OPT_R_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
|
|
|
{"newkey", OPT_NEWKEY, 's', "Specify as type:bits"},
|
2016-02-19 01:23:27 +08:00
|
|
|
{"pkeyopt", OPT_PKEYOPT, 's', "Public key options as opt:value"},
|
|
|
|
{"sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form"},
|
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
|
|
|
{"batch", OPT_BATCH, '-',
|
|
|
|
"Do not ask anything during request generation"},
|
|
|
|
{"newhdr", OPT_NEWHDR, '-', "Output \"NEW\" in the header lines"},
|
|
|
|
{"modulus", OPT_MODULUS, '-', "RSA modulus"},
|
|
|
|
{"verify", OPT_VERIFY, '-', "Verify signature on REQ"},
|
|
|
|
{"nodes", OPT_NODES, '-', "Don't encrypt the output key"},
|
|
|
|
{"noout", OPT_NOOUT, '-', "Do not output REQ"},
|
2016-02-19 01:23:27 +08:00
|
|
|
{"verbose", OPT_VERBOSE, '-', "Verbose output"},
|
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
|
|
|
{"utf8", OPT_UTF8, '-', "Input characters are UTF8 (default ASCII)"},
|
|
|
|
{"nameopt", OPT_NAMEOPT, 's', "Various certificate name options"},
|
|
|
|
{"reqopt", OPT_REQOPT, 's', "Various request text options"},
|
|
|
|
{"text", OPT_TEXT, '-', "Text form of request"},
|
|
|
|
{"x509", OPT_X509, '-',
|
|
|
|
"Output a x509 structure instead of a cert request"},
|
|
|
|
{OPT_MORE_STR, 1, 1, "(Required by some CA's)"},
|
2015-06-15 12:55:34 +08:00
|
|
|
{"subj", OPT_SUBJ, 's', "Set or modify request subject"},
|
|
|
|
{"subject", OPT_SUBJECT, '-', "Output the request's subject"},
|
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
|
|
|
{"multivalue-rdn", OPT_MULTIVALUE_RDN, '-',
|
|
|
|
"Enable support for multivalued RDNs"},
|
|
|
|
{"days", OPT_DAYS, 'p', "Number of days cert is valid for"},
|
2017-02-05 23:24:54 +08:00
|
|
|
{"set_serial", OPT_SET_SERIAL, 's', "Serial number to use"},
|
2017-12-28 01:29:36 +08:00
|
|
|
{"addext", OPT_ADDEXT, 's',
|
|
|
|
"Additional cert extension key=value pair (may be given more than once)"},
|
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
|
|
|
{"extensions", OPT_EXTENSIONS, 's',
|
|
|
|
"Cert extension section (override value in config file)"},
|
|
|
|
{"reqexts", OPT_REQEXTS, 's',
|
|
|
|
"Request extension section (override value in config file)"},
|
2017-01-14 03:10:26 +08:00
|
|
|
{"precert", OPT_PRECERT, '-', "Add a poison extension (implies -new)"},
|
2015-05-16 01:50:38 +08:00
|
|
|
{"", OPT_MD, '-', "Any supported 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
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
|
|
|
{"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
|
2016-02-19 01:23:27 +08:00
|
|
|
{"keygen_engine", OPT_KEYGEN_ENGINE, 's',
|
|
|
|
"Specify engine to be used for key generation operations"},
|
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
|
|
|
|
{NULL}
|
|
|
|
};
|
2000-02-11 17:47:18 +08:00
|
|
|
|
2018-07-06 07:57:22 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* An LHASH of strings, where each string is an extension name.
|
|
|
|
*/
|
|
|
|
static unsigned long ext_name_hash(const OPENSSL_STRING *a)
|
|
|
|
{
|
|
|
|
return OPENSSL_LH_strhash((const char *)a);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ext_name_cmp(const OPENSSL_STRING *a, const OPENSSL_STRING *b)
|
|
|
|
{
|
|
|
|
return strcmp((const char *)a, (const char *)b);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void exts_cleanup(OPENSSL_STRING *x)
|
|
|
|
{
|
|
|
|
OPENSSL_free((char *)x);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Is the |kv| key already duplicated? This is remarkably tricky to get
|
|
|
|
* right. Return 0 if unique, -1 on runtime error; 1 if found or a syntax
|
|
|
|
* error.
|
|
|
|
*/
|
|
|
|
static int duplicated(LHASH_OF(OPENSSL_STRING) *addexts, char *kv)
|
|
|
|
{
|
|
|
|
char *p;
|
2018-07-09 00:57:30 +08:00
|
|
|
size_t off;
|
2018-07-06 07:57:22 +08:00
|
|
|
|
|
|
|
/* Check syntax. */
|
|
|
|
/* Skip leading whitespace, make a copy. */
|
|
|
|
while (*kv && isspace(*kv))
|
|
|
|
if (*++kv == '\0')
|
|
|
|
return 1;
|
2018-07-09 00:57:30 +08:00
|
|
|
if ((p = strchr(kv, '=')) == NULL)
|
|
|
|
return 1;
|
|
|
|
off = p - kv;
|
2018-07-06 07:57:22 +08:00
|
|
|
if ((kv = OPENSSL_strdup(kv)) == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* Skip trailing space before the equal sign. */
|
2018-07-09 00:57:30 +08:00
|
|
|
for (p = kv + off; p > kv; --p)
|
|
|
|
if (!isspace(p[-1]))
|
2018-07-06 07:57:22 +08:00
|
|
|
break;
|
|
|
|
if (p == kv) {
|
|
|
|
OPENSSL_free(kv);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
*p = '\0';
|
|
|
|
|
2018-07-09 00:57:30 +08:00
|
|
|
/* Finally have a clean "key"; see if it's there [by attempt to add it]. */
|
|
|
|
if ((p = (char *)lh_OPENSSL_STRING_insert(addexts, (OPENSSL_STRING*)kv))
|
|
|
|
!= NULL || lh_OPENSSL_STRING_error(addexts)) {
|
|
|
|
OPENSSL_free(p != NULL ? p : kv);
|
|
|
|
return -1;
|
2018-07-06 07:57:22 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return 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 req_main(int argc, char **argv)
|
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
|
|
|
ASN1_INTEGER *serial = NULL;
|
|
|
|
BIO *in = NULL, *out = NULL;
|
2015-01-22 11:40:55 +08:00
|
|
|
ENGINE *e = NULL, *gen_eng = 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
|
|
|
EVP_PKEY *pkey = NULL;
|
2015-01-22 11:40:55 +08:00
|
|
|
EVP_PKEY_CTX *genctx = NULL;
|
|
|
|
STACK_OF(OPENSSL_STRING) *pkeyopts = NULL, *sigopts = NULL;
|
2018-07-06 07:57:22 +08:00
|
|
|
LHASH_OF(OPENSSL_STRING) *addexts = 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
|
|
|
X509 *x509ss = NULL;
|
|
|
|
X509_REQ *req = NULL;
|
2015-01-22 11:40:55 +08:00
|
|
|
const EVP_CIPHER *cipher = NULL;
|
|
|
|
const EVP_MD *md_alg = NULL, *digest = NULL;
|
2017-12-28 01:29:36 +08:00
|
|
|
BIO *addext_bio = NULL;
|
2015-04-26 03:41:29 +08:00
|
|
|
char *extensions = NULL, *infile = NULL;
|
2017-07-05 22:58:48 +08:00
|
|
|
char *outfile = NULL, *keyfile = 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 *keyalgstr = NULL, *p, *prog, *passargin = NULL, *passargout = NULL;
|
2016-03-07 09:01:20 +08:00
|
|
|
char *passin = NULL, *passout = NULL;
|
|
|
|
char *nofree_passin = NULL, *nofree_passout = NULL;
|
|
|
|
char *req_exts = NULL, *subj = NULL;
|
2015-05-29 01:52:55 +08:00
|
|
|
char *template = default_config_file, *keyout = 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
|
|
|
const char *keyalg = NULL;
|
|
|
|
OPTION_CHOICE o;
|
2017-11-21 22:37:23 +08:00
|
|
|
int ret = 1, x509 = 0, days = 0, i = 0, newreq = 0, verbose = 0;
|
2015-05-02 22:01:33 +08:00
|
|
|
int pkey_type = -1, private = 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 informat = FORMAT_PEM, outformat = FORMAT_PEM, keyform = FORMAT_PEM;
|
|
|
|
int modulus = 0, multirdn = 0, verify = 0, noout = 0, text = 0;
|
2017-01-14 03:10:26 +08:00
|
|
|
int nodes = 0, newhdr = 0, subject = 0, pubkey = 0, precert = 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
|
|
|
long newkey = -1;
|
2017-04-26 00:25:42 +08:00
|
|
|
unsigned long chtype = MBSTRING_ASC, reqflag = 0;
|
1998-12-21 18:52:47 +08:00
|
|
|
|
2001-02-20 00:06:34 +08:00
|
|
|
#ifndef OPENSSL_NO_DES
|
2015-01-22 11:40:55 +08:00
|
|
|
cipher = EVP_des_ede3_cbc();
|
1998-12-21 18:52:47 +08:00
|
|
|
#endif
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
|
|
|
|
prog = opt_init(argc, argv, req_options);
|
|
|
|
while ((o = opt_next()) != OPT_EOF) {
|
|
|
|
switch (o) {
|
|
|
|
case OPT_EOF:
|
|
|
|
case OPT_ERR:
|
|
|
|
opthelp:
|
|
|
|
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
|
|
|
|
goto end;
|
|
|
|
case OPT_HELP:
|
|
|
|
opt_help(req_options);
|
|
|
|
ret = 0;
|
|
|
|
goto end;
|
|
|
|
case OPT_INFORM:
|
|
|
|
if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &informat))
|
|
|
|
goto opthelp;
|
|
|
|
break;
|
|
|
|
case OPT_OUTFORM:
|
|
|
|
if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &outformat))
|
|
|
|
goto opthelp;
|
|
|
|
break;
|
|
|
|
case OPT_ENGINE:
|
2016-02-11 23:51:31 +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_KEYGEN_ENGINE:
|
2015-04-26 03:41:29 +08:00
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
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
|
|
|
gen_eng = ENGINE_by_id(opt_arg());
|
2015-01-22 11:40:55 +08:00
|
|
|
if (gen_eng == NULL) {
|
|
|
|
BIO_printf(bio_err, "Can't find keygen engine %s\n", *argv);
|
2015-04-26 03:41:29 +08:00
|
|
|
goto opthelp;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2003-01-31 01:39:26 +08:00
|
|
|
#endif
|
2015-04-26 03:41:29 +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_KEY:
|
|
|
|
keyfile = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_PUBKEY:
|
2015-01-22 11:40:55 +08:00
|
|
|
pubkey = 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_NEW:
|
2015-01-22 11:40:55 +08:00
|
|
|
newreq = 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_CONFIG:
|
|
|
|
template = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_KEYFORM:
|
2016-02-11 23:51:31 +08:00
|
|
|
if (!opt_format(opt_arg(), OPT_FMT_ANY, &keyform))
|
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_OUT:
|
|
|
|
outfile = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_KEYOUT:
|
|
|
|
keyout = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_PASSIN:
|
|
|
|
passargin = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_PASSOUT:
|
|
|
|
passargout = opt_arg();
|
|
|
|
break;
|
2017-07-05 22:58:48 +08:00
|
|
|
case OPT_R_CASES:
|
|
|
|
if (!opt_rand(o))
|
|
|
|
goto end;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
break;
|
|
|
|
case OPT_NEWKEY:
|
|
|
|
keyalg = opt_arg();
|
2015-01-22 11:40:55 +08:00
|
|
|
newreq = 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_PKEYOPT:
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!pkeyopts)
|
|
|
|
pkeyopts = 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 (!pkeyopts || !sk_OPENSSL_STRING_push(pkeyopts, opt_arg()))
|
|
|
|
goto opthelp;
|
|
|
|
break;
|
|
|
|
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;
|
|
|
|
case OPT_BATCH:
|
2015-01-22 11:40:55 +08:00
|
|
|
batch = 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_NEWHDR:
|
2015-01-22 11:40:55 +08:00
|
|
|
newhdr = 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_MODULUS:
|
2015-01-22 11:40:55 +08:00
|
|
|
modulus = 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_VERIFY:
|
2015-01-22 11:40:55 +08:00
|
|
|
verify = 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_NODES:
|
2015-01-22 11:40:55 +08:00
|
|
|
nodes = 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_NOOUT:
|
2015-01-22 11:40:55 +08:00
|
|
|
noout = 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_VERBOSE:
|
2015-01-22 11:40:55 +08:00
|
|
|
verbose = 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_UTF8:
|
2015-01-22 11:40:55 +08:00
|
|
|
chtype = MBSTRING_UTF8;
|
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_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_REQOPT:
|
|
|
|
if (!set_cert_ex(&reqflag, opt_arg()))
|
|
|
|
goto opthelp;
|
|
|
|
break;
|
|
|
|
case OPT_TEXT:
|
2015-01-22 11:40:55 +08:00
|
|
|
text = 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_X509:
|
2015-01-22 11:40:55 +08:00
|
|
|
x509 = 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_DAYS:
|
|
|
|
days = atoi(opt_arg());
|
|
|
|
break;
|
|
|
|
case OPT_SET_SERIAL:
|
2016-08-24 18:22:47 +08:00
|
|
|
if (serial != 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
|
|
|
serial = s2i_ASN1_INTEGER(NULL, opt_arg());
|
|
|
|
if (serial == NULL)
|
|
|
|
goto opthelp;
|
|
|
|
break;
|
|
|
|
case OPT_SUBJECT:
|
2015-07-07 17:13:20 +08:00
|
|
|
subject = 1;
|
2015-06-15 12:55:34 +08:00
|
|
|
break;
|
|
|
|
case OPT_SUBJ:
|
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
|
|
|
subj = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_MULTIVALUE_RDN:
|
2015-01-22 11:40:55 +08:00
|
|
|
multirdn = 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;
|
2017-12-28 01:29:36 +08:00
|
|
|
case OPT_ADDEXT:
|
2018-07-06 07:57:22 +08:00
|
|
|
p = opt_arg();
|
|
|
|
if (addexts == NULL) {
|
|
|
|
addexts = lh_OPENSSL_STRING_new(ext_name_hash, ext_name_cmp);
|
2017-12-28 01:29:36 +08:00
|
|
|
addext_bio = BIO_new(BIO_s_mem());
|
2018-07-06 07:57:22 +08:00
|
|
|
if (addexts == NULL || addext_bio == NULL)
|
|
|
|
goto end;
|
2017-12-28 01:29:36 +08:00
|
|
|
}
|
2018-07-06 07:57:22 +08:00
|
|
|
i = duplicated(addexts, p);
|
|
|
|
if (i == 1)
|
|
|
|
goto opthelp;
|
|
|
|
if (i < 0 || BIO_printf(addext_bio, "%s\n", opt_arg()) < 0)
|
2017-12-28 01:29:36 +08:00
|
|
|
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:
|
|
|
|
extensions = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_REQEXTS:
|
|
|
|
req_exts = opt_arg();
|
|
|
|
break;
|
2016-03-11 03:15:13 +08:00
|
|
|
case OPT_PRECERT:
|
2017-01-14 03:10:26 +08:00
|
|
|
newreq = precert = 1;
|
2016-03-11 03:15:13 +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_MD:
|
|
|
|
if (!opt_md(opt_unknown(), &md_alg))
|
|
|
|
goto opthelp;
|
2015-01-22 11:40:55 +08:00
|
|
|
digest = md_alg;
|
|
|
|
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
|
|
|
argc = opt_num_rest();
|
2016-02-15 03:45:02 +08:00
|
|
|
if (argc != 0)
|
|
|
|
goto opthelp;
|
2015-07-07 17:13:20 +08:00
|
|
|
|
2017-11-07 20:04:21 +08:00
|
|
|
if (days && !x509)
|
2017-11-21 22:37:23 +08:00
|
|
|
BIO_printf(bio_err, "Ignoring -days; not generating a certificate\n");
|
2017-05-11 20:25:17 +08:00
|
|
|
if (x509 && infile == NULL)
|
|
|
|
newreq = 1;
|
|
|
|
|
2016-06-29 04:51:51 +08:00
|
|
|
/* TODO: simplify this as pkey is still always NULL here */
|
2015-05-02 22:01:33 +08:00
|
|
|
private = newreq && (pkey == NULL) ? 1 : 0;
|
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 (!app_passwd(passargin, passargout, &passin, &passout)) {
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(bio_err, "Error getting passwords\n");
|
|
|
|
goto end;
|
|
|
|
}
|
1998-12-21 18:52:47 +08:00
|
|
|
|
2015-05-29 01:52:55 +08:00
|
|
|
if (verbose)
|
|
|
|
BIO_printf(bio_err, "Using configuration from %s\n", template);
|
|
|
|
req_conf = app_load_config(template);
|
2017-12-28 01:29:36 +08:00
|
|
|
if (addext_bio) {
|
|
|
|
if (verbose)
|
|
|
|
BIO_printf(bio_err,
|
2018-03-30 04:10:26 +08:00
|
|
|
"Using additional configuration from command line\n");
|
2017-12-28 01:29:36 +08:00
|
|
|
addext_conf = app_load_config_bio(addext_bio, NULL);
|
|
|
|
}
|
2016-05-16 01:43:03 +08:00
|
|
|
if (template != default_config_file && !app_load_modules(req_conf))
|
2015-05-29 14:07:10 +08:00
|
|
|
goto end;
|
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
if (req_conf != NULL) {
|
|
|
|
p = NCONF_get_string(req_conf, NULL, "oid_file");
|
|
|
|
if (p == NULL)
|
|
|
|
ERR_clear_error();
|
|
|
|
if (p != NULL) {
|
|
|
|
BIO *oid_bio;
|
|
|
|
|
|
|
|
oid_bio = BIO_new_file(p, "r");
|
|
|
|
if (oid_bio == NULL) {
|
2015-01-05 19:30:03 +08:00
|
|
|
/*-
|
|
|
|
BIO_printf(bio_err,"problems opening %s for extra oid's\n",p);
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
*/
|
2015-01-22 11:40:55 +08:00
|
|
|
} else {
|
|
|
|
OBJ_create_objects(oid_bio);
|
|
|
|
BIO_free(oid_bio);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
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 (!add_oid_section(req_conf))
|
2015-01-22 11:40:55 +08:00
|
|
|
goto end;
|
|
|
|
|
|
|
|
if (md_alg == NULL) {
|
|
|
|
p = NCONF_get_string(req_conf, SECTION, "default_md");
|
2017-06-13 01:24:02 +08:00
|
|
|
if (p == NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
ERR_clear_error();
|
2017-06-13 01:24:02 +08:00
|
|
|
} else {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
if (!opt_md(p, &md_alg))
|
|
|
|
goto opthelp;
|
|
|
|
digest = md_alg;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (extensions == NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
extensions = NCONF_get_string(req_conf, SECTION, V3_EXTENSIONS);
|
2017-06-13 01:24:02 +08:00
|
|
|
if (extensions == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
ERR_clear_error();
|
|
|
|
}
|
2017-06-13 01:24:02 +08:00
|
|
|
if (extensions != NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
/* Check syntax of file */
|
|
|
|
X509V3_CTX ctx;
|
|
|
|
X509V3_set_ctx_test(&ctx);
|
|
|
|
X509V3_set_nconf(&ctx, req_conf);
|
|
|
|
if (!X509V3_EXT_add_nconf(req_conf, &ctx, extensions, NULL)) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Error Loading extension section %s\n", extensions);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
2017-12-28 01:29:36 +08:00
|
|
|
if (addext_conf != NULL) {
|
|
|
|
/* Check syntax of command line extensions */
|
|
|
|
X509V3_CTX ctx;
|
|
|
|
X509V3_set_ctx_test(&ctx);
|
|
|
|
X509V3_set_nconf(&ctx, addext_conf);
|
|
|
|
if (!X509V3_EXT_add_nconf(addext_conf, &ctx, "default", NULL)) {
|
|
|
|
BIO_printf(bio_err, "Error Loading command line extensions\n");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2016-03-07 09:01:20 +08:00
|
|
|
if (passin == NULL) {
|
|
|
|
passin = nofree_passin =
|
|
|
|
NCONF_get_string(req_conf, SECTION, "input_password");
|
|
|
|
if (passin == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
ERR_clear_error();
|
|
|
|
}
|
|
|
|
|
2016-03-07 09:01:20 +08:00
|
|
|
if (passout == NULL) {
|
|
|
|
passout = nofree_passout =
|
|
|
|
NCONF_get_string(req_conf, SECTION, "output_password");
|
|
|
|
if (passout == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
ERR_clear_error();
|
|
|
|
}
|
|
|
|
|
|
|
|
p = NCONF_get_string(req_conf, SECTION, STRING_MASK);
|
2017-06-13 01:24:02 +08:00
|
|
|
if (p == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
ERR_clear_error();
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (p != NULL && !ASN1_STRING_set_default_mask_asc(p)) {
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(bio_err, "Invalid global string mask setting %s\n", p);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (chtype != MBSTRING_UTF8) {
|
|
|
|
p = NCONF_get_string(req_conf, SECTION, UTF8_IN);
|
2017-06-13 01:24:02 +08:00
|
|
|
if (p == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
ERR_clear_error();
|
2015-05-07 02:56:14 +08:00
|
|
|
else if (strcmp(p, "yes") == 0)
|
2015-01-22 11:40:55 +08:00
|
|
|
chtype = MBSTRING_UTF8;
|
|
|
|
}
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (req_exts == NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
req_exts = NCONF_get_string(req_conf, SECTION, REQ_EXTENSIONS);
|
2017-06-13 01:24:02 +08:00
|
|
|
if (req_exts == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
ERR_clear_error();
|
|
|
|
}
|
2017-06-13 01:24:02 +08:00
|
|
|
if (req_exts != NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
/* Check syntax of file */
|
|
|
|
X509V3_CTX ctx;
|
|
|
|
X509V3_set_ctx_test(&ctx);
|
|
|
|
X509V3_set_nconf(&ctx, req_conf);
|
|
|
|
if (!X509V3_EXT_add_nconf(req_conf, &ctx, req_exts, NULL)) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Error Loading request extension section %s\n",
|
|
|
|
req_exts);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
1998-12-21 18:52:47 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
if (keyfile != 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
|
|
|
pkey = load_key(keyfile, keyform, 0, passin, e, "Private Key");
|
2017-06-13 01:24:02 +08:00
|
|
|
if (pkey == 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
|
|
|
/* load_key() has already printed an appropriate message */
|
2015-01-22 11:40:55 +08:00
|
|
|
goto end;
|
|
|
|
} else {
|
2017-07-05 22:58:48 +08:00
|
|
|
app_RAND_load_conf(req_conf, SECTION);
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (newreq && (pkey == NULL)) {
|
2017-07-05 22:58:48 +08:00
|
|
|
app_RAND_load_conf(req_conf, SECTION);
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
if (!NCONF_get_number(req_conf, SECTION, BITS, &newkey)) {
|
|
|
|
newkey = DEFAULT_KEY_LENGTH;
|
|
|
|
}
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (keyalg != 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
|
|
|
genctx = set_keygen_ctx(keyalg, &pkey_type, &newkey,
|
2015-01-22 11:40:55 +08:00
|
|
|
&keyalgstr, gen_eng);
|
2017-06-13 01:24:02 +08:00
|
|
|
if (genctx == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (newkey < MIN_KEY_LENGTH
|
|
|
|
&& (pkey_type == EVP_PKEY_RSA || pkey_type == EVP_PKEY_DSA)) {
|
|
|
|
BIO_printf(bio_err, "private key length is too short,\n");
|
|
|
|
BIO_printf(bio_err, "it needs to be at least %d bits, not %ld\n",
|
|
|
|
MIN_KEY_LENGTH, newkey);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
2018-05-31 07:42:39 +08:00
|
|
|
if (pkey_type == EVP_PKEY_RSA && newkey > OPENSSL_RSA_MAX_MODULUS_BITS)
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Warning: It is not recommended to use more than %d bit for RSA keys.\n"
|
|
|
|
" Your key size is %ld! Larger key size may behave not as expected.\n",
|
|
|
|
OPENSSL_RSA_MAX_MODULUS_BITS, newkey);
|
|
|
|
|
2018-06-06 16:51:12 +08:00
|
|
|
#ifndef OPENSSL_NO_DSA
|
2018-05-31 07:42:39 +08:00
|
|
|
if (pkey_type == EVP_PKEY_DSA && newkey > OPENSSL_DSA_MAX_MODULUS_BITS)
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Warning: It is not recommended to use more than %d bit for DSA keys.\n"
|
|
|
|
" Your key size is %ld! Larger key size may behave not as expected.\n",
|
|
|
|
OPENSSL_DSA_MAX_MODULUS_BITS, newkey);
|
2018-06-06 16:51:12 +08:00
|
|
|
#endif
|
2018-05-31 07:42:39 +08:00
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (genctx == 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
|
|
|
genctx = set_keygen_ctx(NULL, &pkey_type, &newkey,
|
2015-01-22 11:40:55 +08:00
|
|
|
&keyalgstr, gen_eng);
|
|
|
|
if (!genctx)
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (pkeyopts != NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
char *genopt;
|
|
|
|
for (i = 0; i < sk_OPENSSL_STRING_num(pkeyopts); i++) {
|
|
|
|
genopt = sk_OPENSSL_STRING_value(pkeyopts, i);
|
|
|
|
if (pkey_ctrl_string(genctx, genopt) <= 0) {
|
|
|
|
BIO_printf(bio_err, "parameter error \"%s\"\n", genopt);
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-06-01 17:48:36 +08:00
|
|
|
if (pkey_type == EVP_PKEY_EC) {
|
|
|
|
BIO_printf(bio_err, "Generating an EC private key\n");
|
|
|
|
} else {
|
2018-09-03 19:17:03 +08:00
|
|
|
BIO_printf(bio_err, "Generating a %s private key\n", keyalgstr);
|
2016-06-01 17:48:36 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
EVP_PKEY_CTX_set_cb(genctx, genpkey_cb);
|
|
|
|
EVP_PKEY_CTX_set_app_data(genctx, bio_err);
|
|
|
|
|
|
|
|
if (EVP_PKEY_keygen(genctx, &pkey) <= 0) {
|
|
|
|
BIO_puts(bio_err, "Error Generating Key\n");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
EVP_PKEY_CTX_free(genctx);
|
|
|
|
genctx = NULL;
|
|
|
|
|
|
|
|
if (keyout == NULL) {
|
|
|
|
keyout = NCONF_get_string(req_conf, SECTION, KEYFILE);
|
|
|
|
if (keyout == NULL)
|
|
|
|
ERR_clear_error();
|
|
|
|
}
|
|
|
|
|
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 (keyout == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(bio_err, "writing new private key to stdout\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
|
|
|
else
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(bio_err, "writing new private key to '%s'\n", keyout);
|
2015-09-04 18:49:06 +08:00
|
|
|
out = bio_open_owner(keyout, outformat, private);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
if (out == NULL)
|
|
|
|
goto end;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
p = NCONF_get_string(req_conf, SECTION, "encrypt_rsa_key");
|
|
|
|
if (p == NULL) {
|
|
|
|
ERR_clear_error();
|
|
|
|
p = NCONF_get_string(req_conf, SECTION, "encrypt_key");
|
|
|
|
if (p == NULL)
|
|
|
|
ERR_clear_error();
|
|
|
|
}
|
|
|
|
if ((p != NULL) && (strcmp(p, "no") == 0))
|
|
|
|
cipher = NULL;
|
|
|
|
if (nodes)
|
|
|
|
cipher = NULL;
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
loop:
|
2015-05-02 22:01:33 +08:00
|
|
|
assert(private);
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!PEM_write_bio_PrivateKey(out, pkey, cipher,
|
|
|
|
NULL, 0, NULL, passout)) {
|
|
|
|
if ((ERR_GET_REASON(ERR_peek_error()) ==
|
|
|
|
PEM_R_PROBLEMS_GETTING_PASSWORD) && (i < 3)) {
|
|
|
|
ERR_clear_error();
|
|
|
|
i++;
|
|
|
|
goto loop;
|
|
|
|
}
|
|
|
|
goto end;
|
|
|
|
}
|
2015-05-26 04:18:07 +08:00
|
|
|
BIO_free(out);
|
2015-05-29 15:14:03 +08:00
|
|
|
out = NULL;
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(bio_err, "-----\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!newreq) {
|
2015-09-04 18:49:06 +08:00
|
|
|
in = bio_open_default(infile, 'r', 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
|
|
|
if (in == NULL)
|
|
|
|
goto end;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
if (informat == FORMAT_ASN1)
|
|
|
|
req = d2i_X509_REQ_bio(in, 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
|
|
|
else
|
2015-01-22 11:40:55 +08:00
|
|
|
req = PEM_read_bio_X509_REQ(in, NULL, NULL, NULL);
|
|
|
|
if (req == NULL) {
|
|
|
|
BIO_printf(bio_err, "unable to load X509 request\n");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-11 20:25:17 +08:00
|
|
|
if (newreq || x509) {
|
2015-01-22 11:40:55 +08:00
|
|
|
if (pkey == NULL) {
|
|
|
|
BIO_printf(bio_err, "you need to specify a private key\n");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (req == NULL) {
|
|
|
|
req = X509_REQ_new();
|
|
|
|
if (req == NULL) {
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
i = make_REQ(req, pkey, subj, multirdn, !x509, chtype);
|
|
|
|
subj = NULL; /* done processing '-subj' option */
|
|
|
|
if (!i) {
|
|
|
|
BIO_printf(bio_err, "problems making Certificate Request\n");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (x509) {
|
|
|
|
EVP_PKEY *tmppkey;
|
|
|
|
X509V3_CTX ext_ctx;
|
|
|
|
if ((x509ss = X509_new()) == NULL)
|
|
|
|
goto end;
|
|
|
|
|
|
|
|
/* Set version to V3 */
|
2017-12-28 01:29:36 +08:00
|
|
|
if ((extensions != NULL || addext_conf != NULL)
|
|
|
|
&& !X509_set_version(x509ss, 2))
|
2015-01-22 11:40:55 +08:00
|
|
|
goto end;
|
2017-06-13 01:24:02 +08:00
|
|
|
if (serial != NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!X509_set_serialNumber(x509ss, serial))
|
|
|
|
goto end;
|
|
|
|
} else {
|
|
|
|
if (!rand_serial(NULL, X509_get_serialNumber(x509ss)))
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!X509_set_issuer_name(x509ss, X509_REQ_get_subject_name(req)))
|
|
|
|
goto end;
|
2017-11-21 22:37:23 +08:00
|
|
|
if (days == 0) {
|
|
|
|
/* set default days if it's not specified */
|
|
|
|
days = 30;
|
|
|
|
}
|
2016-08-19 23:21:21 +08:00
|
|
|
if (!set_cert_times(x509ss, NULL, NULL, days))
|
2015-01-22 11:40:55 +08:00
|
|
|
goto end;
|
|
|
|
if (!X509_set_subject_name
|
|
|
|
(x509ss, X509_REQ_get_subject_name(req)))
|
|
|
|
goto end;
|
2016-04-04 05:37:32 +08:00
|
|
|
tmppkey = X509_REQ_get0_pubkey(req);
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!tmppkey || !X509_set_pubkey(x509ss, tmppkey))
|
|
|
|
goto end;
|
|
|
|
|
|
|
|
/* Set up V3 context struct */
|
|
|
|
|
|
|
|
X509V3_set_ctx(&ext_ctx, x509ss, x509ss, NULL, NULL, 0);
|
|
|
|
X509V3_set_nconf(&ext_ctx, req_conf);
|
|
|
|
|
|
|
|
/* Add extensions */
|
2017-06-13 01:24:02 +08:00
|
|
|
if (extensions != NULL && !X509V3_EXT_add_nconf(req_conf,
|
|
|
|
&ext_ctx, extensions,
|
|
|
|
x509ss)) {
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(bio_err, "Error Loading extension section %s\n",
|
|
|
|
extensions);
|
|
|
|
goto end;
|
|
|
|
}
|
2017-12-28 01:29:36 +08:00
|
|
|
if (addext_conf != NULL
|
|
|
|
&& !X509V3_EXT_add_nconf(addext_conf, &ext_ctx, "default",
|
|
|
|
x509ss)) {
|
|
|
|
BIO_printf(bio_err, "Error Loading command line extensions\n");
|
|
|
|
goto end;
|
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2016-03-11 03:15:13 +08:00
|
|
|
/* If a pre-cert was requested, we need to add a poison extension */
|
|
|
|
if (precert) {
|
|
|
|
if (X509_add1_ext_i2d(x509ss, NID_ct_precert_poison, NULL, 1, 0)
|
|
|
|
!= 1) {
|
|
|
|
BIO_printf(bio_err, "Error adding poison extension\n");
|
|
|
|
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
|
|
|
i = do_X509_sign(x509ss, pkey, digest, sigopts);
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!i) {
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
X509V3_CTX ext_ctx;
|
|
|
|
|
|
|
|
/* Set up V3 context struct */
|
|
|
|
|
|
|
|
X509V3_set_ctx(&ext_ctx, NULL, NULL, req, NULL, 0);
|
|
|
|
X509V3_set_nconf(&ext_ctx, req_conf);
|
|
|
|
|
|
|
|
/* Add extensions */
|
2017-06-13 01:24:02 +08:00
|
|
|
if (req_exts != NULL
|
|
|
|
&& !X509V3_EXT_REQ_add_nconf(req_conf, &ext_ctx,
|
|
|
|
req_exts, req)) {
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(bio_err, "Error Loading extension section %s\n",
|
|
|
|
req_exts);
|
|
|
|
goto end;
|
|
|
|
}
|
2017-12-28 01:29:36 +08:00
|
|
|
if (addext_conf != NULL
|
|
|
|
&& !X509V3_EXT_REQ_add_nconf(addext_conf, &ext_ctx, "default",
|
|
|
|
req)) {
|
|
|
|
BIO_printf(bio_err, "Error Loading command line extensions\n");
|
|
|
|
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
|
|
|
i = do_X509_REQ_sign(req, pkey, digest, sigopts);
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!i) {
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (subj && x509) {
|
|
|
|
BIO_printf(bio_err, "Cannot modify certificate subject\n");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (subj && !x509) {
|
|
|
|
if (verbose) {
|
|
|
|
BIO_printf(bio_err, "Modifying Request's Subject\n");
|
|
|
|
print_name(bio_err, "old subject=",
|
2017-04-26 00:25:42 +08:00
|
|
|
X509_REQ_get_subject_name(req), get_nameopt());
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (build_subject(req, subj, chtype, multirdn) == 0) {
|
|
|
|
BIO_printf(bio_err, "ERROR: cannot modify subject\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
|
|
|
ret = 1;
|
2015-01-22 11:40:55 +08:00
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (verbose) {
|
|
|
|
print_name(bio_err, "new subject=",
|
2017-04-26 00:25:42 +08:00
|
|
|
X509_REQ_get_subject_name(req), get_nameopt());
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (verify && !x509) {
|
2016-04-05 06:13:06 +08:00
|
|
|
EVP_PKEY *tpubkey = pkey;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2016-04-05 06:13:06 +08:00
|
|
|
if (tpubkey == NULL) {
|
|
|
|
tpubkey = X509_REQ_get0_pubkey(req);
|
|
|
|
if (tpubkey == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
2016-04-05 06:13:06 +08:00
|
|
|
i = X509_REQ_verify(req, tpubkey);
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
if (i < 0) {
|
|
|
|
goto end;
|
|
|
|
} else if (i == 0) {
|
|
|
|
BIO_printf(bio_err, "verify failure\n");
|
|
|
|
ERR_print_errors(bio_err);
|
2017-06-13 01:24:02 +08:00
|
|
|
} else { /* if (i > 0) */
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(bio_err, "verify OK\n");
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (noout && !text && !modulus && !subject && !pubkey) {
|
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
|
|
|
ret = 0;
|
2015-01-22 11:40:55 +08:00
|
|
|
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
|
|
|
out = bio_open_default(outfile,
|
|
|
|
keyout != NULL && outfile != NULL &&
|
2015-09-04 18:49:06 +08:00
|
|
|
strcmp(keyout, outfile) == 0 ? 'a' : 'w',
|
|
|
|
outformat);
|
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 (out == NULL)
|
|
|
|
goto end;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
if (pubkey) {
|
2016-04-07 06:20:11 +08:00
|
|
|
EVP_PKEY *tpubkey = X509_REQ_get0_pubkey(req);
|
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
if (tpubkey == NULL) {
|
|
|
|
BIO_printf(bio_err, "Error getting public key\n");
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
PEM_write_bio_PUBKEY(out, tpubkey);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (text) {
|
|
|
|
if (x509)
|
2017-04-26 00:25:42 +08:00
|
|
|
X509_print_ex(out, x509ss, get_nameopt(), reqflag);
|
2015-01-22 11:40:55 +08:00
|
|
|
else
|
2017-04-26 00:25:42 +08:00
|
|
|
X509_REQ_print_ex(out, req, get_nameopt(), reqflag);
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (subject) {
|
|
|
|
if (x509)
|
|
|
|
print_name(out, "subject=", X509_get_subject_name(x509ss),
|
2017-04-26 00:25:42 +08:00
|
|
|
get_nameopt());
|
2015-01-22 11:40:55 +08:00
|
|
|
else
|
|
|
|
print_name(out, "subject=", X509_REQ_get_subject_name(req),
|
2017-04-26 00:25:42 +08:00
|
|
|
get_nameopt());
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (modulus) {
|
|
|
|
EVP_PKEY *tpubkey;
|
|
|
|
|
|
|
|
if (x509)
|
2016-04-07 06:20:11 +08:00
|
|
|
tpubkey = X509_get0_pubkey(x509ss);
|
2015-01-22 11:40:55 +08:00
|
|
|
else
|
2016-04-07 06:20:11 +08:00
|
|
|
tpubkey = X509_REQ_get0_pubkey(req);
|
2015-01-22 11:40:55 +08:00
|
|
|
if (tpubkey == NULL) {
|
|
|
|
fprintf(stdout, "Modulus=unavailable\n");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
fprintf(stdout, "Modulus=");
|
2001-02-20 00:06:34 +08:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
2016-04-02 21:12:58 +08:00
|
|
|
if (EVP_PKEY_base_id(tpubkey) == EVP_PKEY_RSA) {
|
2016-06-14 21:49:05 +08:00
|
|
|
const BIGNUM *n;
|
2016-04-02 21:12:58 +08:00
|
|
|
RSA_get0_key(EVP_PKEY_get0_RSA(tpubkey), &n, NULL, NULL);
|
|
|
|
BN_print(out, n);
|
|
|
|
} else
|
1998-12-22 23:59:57 +08:00
|
|
|
#endif
|
2015-01-22 11:40:55 +08:00
|
|
|
fprintf(stdout, "Wrong Algorithm type");
|
|
|
|
fprintf(stdout, "\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!noout && !x509) {
|
|
|
|
if (outformat == FORMAT_ASN1)
|
|
|
|
i = i2d_X509_REQ_bio(out, req);
|
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
|
|
|
else if (newhdr)
|
|
|
|
i = PEM_write_bio_X509_REQ_NEW(out, req);
|
|
|
|
else
|
|
|
|
i = PEM_write_bio_X509_REQ(out, req);
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!i) {
|
|
|
|
BIO_printf(bio_err, "unable to write X509 request\n");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!noout && x509 && (x509ss != NULL)) {
|
|
|
|
if (outformat == FORMAT_ASN1)
|
|
|
|
i = i2d_X509_bio(out, x509ss);
|
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
|
|
|
else
|
2015-01-22 11:40:55 +08:00
|
|
|
i = PEM_write_bio_X509(out, x509ss);
|
|
|
|
if (!i) {
|
|
|
|
BIO_printf(bio_err, "unable to write X509 certificate\n");
|
|
|
|
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
|
|
|
ret = 0;
|
2015-01-22 11:40:55 +08:00
|
|
|
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 (ret) {
|
2015-01-22 11:40:55 +08:00
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
}
|
2015-05-29 01:52:55 +08:00
|
|
|
NCONF_free(req_conf);
|
2018-07-10 02:55:17 +08:00
|
|
|
NCONF_free(addext_conf);
|
2017-12-28 01:29:36 +08:00
|
|
|
BIO_free(addext_bio);
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_free(in);
|
|
|
|
BIO_free_all(out);
|
|
|
|
EVP_PKEY_free(pkey);
|
2015-03-28 22:54:15 +08:00
|
|
|
EVP_PKEY_CTX_free(genctx);
|
2015-05-02 02:37:16 +08:00
|
|
|
sk_OPENSSL_STRING_free(pkeyopts);
|
|
|
|
sk_OPENSSL_STRING_free(sigopts);
|
2018-07-06 07:57:22 +08:00
|
|
|
lh_OPENSSL_STRING_doall(addexts, exts_cleanup);
|
|
|
|
lh_OPENSSL_STRING_free(addexts);
|
2006-06-05 19:52:46 +08:00
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
2015-05-01 22:15:18 +08:00
|
|
|
ENGINE_free(gen_eng);
|
2006-06-05 19:52:46 +08:00
|
|
|
#endif
|
2015-05-01 22:02:07 +08:00
|
|
|
OPENSSL_free(keyalgstr);
|
2015-01-22 11:40:55 +08:00
|
|
|
X509_REQ_free(req);
|
|
|
|
X509_free(x509ss);
|
|
|
|
ASN1_INTEGER_free(serial);
|
2016-09-29 05:39:18 +08:00
|
|
|
release_engine(e);
|
2016-03-07 09:01:20 +08:00
|
|
|
if (passin != nofree_passin)
|
|
|
|
OPENSSL_free(passin);
|
|
|
|
if (passout != nofree_passout)
|
|
|
|
OPENSSL_free(passout);
|
2017-07-05 12:40:39 +08:00
|
|
|
return ret;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
1998-12-21 18:52:47 +08:00
|
|
|
|
2003-11-28 22:04:09 +08:00
|
|
|
static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, char *subj, int multirdn,
|
2015-01-22 11:40:55 +08:00
|
|
|
int attribs, unsigned long chtype)
|
|
|
|
{
|
|
|
|
int ret = 0, i;
|
|
|
|
char no_prompt = 0;
|
|
|
|
STACK_OF(CONF_VALUE) *dn_sk, *attr_sk = NULL;
|
|
|
|
char *tmp, *dn_sect, *attr_sect;
|
|
|
|
|
|
|
|
tmp = NCONF_get_string(req_conf, SECTION, PROMPT);
|
|
|
|
if (tmp == NULL)
|
|
|
|
ERR_clear_error();
|
2015-05-07 02:56:14 +08:00
|
|
|
if ((tmp != NULL) && strcmp(tmp, "no") == 0)
|
2015-01-22 11:40:55 +08:00
|
|
|
no_prompt = 1;
|
|
|
|
|
|
|
|
dn_sect = NCONF_get_string(req_conf, SECTION, DISTINGUISHED_NAME);
|
|
|
|
if (dn_sect == NULL) {
|
|
|
|
BIO_printf(bio_err, "unable to find '%s' in config\n",
|
|
|
|
DISTINGUISHED_NAME);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
dn_sk = NCONF_get_section(req_conf, dn_sect);
|
|
|
|
if (dn_sk == NULL) {
|
|
|
|
BIO_printf(bio_err, "unable to get '%s' section\n", dn_sect);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
attr_sect = NCONF_get_string(req_conf, SECTION, ATTRIBUTES);
|
|
|
|
if (attr_sect == NULL) {
|
|
|
|
ERR_clear_error();
|
|
|
|
attr_sk = NULL;
|
|
|
|
} else {
|
|
|
|
attr_sk = NCONF_get_section(req_conf, attr_sect);
|
|
|
|
if (attr_sk == NULL) {
|
|
|
|
BIO_printf(bio_err, "unable to get '%s' section\n", attr_sect);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* setup version number */
|
|
|
|
if (!X509_REQ_set_version(req, 0L))
|
|
|
|
goto err; /* version 1 */
|
|
|
|
|
|
|
|
if (subj)
|
|
|
|
i = build_subject(req, subj, chtype, multirdn);
|
|
|
|
else if (no_prompt)
|
|
|
|
i = auto_info(req, dn_sk, attr_sk, attribs, chtype);
|
|
|
|
else
|
|
|
|
i = prompt_info(req, dn_sk, dn_sect, attr_sk, attr_sect, attribs,
|
|
|
|
chtype);
|
|
|
|
if (!i)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
if (!X509_REQ_set_pubkey(req, pkey))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
ret = 1;
|
|
|
|
err:
|
2017-07-05 12:40:39 +08:00
|
|
|
return ret;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
1998-12-21 18:52:47 +08:00
|
|
|
|
2002-04-30 20:08:18 +08:00
|
|
|
/*
|
|
|
|
* subject is expected to be in the format /type0=value0/type1=value1/type2=...
|
|
|
|
* where characters may be escaped by \
|
|
|
|
*/
|
2016-08-05 05:52:22 +08:00
|
|
|
static int build_subject(X509_REQ *req, const char *subject, unsigned long chtype,
|
2015-01-22 11:40:55 +08:00
|
|
|
int multirdn)
|
|
|
|
{
|
|
|
|
X509_NAME *n;
|
|
|
|
|
2015-05-07 01:43:59 +08:00
|
|
|
if ((n = parse_name(subject, chtype, multirdn)) == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
return 0;
|
2001-03-05 19:09:43 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!X509_REQ_set_subject_name(req, n)) {
|
|
|
|
X509_NAME_free(n);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
X509_NAME_free(n);
|
|
|
|
return 1;
|
|
|
|
}
|
2000-01-06 09:26:48 +08:00
|
|
|
|
|
|
|
static int prompt_info(X509_REQ *req,
|
2016-08-05 05:52:22 +08:00
|
|
|
STACK_OF(CONF_VALUE) *dn_sk, const char *dn_sect,
|
|
|
|
STACK_OF(CONF_VALUE) *attr_sk, const char *attr_sect,
|
2015-01-22 11:40:55 +08:00
|
|
|
int attribs, unsigned long chtype)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
char *p, *q;
|
|
|
|
char buf[100];
|
|
|
|
int nid, mval;
|
|
|
|
long n_min, n_max;
|
|
|
|
char *type, *value;
|
|
|
|
const char *def;
|
|
|
|
CONF_VALUE *v;
|
|
|
|
X509_NAME *subj;
|
|
|
|
subj = X509_REQ_get_subject_name(req);
|
|
|
|
|
|
|
|
if (!batch) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"You are about to be asked to enter information that will be incorporated\n");
|
|
|
|
BIO_printf(bio_err, "into your certificate request.\n");
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"What you are about to enter is what is called a Distinguished Name or a DN.\n");
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"There are quite a few fields but you can leave some blank\n");
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"For some fields there will be a default value,\n");
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"If you enter '.', the field will be left blank.\n");
|
|
|
|
BIO_printf(bio_err, "-----\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sk_CONF_VALUE_num(dn_sk)) {
|
|
|
|
i = -1;
|
2017-06-13 01:24:02 +08:00
|
|
|
start:
|
|
|
|
for ( ; ; ) {
|
2015-01-22 11:40:55 +08:00
|
|
|
i++;
|
|
|
|
if (sk_CONF_VALUE_num(dn_sk) <= i)
|
|
|
|
break;
|
|
|
|
|
|
|
|
v = sk_CONF_VALUE_value(dn_sk, i);
|
|
|
|
p = q = NULL;
|
|
|
|
type = v->name;
|
|
|
|
if (!check_end(type, "_min") || !check_end(type, "_max") ||
|
|
|
|
!check_end(type, "_default") || !check_end(type, "_value"))
|
|
|
|
continue;
|
|
|
|
/*
|
|
|
|
* Skip past any leading X. X: X, etc to allow for multiple
|
|
|
|
* instances
|
|
|
|
*/
|
|
|
|
for (p = v->name; *p; p++)
|
|
|
|
if ((*p == ':') || (*p == ',') || (*p == '.')) {
|
|
|
|
p++;
|
|
|
|
if (*p)
|
|
|
|
type = p;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (*type == '+') {
|
|
|
|
mval = -1;
|
|
|
|
type++;
|
2017-06-13 01:24:02 +08:00
|
|
|
} else {
|
2015-01-22 11:40:55 +08:00
|
|
|
mval = 0;
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
/* If OBJ not recognised ignore it */
|
|
|
|
if ((nid = OBJ_txt2nid(type)) == NID_undef)
|
|
|
|
goto start;
|
2017-07-05 12:40:39 +08:00
|
|
|
if (!join(buf, sizeof(buf), v->name, "_default", "Name"))
|
2015-01-22 11:40:55 +08:00
|
|
|
return 0;
|
|
|
|
if ((def = NCONF_get_string(req_conf, dn_sect, buf)) == NULL) {
|
|
|
|
ERR_clear_error();
|
|
|
|
def = "";
|
|
|
|
}
|
|
|
|
|
2017-07-05 12:40:39 +08:00
|
|
|
if (!join(buf, sizeof(buf), v->name, "_value", "Name"))
|
|
|
|
return 0;
|
2015-01-22 11:40:55 +08:00
|
|
|
if ((value = NCONF_get_string(req_conf, dn_sect, buf)) == NULL) {
|
|
|
|
ERR_clear_error();
|
|
|
|
value = NULL;
|
|
|
|
}
|
|
|
|
|
2017-07-05 12:40:39 +08:00
|
|
|
if (!join(buf, sizeof(buf), v->name, "_min", "Name"))
|
|
|
|
return 0;
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!NCONF_get_number(req_conf, dn_sect, buf, &n_min)) {
|
|
|
|
ERR_clear_error();
|
|
|
|
n_min = -1;
|
|
|
|
}
|
|
|
|
|
2017-07-05 12:40:39 +08:00
|
|
|
|
|
|
|
if (!join(buf, sizeof(buf), v->name, "_max", "Name"))
|
|
|
|
return 0;
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!NCONF_get_number(req_conf, dn_sect, buf, &n_max)) {
|
|
|
|
ERR_clear_error();
|
|
|
|
n_max = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!add_DN_object(subj, v->value, def, value, nid,
|
|
|
|
n_min, n_max, chtype, mval))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (X509_NAME_entry_count(subj) == 0) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"error, no objects specified in config file\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (attribs) {
|
|
|
|
if ((attr_sk != NULL) && (sk_CONF_VALUE_num(attr_sk) > 0)
|
|
|
|
&& (!batch)) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"\nPlease enter the following 'extra' attributes\n");
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"to be sent with your certificate request\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
i = -1;
|
2017-06-13 01:24:02 +08:00
|
|
|
start2:
|
|
|
|
for ( ; ; ) {
|
2015-01-22 11:40:55 +08:00
|
|
|
i++;
|
|
|
|
if ((attr_sk == NULL) || (sk_CONF_VALUE_num(attr_sk) <= i))
|
|
|
|
break;
|
|
|
|
|
|
|
|
v = sk_CONF_VALUE_value(attr_sk, i);
|
|
|
|
type = v->name;
|
|
|
|
if ((nid = OBJ_txt2nid(type)) == NID_undef)
|
|
|
|
goto start2;
|
|
|
|
|
2017-07-05 12:40:39 +08:00
|
|
|
if (!join(buf, sizeof(buf), type, "_default", "Name"))
|
2015-01-22 11:40:55 +08:00
|
|
|
return 0;
|
|
|
|
if ((def = NCONF_get_string(req_conf, attr_sect, buf))
|
|
|
|
== NULL) {
|
|
|
|
ERR_clear_error();
|
|
|
|
def = "";
|
|
|
|
}
|
|
|
|
|
2017-07-05 12:40:39 +08:00
|
|
|
if (!join(buf, sizeof(buf), type, "_value", "Name"))
|
|
|
|
return 0;
|
2015-01-22 11:40:55 +08:00
|
|
|
if ((value = NCONF_get_string(req_conf, attr_sect, buf))
|
|
|
|
== NULL) {
|
|
|
|
ERR_clear_error();
|
|
|
|
value = NULL;
|
|
|
|
}
|
|
|
|
|
2017-07-05 12:40:39 +08:00
|
|
|
if (!join(buf, sizeof(buf), type,"_min", "Name"))
|
|
|
|
return 0;
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!NCONF_get_number(req_conf, attr_sect, buf, &n_min)) {
|
|
|
|
ERR_clear_error();
|
|
|
|
n_min = -1;
|
|
|
|
}
|
|
|
|
|
2017-07-05 12:40:39 +08:00
|
|
|
if (!join(buf, sizeof(buf), type, "_max", "Name"))
|
|
|
|
return 0;
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!NCONF_get_number(req_conf, attr_sect, buf, &n_max)) {
|
|
|
|
ERR_clear_error();
|
|
|
|
n_max = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!add_attribute_object(req,
|
|
|
|
v->value, def, value, nid, n_min,
|
|
|
|
n_max, chtype))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
BIO_printf(bio_err, "No template, please set one up.\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
}
|
2000-01-06 09:26:48 +08:00
|
|
|
|
|
|
|
static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
|
2015-01-22 11:40:55 +08:00
|
|
|
STACK_OF(CONF_VALUE) *attr_sk, int attribs,
|
|
|
|
unsigned long chtype)
|
|
|
|
{
|
2016-01-31 09:14:39 +08:00
|
|
|
int i, spec_char, plus_char;
|
2015-01-22 11:40:55 +08:00
|
|
|
char *p, *q;
|
|
|
|
char *type;
|
|
|
|
CONF_VALUE *v;
|
|
|
|
X509_NAME *subj;
|
|
|
|
|
|
|
|
subj = X509_REQ_get_subject_name(req);
|
|
|
|
|
|
|
|
for (i = 0; i < sk_CONF_VALUE_num(dn_sk); i++) {
|
|
|
|
int mval;
|
|
|
|
v = sk_CONF_VALUE_value(dn_sk, i);
|
|
|
|
p = q = NULL;
|
|
|
|
type = v->name;
|
|
|
|
/*
|
|
|
|
* Skip past any leading X. X: X, etc to allow for multiple instances
|
|
|
|
*/
|
2016-01-31 09:14:39 +08:00
|
|
|
for (p = v->name; *p; p++) {
|
2000-09-10 22:45:19 +08:00
|
|
|
#ifndef CHARSET_EBCDIC
|
2016-01-31 09:14:39 +08:00
|
|
|
spec_char = ((*p == ':') || (*p == ',') || (*p == '.'));
|
2000-09-10 22:45:19 +08:00
|
|
|
#else
|
2016-01-31 09:14:39 +08:00
|
|
|
spec_char = ((*p == os_toascii[':']) || (*p == os_toascii[','])
|
|
|
|
|| (*p == os_toascii['.']));
|
2000-09-10 22:45:19 +08:00
|
|
|
#endif
|
2016-01-31 09:14:39 +08:00
|
|
|
if (spec_char) {
|
2015-01-22 11:40:55 +08:00
|
|
|
p++;
|
|
|
|
if (*p)
|
|
|
|
type = p;
|
|
|
|
break;
|
|
|
|
}
|
2016-01-31 09:14:39 +08:00
|
|
|
}
|
2003-03-30 09:51:16 +08:00
|
|
|
#ifndef CHARSET_EBCDIC
|
2016-06-21 02:07:13 +08:00
|
|
|
plus_char = (*type == '+');
|
2003-03-30 09:51:16 +08:00
|
|
|
#else
|
2016-06-21 02:07:13 +08:00
|
|
|
plus_char = (*type == os_toascii['+']);
|
2003-03-30 09:51:16 +08:00
|
|
|
#endif
|
2016-01-31 09:14:39 +08:00
|
|
|
if (plus_char) {
|
2016-06-21 02:07:13 +08:00
|
|
|
type++;
|
2015-01-22 11:40:55 +08:00
|
|
|
mval = -1;
|
2017-06-13 01:24:02 +08:00
|
|
|
} else {
|
2015-01-22 11:40:55 +08:00
|
|
|
mval = 0;
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!X509_NAME_add_entry_by_txt(subj, type, chtype,
|
|
|
|
(unsigned char *)v->value, -1, -1,
|
|
|
|
mval))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!X509_NAME_entry_count(subj)) {
|
|
|
|
BIO_printf(bio_err, "error, no objects specified in config file\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (attribs) {
|
|
|
|
for (i = 0; i < sk_CONF_VALUE_num(attr_sk); i++) {
|
|
|
|
v = sk_CONF_VALUE_value(attr_sk, i);
|
|
|
|
if (!X509_REQ_add1_attr_by_txt(req, v->name, chtype,
|
|
|
|
(unsigned char *)v->value, -1))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int add_DN_object(X509_NAME *n, char *text, const char *def,
|
|
|
|
char *value, int nid, int n_min, int n_max,
|
|
|
|
unsigned long chtype, int mval)
|
|
|
|
{
|
2018-04-06 20:42:31 +08:00
|
|
|
int ret = 0;
|
2015-01-24 00:58:26 +08:00
|
|
|
char buf[1024];
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2018-04-06 20:42:31 +08:00
|
|
|
ret = build_data(text, def, value, n_min, n_max, buf, sizeof(buf),
|
|
|
|
"DN value", "DN default");
|
|
|
|
if ((ret == 0) || (ret == 1))
|
|
|
|
return ret;
|
|
|
|
ret = 1;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
if (!X509_NAME_add_entry_by_NID(n, nid, chtype,
|
|
|
|
(unsigned char *)buf, -1, -1, mval))
|
2018-04-06 20:42:31 +08:00
|
|
|
ret = 0;
|
|
|
|
|
2017-07-05 12:40:39 +08:00
|
|
|
return ret;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
1998-12-21 18:52:47 +08:00
|
|
|
|
2005-04-06 03:11:19 +08:00
|
|
|
static int add_attribute_object(X509_REQ *req, char *text, const char *def,
|
2015-01-22 11:40:55 +08:00
|
|
|
char *value, int nid, int n_min,
|
|
|
|
int n_max, unsigned long chtype)
|
|
|
|
{
|
2018-04-06 20:42:31 +08:00
|
|
|
int ret = 0;
|
|
|
|
char buf[1024];
|
|
|
|
|
|
|
|
ret = build_data(text, def, value, n_min, n_max, buf, sizeof(buf),
|
|
|
|
"Attribute value", "Attribute default");
|
|
|
|
if ((ret == 0) || (ret == 1))
|
|
|
|
return ret;
|
|
|
|
ret = 1;
|
|
|
|
|
|
|
|
if (!X509_REQ_add1_attr_by_NID(req, nid, chtype,
|
|
|
|
(unsigned char *)buf, -1)) {
|
|
|
|
BIO_printf(bio_err, "Error adding attribute\n");
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
ret = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2018-04-06 20:42:31 +08:00
|
|
|
|
|
|
|
static int build_data(char *text, const char *def,
|
|
|
|
char *value, int n_min, int n_max,
|
|
|
|
char *buf, const int buf_size,
|
|
|
|
const char *desc1, const char *desc2
|
|
|
|
)
|
|
|
|
{
|
|
|
|
int i;
|
2015-01-22 11:40:55 +08:00
|
|
|
start:
|
|
|
|
if (!batch)
|
|
|
|
BIO_printf(bio_err, "%s [%s]:", text, def);
|
|
|
|
(void)BIO_flush(bio_err);
|
|
|
|
if (value != NULL) {
|
2018-04-06 20:42:31 +08:00
|
|
|
if (!join(buf, buf_size, value, "\n", desc1))
|
2017-07-05 12:40:39 +08:00
|
|
|
return 0;
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(bio_err, "%s\n", value);
|
|
|
|
} else {
|
|
|
|
buf[0] = '\0';
|
|
|
|
if (!batch) {
|
2018-04-06 20:42:31 +08:00
|
|
|
if (!fgets(buf, buf_size, stdin))
|
2015-01-22 11:40:55 +08:00
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
buf[0] = '\n';
|
|
|
|
buf[1] = '\0';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (buf[0] == '\0')
|
2017-06-13 01:24:02 +08:00
|
|
|
return 0;
|
|
|
|
if (buf[0] == '\n') {
|
2015-01-22 11:40:55 +08:00
|
|
|
if ((def == NULL) || (def[0] == '\0'))
|
2017-06-13 01:24:02 +08:00
|
|
|
return 1;
|
2018-04-06 20:42:31 +08:00
|
|
|
if (!join(buf, buf_size, def, "\n", desc2))
|
2017-07-05 12:40:39 +08:00
|
|
|
return 0;
|
2017-06-13 01:24:02 +08:00
|
|
|
} else if ((buf[0] == '.') && (buf[1] == '\n')) {
|
|
|
|
return 1;
|
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
i = strlen(buf);
|
|
|
|
if (buf[i - 1] != '\n') {
|
|
|
|
BIO_printf(bio_err, "weird input :-(\n");
|
2017-06-13 01:24:02 +08:00
|
|
|
return 0;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
buf[--i] = '\0';
|
2000-09-10 22:45:19 +08:00
|
|
|
#ifdef CHARSET_EBCDIC
|
2015-01-22 11:40:55 +08:00
|
|
|
ebcdic2ascii(buf, buf, i);
|
2000-09-10 22:45:19 +08:00
|
|
|
#endif
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!req_check_len(i, n_min, n_max)) {
|
|
|
|
if (batch || value)
|
|
|
|
return 0;
|
|
|
|
goto start;
|
|
|
|
}
|
2018-04-06 20:42:31 +08:00
|
|
|
return 2;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
1998-12-21 18:52:47 +08:00
|
|
|
|
2001-06-28 19:41:50 +08:00
|
|
|
static int req_check_len(int len, int n_min, int n_max)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
if ((n_min > 0) && (len < n_min)) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"string is too short, it needs to be at least %d bytes long\n",
|
|
|
|
n_min);
|
2017-07-05 12:40:39 +08:00
|
|
|
return 0;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
if ((n_max >= 0) && (len > n_max)) {
|
|
|
|
BIO_printf(bio_err,
|
2017-02-16 19:27:55 +08:00
|
|
|
"string is too long, it needs to be no more than %d bytes long\n",
|
2015-01-22 11:40:55 +08:00
|
|
|
n_max);
|
2017-07-05 12:40:39 +08:00
|
|
|
return 0;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2017-07-05 12:40:39 +08:00
|
|
|
return 1;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
1999-02-23 08:07:46 +08:00
|
|
|
|
|
|
|
/* Check if the end of a string matches 'end' */
|
2005-04-06 03:11:19 +08:00
|
|
|
static int check_end(const char *str, const char *end)
|
1999-02-23 08:07:46 +08:00
|
|
|
{
|
2017-07-05 12:40:39 +08:00
|
|
|
size_t elen, slen;
|
2015-01-22 11:40:55 +08:00
|
|
|
const char *tmp;
|
2017-07-05 12:40:39 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
elen = strlen(end);
|
|
|
|
slen = strlen(str);
|
|
|
|
if (elen > slen)
|
|
|
|
return 1;
|
|
|
|
tmp = str + slen - elen;
|
|
|
|
return strcmp(tmp, end);
|
1999-02-23 08:07:46 +08:00
|
|
|
}
|
2006-05-12 05:39:00 +08:00
|
|
|
|
2017-07-05 12:40:39 +08:00
|
|
|
/*
|
|
|
|
* Merge the two strings together into the result buffer checking for
|
2017-08-11 22:15:22 +08:00
|
|
|
* overflow and producing an error message if there is.
|
2017-07-05 12:40:39 +08:00
|
|
|
*/
|
|
|
|
static int join(char buf[], size_t buf_size, const char *name,
|
|
|
|
const char *tail, const char *desc)
|
|
|
|
{
|
|
|
|
const size_t name_len = strlen(name), tail_len = strlen(tail);
|
|
|
|
|
|
|
|
if (name_len + tail_len + 1 > buf_size) {
|
|
|
|
BIO_printf(bio_err, "%s '%s' too long\n", desc, name);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
memcpy(buf, name, name_len);
|
|
|
|
memcpy(buf + name_len, tail, tail_len + 1);
|
|
|
|
return 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
|
|
|
static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
|
2015-01-22 11:40:55 +08:00
|
|
|
int *pkey_type, long *pkeylen,
|
|
|
|
char **palgnam, ENGINE *keygen_engine)
|
|
|
|
{
|
|
|
|
EVP_PKEY_CTX *gctx = NULL;
|
|
|
|
EVP_PKEY *param = NULL;
|
|
|
|
long keylen = -1;
|
|
|
|
BIO *pbio = NULL;
|
|
|
|
const char *paramfile = NULL;
|
|
|
|
|
|
|
|
if (gstr == NULL) {
|
|
|
|
*pkey_type = EVP_PKEY_RSA;
|
|
|
|
keylen = *pkeylen;
|
|
|
|
} else if (gstr[0] >= '0' && gstr[0] <= '9') {
|
|
|
|
*pkey_type = EVP_PKEY_RSA;
|
|
|
|
keylen = atol(gstr);
|
|
|
|
*pkeylen = keylen;
|
2017-06-13 01:24:02 +08:00
|
|
|
} else if (strncmp(gstr, "param:", 6) == 0) {
|
2015-01-22 11:40:55 +08:00
|
|
|
paramfile = gstr + 6;
|
2017-06-13 01:24:02 +08:00
|
|
|
} else {
|
2015-01-22 11:40:55 +08:00
|
|
|
const char *p = strchr(gstr, ':');
|
|
|
|
int len;
|
|
|
|
ENGINE *tmpeng;
|
|
|
|
const EVP_PKEY_ASN1_METHOD *ameth;
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (p != NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
len = p - gstr;
|
|
|
|
else
|
|
|
|
len = strlen(gstr);
|
|
|
|
/*
|
|
|
|
* The lookup of a the string will cover all engines so keep a note
|
|
|
|
* of the implementation.
|
|
|
|
*/
|
|
|
|
|
|
|
|
ameth = EVP_PKEY_asn1_find_str(&tmpeng, gstr, len);
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (ameth == 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
|
|
|
BIO_printf(bio_err, "Unknown algorithm %.*s\n", len, gstr);
|
2015-01-22 11:40:55 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
EVP_PKEY_asn1_get0_info(NULL, pkey_type, NULL, NULL, NULL, ameth);
|
2006-06-05 19:52:46 +08:00
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
2016-02-26 01:09:06 +08:00
|
|
|
ENGINE_finish(tmpeng);
|
2006-06-05 19:52:46 +08:00
|
|
|
#endif
|
2015-01-22 11:40:55 +08:00
|
|
|
if (*pkey_type == EVP_PKEY_RSA) {
|
2017-06-13 01:24:02 +08:00
|
|
|
if (p != NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
keylen = atol(p + 1);
|
|
|
|
*pkeylen = keylen;
|
2017-06-13 01:24:02 +08:00
|
|
|
} else {
|
2015-01-22 11:40:55 +08:00
|
|
|
keylen = *pkeylen;
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
|
|
|
} else if (p != NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
paramfile = p + 1;
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (paramfile != NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
pbio = BIO_new_file(paramfile, "r");
|
2017-06-13 01:24:02 +08:00
|
|
|
if (pbio == 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
|
|
|
BIO_printf(bio_err, "Can't open parameter file %s\n", paramfile);
|
2015-01-22 11:40:55 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
param = PEM_read_bio_Parameters(pbio, NULL);
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (param == NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
X509 *x;
|
2017-06-13 01:24:02 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
(void)BIO_reset(pbio);
|
|
|
|
x = PEM_read_bio_X509(pbio, NULL, NULL, NULL);
|
2017-06-13 01:24:02 +08:00
|
|
|
if (x != NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
param = X509_get_pubkey(x);
|
|
|
|
X509_free(x);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
BIO_free(pbio);
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (param == 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
|
|
|
BIO_printf(bio_err, "Error reading parameter file %s\n", paramfile);
|
2015-01-22 11:40:55 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
2017-06-13 01:24:02 +08:00
|
|
|
if (*pkey_type == -1) {
|
2015-01-22 11:40:55 +08:00
|
|
|
*pkey_type = EVP_PKEY_id(param);
|
2017-06-13 01:24:02 +08:00
|
|
|
} else if (*pkey_type != EVP_PKEY_base_id(param)) {
|
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
|
|
|
BIO_printf(bio_err, "Key Type does not match parameters\n");
|
2015-01-22 11:40:55 +08:00
|
|
|
EVP_PKEY_free(param);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (palgnam != NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
const EVP_PKEY_ASN1_METHOD *ameth;
|
|
|
|
ENGINE *tmpeng;
|
|
|
|
const char *anam;
|
2017-06-13 01:24:02 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
ameth = EVP_PKEY_asn1_find(&tmpeng, *pkey_type);
|
2017-06-13 01:24:02 +08:00
|
|
|
if (ameth == 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
|
|
|
BIO_puts(bio_err, "Internal error: can't find key algorithm\n");
|
2015-01-22 11:40:55 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
EVP_PKEY_asn1_get0_info(NULL, NULL, NULL, NULL, &anam, ameth);
|
Rename some BUF_xxx to OPENSSL_xxx
Rename BUF_{strdup,strlcat,strlcpy,memdup,strndup,strnlen}
to OPENSSL_{strdup,strlcat,strlcpy,memdup,strndup,strnlen}
Add #define's for the old names.
Add CRYPTO_{memdup,strndup}, called by OPENSSL_{memdup,strndup} macros.
Reviewed-by: Tim Hudson <tjh@openssl.org>
2015-12-17 05:12:24 +08:00
|
|
|
*palgnam = OPENSSL_strdup(anam);
|
2006-06-05 19:52:46 +08:00
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
2016-02-26 01:09:06 +08:00
|
|
|
ENGINE_finish(tmpeng);
|
2006-06-05 19:52:46 +08:00
|
|
|
#endif
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (param != NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
gctx = EVP_PKEY_CTX_new(param, keygen_engine);
|
|
|
|
*pkeylen = EVP_PKEY_bits(param);
|
|
|
|
EVP_PKEY_free(param);
|
2017-06-13 01:24:02 +08:00
|
|
|
} else {
|
2015-01-22 11:40:55 +08:00
|
|
|
gctx = EVP_PKEY_CTX_new_id(*pkey_type, keygen_engine);
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2015-10-30 19:18:04 +08:00
|
|
|
if (gctx == 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
|
|
|
BIO_puts(bio_err, "Error allocating keygen context\n");
|
|
|
|
ERR_print_errors(bio_err);
|
2015-01-22 11:40:55 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (EVP_PKEY_keygen_init(gctx) <= 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
|
|
|
BIO_puts(bio_err, "Error initializing keygen context\n");
|
|
|
|
ERR_print_errors(bio_err);
|
2016-02-06 06:37:49 +08:00
|
|
|
EVP_PKEY_CTX_free(gctx);
|
2015-01-22 11:40:55 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
2009-04-27 06:18:22 +08:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
2015-01-22 11:40:55 +08:00
|
|
|
if ((*pkey_type == EVP_PKEY_RSA) && (keylen != -1)) {
|
|
|
|
if (EVP_PKEY_CTX_set_rsa_keygen_bits(gctx, keylen) <= 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
|
|
|
BIO_puts(bio_err, "Error setting RSA keysize\n");
|
|
|
|
ERR_print_errors(bio_err);
|
2015-01-22 11:40:55 +08:00
|
|
|
EVP_PKEY_CTX_free(gctx);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
2009-04-27 06:18:22 +08:00
|
|
|
#endif
|
2006-05-12 05:39:00 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
return gctx;
|
|
|
|
}
|
2006-05-12 05:39:00 +08:00
|
|
|
|
|
|
|
static int genpkey_cb(EVP_PKEY_CTX *ctx)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
char c = '*';
|
|
|
|
BIO *b = EVP_PKEY_CTX_get_app_data(ctx);
|
|
|
|
int p;
|
|
|
|
p = EVP_PKEY_CTX_get_keygen_info(ctx, 0);
|
|
|
|
if (p == 0)
|
|
|
|
c = '.';
|
|
|
|
if (p == 1)
|
|
|
|
c = '+';
|
|
|
|
if (p == 2)
|
|
|
|
c = '*';
|
|
|
|
if (p == 3)
|
|
|
|
c = '\n';
|
|
|
|
BIO_write(b, &c, 1);
|
|
|
|
(void)BIO_flush(b);
|
|
|
|
return 1;
|
|
|
|
}
|
2010-03-12 22:41: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
|
|
|
static int do_sign_init(EVP_MD_CTX *ctx, EVP_PKEY *pkey,
|
2015-01-22 11:40:55 +08:00
|
|
|
const EVP_MD *md, STACK_OF(OPENSSL_STRING) *sigopts)
|
|
|
|
{
|
|
|
|
EVP_PKEY_CTX *pkctx = NULL;
|
2018-08-09 23:01:20 +08:00
|
|
|
int i, def_nid;
|
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
|
|
|
|
2015-11-27 21:02:12 +08:00
|
|
|
if (ctx == NULL)
|
|
|
|
return 0;
|
2018-08-09 23:01:20 +08:00
|
|
|
/*
|
|
|
|
* EVP_PKEY_get_default_digest_nid() returns 2 if the digest is mandatory
|
|
|
|
* for this algorithm.
|
|
|
|
*/
|
|
|
|
if (EVP_PKEY_get_default_digest_nid(pkey, &def_nid) == 2
|
|
|
|
&& def_nid == NID_undef) {
|
|
|
|
/* The signing algorithm requires there to be no digest */
|
|
|
|
md = NULL;
|
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!EVP_DigestSignInit(ctx, &pkctx, md, NULL, pkey))
|
|
|
|
return 0;
|
|
|
|
for (i = 0; i < sk_OPENSSL_STRING_num(sigopts); i++) {
|
|
|
|
char *sigopt = sk_OPENSSL_STRING_value(sigopts, i);
|
|
|
|
if (pkey_ctrl_string(pkctx, sigopt) <= 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
|
|
|
BIO_printf(bio_err, "parameter error \"%s\"\n", sigopt);
|
2015-01-22 11:40:55 +08:00
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
2010-03-12 22:41: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
|
|
|
int do_X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md,
|
2015-01-22 11:40:55 +08:00
|
|
|
STACK_OF(OPENSSL_STRING) *sigopts)
|
|
|
|
{
|
|
|
|
int rv;
|
2015-12-02 07:49:35 +08:00
|
|
|
EVP_MD_CTX *mctx = EVP_MD_CTX_new();
|
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
|
|
|
|
2015-11-27 21:02:12 +08:00
|
|
|
rv = do_sign_init(mctx, pkey, md, sigopts);
|
2015-01-22 11:40:55 +08:00
|
|
|
if (rv > 0)
|
2015-11-27 21:02:12 +08:00
|
|
|
rv = X509_sign_ctx(x, mctx);
|
2016-03-19 03:20:34 +08:00
|
|
|
EVP_MD_CTX_free(mctx);
|
2015-01-22 11:40:55 +08:00
|
|
|
return rv > 0 ? 1 : 0;
|
|
|
|
}
|
2010-03-12 22:41: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
|
|
|
int do_X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md,
|
2015-01-22 11:40:55 +08:00
|
|
|
STACK_OF(OPENSSL_STRING) *sigopts)
|
|
|
|
{
|
|
|
|
int rv;
|
2015-12-02 07:49:35 +08:00
|
|
|
EVP_MD_CTX *mctx = EVP_MD_CTX_new();
|
2015-11-27 21:02:12 +08:00
|
|
|
rv = do_sign_init(mctx, pkey, md, sigopts);
|
2015-01-22 11:40:55 +08:00
|
|
|
if (rv > 0)
|
2015-11-27 21:02:12 +08:00
|
|
|
rv = X509_REQ_sign_ctx(x, mctx);
|
2016-03-19 03:20:34 +08:00
|
|
|
EVP_MD_CTX_free(mctx);
|
2015-01-22 11:40:55 +08:00
|
|
|
return rv > 0 ? 1 : 0;
|
|
|
|
}
|
2010-03-14 20:54:45 +08:00
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
int do_X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md,
|
2015-01-22 11:40:55 +08:00
|
|
|
STACK_OF(OPENSSL_STRING) *sigopts)
|
|
|
|
{
|
|
|
|
int rv;
|
2015-12-02 07:49:35 +08:00
|
|
|
EVP_MD_CTX *mctx = EVP_MD_CTX_new();
|
2015-11-27 21:02:12 +08:00
|
|
|
rv = do_sign_init(mctx, pkey, md, sigopts);
|
2015-01-22 11:40:55 +08:00
|
|
|
if (rv > 0)
|
2015-11-27 21:02:12 +08:00
|
|
|
rv = X509_CRL_sign_ctx(x, mctx);
|
2016-03-19 03:20:34 +08:00
|
|
|
EVP_MD_CTX_free(mctx);
|
2015-01-22 11:40:55 +08:00
|
|
|
return rv > 0 ? 1 : 0;
|
|
|
|
}
|