2016-05-18 02:18:30 +08:00
|
|
|
/*
|
2020-04-23 20:55:52 +08:00
|
|
|
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
|
2001-10-21 01:56:36 +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
|
2001-10-21 01:56:36 +08:00
|
|
|
*/
|
1998-12-21 18:52:47 +08:00
|
|
|
|
2012-02-12 07:41:19 +08:00
|
|
|
#if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
|
2015-01-22 11:40:55 +08:00
|
|
|
/*
|
|
|
|
* On VMS, you need to define this to get the declaration of fileno(). The
|
|
|
|
* value 2 is to make sure no function defined in POSIX-2 is left undefined.
|
2015-01-22 03:18:47 +08:00
|
|
|
*/
|
2015-01-22 11:40:55 +08:00
|
|
|
# define _POSIX_C_SOURCE 2
|
2009-05-13 19:32:46 +08:00
|
|
|
#endif
|
2016-05-20 18:53:26 +08:00
|
|
|
|
1998-12-21 18:52:47 +08:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2017-08-25 20:51:45 +08:00
|
|
|
#include <sys/types.h>
|
2015-09-06 16:51:04 +08:00
|
|
|
#ifndef OPENSSL_NO_POSIX_IO
|
|
|
|
# include <sys/stat.h>
|
|
|
|
# include <fcntl.h>
|
|
|
|
#endif
|
2002-10-25 17:51:45 +08:00
|
|
|
#include <ctype.h>
|
2005-11-05 00:12:05 +08:00
|
|
|
#include <errno.h>
|
2000-06-23 01:42:50 +08:00
|
|
|
#include <openssl/err.h>
|
|
|
|
#include <openssl/x509.h>
|
2001-03-16 03:13:40 +08:00
|
|
|
#include <openssl/x509v3.h>
|
2020-11-14 01:47:03 +08:00
|
|
|
#include <openssl/http.h>
|
2000-06-23 01:42:50 +08:00
|
|
|
#include <openssl/pem.h>
|
2020-05-06 19:51:50 +08:00
|
|
|
#include <openssl/store.h>
|
2000-06-23 01:42:50 +08:00
|
|
|
#include <openssl/pkcs12.h>
|
2001-06-20 00:26:30 +08:00
|
|
|
#include <openssl/ui.h>
|
2000-06-23 01:42:50 +08:00
|
|
|
#include <openssl/safestack.h>
|
2020-12-18 04:37:15 +08:00
|
|
|
#include <openssl/rsa.h>
|
2004-05-18 03:05:32 +08:00
|
|
|
#include <openssl/bn.h>
|
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
|
|
|
#include <openssl/ssl.h>
|
2018-10-12 23:02:58 +08:00
|
|
|
#include <openssl/store.h>
|
|
|
|
#include "s_apps.h"
|
2002-10-24 18:03:55 +08:00
|
|
|
#include "apps.h"
|
|
|
|
|
2005-11-05 00:12:05 +08:00
|
|
|
#ifdef _WIN32
|
|
|
|
static int WIN32_rename(const char *from, const char *to);
|
2015-01-22 11:40:55 +08:00
|
|
|
# define rename(from,to) WIN32_rename((from),(to))
|
2005-11-05 00:12:05 +08:00
|
|
|
#endif
|
|
|
|
|
2019-07-13 04:49:42 +08:00
|
|
|
#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
|
|
|
|
# include <conio.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32)
|
|
|
|
# define _kbhit kbhit
|
|
|
|
#endif
|
|
|
|
|
2018-02-01 18:06:03 +08:00
|
|
|
#define PASS_SOURCE_SIZE_MAX 4
|
|
|
|
|
2019-12-20 06:30:24 +08:00
|
|
|
DEFINE_STACK_OF(CONF)
|
|
|
|
|
2000-10-06 19:51:47 +08:00
|
|
|
typedef struct {
|
2015-01-22 11:40:55 +08:00
|
|
|
const char *name;
|
|
|
|
unsigned long flag;
|
|
|
|
unsigned long mask;
|
2000-10-06 19:51:47 +08:00
|
|
|
} NAME_EX_TBL;
|
|
|
|
|
2020-10-15 17:55:50 +08:00
|
|
|
static OSSL_LIB_CTX *app_libctx = NULL;
|
2020-07-23 15:40:40 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
static int set_table_opts(unsigned long *flags, const char *arg,
|
|
|
|
const NAME_EX_TBL * in_tbl);
|
|
|
|
static int set_multi_opts(unsigned long *flags, const char *arg,
|
|
|
|
const NAME_EX_TBL * in_tbl);
|
2000-10-06 19:51:47 +08:00
|
|
|
|
1998-12-21 18:52:47 +08:00
|
|
|
int app_init(long mesgwin);
|
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
|
|
|
int chopup_args(ARGS *arg, char *buf)
|
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
|
|
|
int quoted;
|
2015-05-06 17:16:55 +08:00
|
|
|
char c = '\0', *p = NULL;
|
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
|
|
|
arg->argc = 0;
|
|
|
|
if (arg->size == 0) {
|
|
|
|
arg->size = 20;
|
2015-05-02 11:10:31 +08:00
|
|
|
arg->argv = app_malloc(sizeof(*arg->argv) * arg->size, "argv space");
|
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
|
|
|
for (p = buf;;) {
|
|
|
|
/* Skip whitespace. */
|
2016-02-14 20:02:15 +08:00
|
|
|
while (*p && isspace(_UC(*p)))
|
2015-01-22 11:40:55 +08:00
|
|
|
p++;
|
2019-09-17 03:28:57 +08:00
|
|
|
if (*p == '\0')
|
2015-01-22 11:40:55 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
/* The start of something good :-) */
|
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 (arg->argc >= arg->size) {
|
2016-05-12 04:14:57 +08:00
|
|
|
char **tmp;
|
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
|
|
|
arg->size += 20;
|
2016-05-12 04:14:57 +08:00
|
|
|
tmp = OPENSSL_realloc(arg->argv, sizeof(*arg->argv) * arg->size);
|
|
|
|
if (tmp == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
return 0;
|
2016-05-12 04:14:57 +08:00
|
|
|
arg->argv = tmp;
|
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
|
|
|
quoted = *p == '\'' || *p == '"';
|
|
|
|
if (quoted)
|
|
|
|
c = *p++;
|
|
|
|
arg->argv[arg->argc++] = p;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
/* now look for the end of this */
|
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 (quoted) {
|
|
|
|
while (*p && *p != c)
|
2015-01-22 11:40:55 +08:00
|
|
|
p++;
|
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
|
|
|
*p++ = '\0';
|
2015-01-22 11:40:55 +08:00
|
|
|
} else {
|
2016-02-14 20:02:15 +08:00
|
|
|
while (*p && !isspace(_UC(*p)))
|
2015-01-22 11:40:55 +08:00
|
|
|
p++;
|
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 (*p)
|
|
|
|
*p++ = '\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
|
|
|
arg->argv[arg->argc] = NULL;
|
2017-10-09 19:05:58 +08:00
|
|
|
return 1;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
1998-12-21 18:52:47 +08:00
|
|
|
|
|
|
|
#ifndef APP_INIT
|
1999-04-20 05:31:43 +08:00
|
|
|
int app_init(long mesgwin)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
2017-10-09 19:05:58 +08:00
|
|
|
return 1;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
1998-12-21 18:52:47 +08:00
|
|
|
#endif
|
1999-11-11 21:58:41 +08:00
|
|
|
|
2019-03-07 22:26:34 +08:00
|
|
|
int ctx_set_verify_locations(SSL_CTX *ctx,
|
|
|
|
const char *CAfile, int noCAfile,
|
|
|
|
const char *CApath, int noCApath,
|
|
|
|
const char *CAstore, int noCAstore)
|
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
|
|
|
{
|
2019-03-07 22:26:34 +08:00
|
|
|
if (CAfile == NULL && CApath == NULL && CAstore == NULL) {
|
2015-09-22 23:00:52 +08:00
|
|
|
if (!noCAfile && SSL_CTX_set_default_verify_file(ctx) <= 0)
|
|
|
|
return 0;
|
|
|
|
if (!noCApath && SSL_CTX_set_default_verify_dir(ctx) <= 0)
|
|
|
|
return 0;
|
2019-03-07 22:26:34 +08:00
|
|
|
if (!noCAstore && SSL_CTX_set_default_verify_store(ctx) <= 0)
|
|
|
|
return 0;
|
2015-09-22 23:00:52 +08:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
2019-03-07 22:26:34 +08:00
|
|
|
|
|
|
|
if (CAfile != NULL && !SSL_CTX_load_verify_file(ctx, CAfile))
|
|
|
|
return 0;
|
|
|
|
if (CApath != NULL && !SSL_CTX_load_verify_dir(ctx, CApath))
|
|
|
|
return 0;
|
|
|
|
if (CAstore != NULL && !SSL_CTX_load_verify_store(ctx, CAstore))
|
|
|
|
return 0;
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2016-03-11 07:10:02 +08:00
|
|
|
#ifndef OPENSSL_NO_CT
|
|
|
|
|
2016-03-02 21:34:05 +08:00
|
|
|
int ctx_set_ctlog_list_file(SSL_CTX *ctx, const char *path)
|
|
|
|
{
|
2017-06-13 01:24:02 +08:00
|
|
|
if (path == NULL)
|
2016-03-05 03:06:43 +08:00
|
|
|
return SSL_CTX_set_default_ctlog_list_file(ctx);
|
2016-03-02 21:34:05 +08:00
|
|
|
|
|
|
|
return SSL_CTX_set_ctlog_list_file(ctx, path);
|
|
|
|
}
|
|
|
|
|
2016-03-11 07:10:02 +08:00
|
|
|
#endif
|
|
|
|
|
2017-04-26 00:25:42 +08:00
|
|
|
static unsigned long nmflag = 0;
|
|
|
|
static char nmflag_set = 0;
|
|
|
|
|
|
|
|
int set_nameopt(const char *arg)
|
1999-11-12 09:42:25 +08:00
|
|
|
{
|
2017-04-26 00:25:42 +08:00
|
|
|
int ret = set_name_ex(&nmflag, arg);
|
|
|
|
|
|
|
|
if (ret)
|
|
|
|
nmflag_set = 1;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2002-11-13 23:43:43 +08:00
|
|
|
|
2017-04-26 00:25:42 +08:00
|
|
|
unsigned long get_nameopt(void)
|
|
|
|
{
|
|
|
|
return (nmflag_set) ? nmflag : XN_FLAG_ONELINE;
|
|
|
|
}
|
1999-11-12 09:42:25 +08:00
|
|
|
|
2017-04-26 00:25:42 +08:00
|
|
|
int dump_cert_text(BIO *out, X509 *x)
|
|
|
|
{
|
|
|
|
print_name(out, "subject=", X509_get_subject_name(x), get_nameopt());
|
|
|
|
BIO_puts(out, "\n");
|
|
|
|
print_name(out, "issuer=", X509_get_issuer_name(x), get_nameopt());
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_puts(out, "\n");
|
2002-11-13 23:43:43 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
return 0;
|
1999-11-12 09:42:25 +08:00
|
|
|
}
|
2000-02-17 07:16:01 +08:00
|
|
|
|
2018-12-12 01:31:55 +08:00
|
|
|
int wrap_password_callback(char *buf, int bufsiz, int verify, void *userdata)
|
|
|
|
{
|
|
|
|
return password_callback(buf, bufsiz, verify, (PW_CB_DATA *)userdata);
|
|
|
|
}
|
|
|
|
|
2018-08-16 10:36:01 +08:00
|
|
|
|
2016-08-05 05:52:22 +08:00
|
|
|
static char *app_get_pass(const char *arg, int keepbio);
|
2000-02-17 07:16:01 +08:00
|
|
|
|
2020-05-06 19:51:50 +08:00
|
|
|
char *get_passwd(const char *pass, const char *desc)
|
|
|
|
{
|
|
|
|
char *result = NULL;
|
|
|
|
|
|
|
|
if (desc == NULL)
|
|
|
|
desc = "<unknown>";
|
|
|
|
if (!app_passwd(pass, NULL, &result, NULL))
|
|
|
|
BIO_printf(bio_err, "Error getting password for %s\n", desc);
|
|
|
|
if (pass != NULL && result == NULL) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Trying plain input string (better precede with 'pass:')\n");
|
|
|
|
result = OPENSSL_strdup(pass);
|
|
|
|
if (result == NULL)
|
|
|
|
BIO_printf(bio_err, "Out of memory getting password for %s\n", desc);
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2016-08-05 05:52:22 +08:00
|
|
|
int app_passwd(const char *arg1, const char *arg2, char **pass1, char **pass2)
|
2000-02-17 07:16:01 +08:00
|
|
|
{
|
2018-12-12 01:31:55 +08:00
|
|
|
int same = arg1 != NULL && arg2 != NULL && strcmp(arg1, arg2) == 0;
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (arg1 != 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
|
|
|
*pass1 = app_get_pass(arg1, same);
|
2017-06-13 01:24:02 +08:00
|
|
|
if (*pass1 == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
return 0;
|
2017-06-13 01:24:02 +08:00
|
|
|
} else if (pass1 != NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
*pass1 = NULL;
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
|
|
|
if (arg2 != 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
|
|
|
*pass2 = app_get_pass(arg2, same ? 2 : 0);
|
2017-06-13 01:24:02 +08:00
|
|
|
if (*pass2 == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
return 0;
|
2017-06-13 01:24:02 +08:00
|
|
|
} else if (pass2 != NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
*pass2 = NULL;
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
return 1;
|
2000-02-17 07:16:01 +08:00
|
|
|
}
|
|
|
|
|
2016-08-05 05:52:22 +08:00
|
|
|
static char *app_get_pass(const char *arg, int keepbio)
|
2000-02-17 07:16:01 +08:00
|
|
|
{
|
2015-01-22 11:40:55 +08:00
|
|
|
static BIO *pwdbio = NULL;
|
2018-12-12 01:31:55 +08:00
|
|
|
char *tmp, tpass[APP_PASS_LEN];
|
2015-01-22 11:40:55 +08:00
|
|
|
int i;
|
2015-05-07 02:56:14 +08:00
|
|
|
|
2018-02-01 18:06:03 +08:00
|
|
|
/* PASS_SOURCE_SIZE_MAX = max number of chars before ':' in below strings */
|
2015-05-07 02:56:14 +08:00
|
|
|
if (strncmp(arg, "pass:", 5) == 0)
|
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
|
|
|
return OPENSSL_strdup(arg + 5);
|
2015-05-07 02:56:14 +08:00
|
|
|
if (strncmp(arg, "env:", 4) == 0) {
|
2015-01-22 11:40:55 +08:00
|
|
|
tmp = getenv(arg + 4);
|
2017-06-13 01:24:02 +08:00
|
|
|
if (tmp == NULL) {
|
2018-12-12 01:31:55 +08:00
|
|
|
BIO_printf(bio_err, "No environment variable %s\n", arg + 4);
|
2015-01-22 11:40:55 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
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
|
|
|
return OPENSSL_strdup(tmp);
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2017-06-13 01:24:02 +08:00
|
|
|
if (!keepbio || pwdbio == NULL) {
|
2015-05-07 02:56:14 +08:00
|
|
|
if (strncmp(arg, "file:", 5) == 0) {
|
2015-01-22 11:40:55 +08:00
|
|
|
pwdbio = BIO_new_file(arg + 5, "r");
|
2017-06-13 01:24:02 +08:00
|
|
|
if (pwdbio == 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 file %s\n", arg + 5);
|
2015-01-22 11:40:55 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
2005-11-03 23:31:28 +08:00
|
|
|
#if !defined(_WIN32)
|
2015-01-22 11:40:55 +08:00
|
|
|
/*
|
|
|
|
* Under _WIN32, which covers even Win64 and CE, file
|
|
|
|
* descriptors referenced by BIO_s_fd are not inherited
|
|
|
|
* by child process and therefore below is not an option.
|
|
|
|
* It could have been an option if bss_fd.c was operating
|
|
|
|
* on real Windows descriptors, such as those obtained
|
|
|
|
* with CreateFile.
|
|
|
|
*/
|
2015-05-07 02:56:14 +08:00
|
|
|
} else if (strncmp(arg, "fd:", 3) == 0) {
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO *btmp;
|
|
|
|
i = atoi(arg + 3);
|
|
|
|
if (i >= 0)
|
|
|
|
pwdbio = BIO_new_fd(i, BIO_NOCLOSE);
|
|
|
|
if ((i < 0) || !pwdbio) {
|
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 access file descriptor %s\n", arg + 3);
|
2015-01-22 11:40:55 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Can't do BIO_gets on an fd BIO so add a buffering BIO
|
|
|
|
*/
|
|
|
|
btmp = BIO_new(BIO_f_buffer());
|
|
|
|
pwdbio = BIO_push(btmp, pwdbio);
|
|
|
|
#endif
|
2015-05-07 02:56:14 +08:00
|
|
|
} else if (strcmp(arg, "stdin") == 0) {
|
2015-09-06 18:20:12 +08:00
|
|
|
pwdbio = dup_bio_in(FORMAT_TEXT);
|
2019-09-17 03:28:57 +08:00
|
|
|
if (pwdbio == 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 BIO for stdin\n");
|
2015-01-22 11:40:55 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
} else {
|
2018-02-01 18:06:03 +08:00
|
|
|
/* argument syntax error; do not reveal too much about arg */
|
|
|
|
tmp = strchr(arg, ':');
|
|
|
|
if (tmp == NULL || tmp - arg > PASS_SOURCE_SIZE_MAX)
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Invalid password argument, missing ':' within the first %d chars\n",
|
|
|
|
PASS_SOURCE_SIZE_MAX + 1);
|
|
|
|
else
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Invalid password argument, starting with \"%.*s\"\n",
|
|
|
|
(int)(tmp - arg + 1), arg);
|
2015-01-22 11:40:55 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
i = BIO_gets(pwdbio, tpass, APP_PASS_LEN);
|
|
|
|
if (keepbio != 1) {
|
|
|
|
BIO_free_all(pwdbio);
|
|
|
|
pwdbio = NULL;
|
|
|
|
}
|
|
|
|
if (i <= 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, "Error reading password from BIO\n");
|
2015-01-22 11:40:55 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
tmp = strchr(tpass, '\n');
|
2017-06-13 01:24:02 +08:00
|
|
|
if (tmp != NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
*tmp = 0;
|
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
|
|
|
return OPENSSL_strdup(tpass);
|
2000-02-17 07:16:01 +08:00
|
|
|
}
|
2000-06-23 01:42:50 +08:00
|
|
|
|
2020-10-15 17:55:50 +08:00
|
|
|
OSSL_LIB_CTX *app_get0_libctx(void)
|
2020-07-23 15:40:40 +08:00
|
|
|
{
|
|
|
|
return app_libctx;
|
|
|
|
}
|
|
|
|
|
2020-07-24 20:53:27 +08:00
|
|
|
/* TODO(3.0): Make this an environment variable if required */
|
|
|
|
const char *app_get0_propq(void)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2020-10-15 17:55:50 +08:00
|
|
|
OSSL_LIB_CTX *app_create_libctx(void)
|
2020-07-23 15:40:40 +08:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Load the NULL provider into the default library context and create a
|
|
|
|
* library context which will then be used for any OPT_PROV options.
|
|
|
|
*/
|
|
|
|
if (app_libctx == NULL) {
|
|
|
|
|
|
|
|
if (!app_provider_load(NULL, "null")) {
|
|
|
|
BIO_puts(bio_err, "Failed to create null provider\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
2020-10-15 17:55:50 +08:00
|
|
|
app_libctx = OSSL_LIB_CTX_new();
|
2020-07-23 15:40:40 +08:00
|
|
|
}
|
|
|
|
if (app_libctx == NULL)
|
|
|
|
BIO_puts(bio_err, "Failed to create library context\n");
|
|
|
|
return app_libctx;
|
|
|
|
}
|
|
|
|
|
2017-12-28 01:29:36 +08:00
|
|
|
CONF *app_load_config_bio(BIO *in, const char *filename)
|
2015-05-29 01:52:55 +08:00
|
|
|
{
|
|
|
|
long errorline = -1;
|
|
|
|
CONF *conf;
|
|
|
|
int i;
|
|
|
|
|
2020-09-24 17:42:23 +08:00
|
|
|
conf = NCONF_new_ex(app_libctx, NULL);
|
2015-05-29 01:52:55 +08:00
|
|
|
i = NCONF_load_bio(conf, in, &errorline);
|
|
|
|
if (i > 0)
|
|
|
|
return conf;
|
|
|
|
|
2017-12-28 01:29:36 +08:00
|
|
|
if (errorline <= 0) {
|
|
|
|
BIO_printf(bio_err, "%s: Can't load ", opt_getprog());
|
|
|
|
} else {
|
|
|
|
BIO_printf(bio_err, "%s: Error on line %ld of ", opt_getprog(),
|
|
|
|
errorline);
|
|
|
|
}
|
|
|
|
if (filename != NULL)
|
|
|
|
BIO_printf(bio_err, "config file \"%s\"\n", filename);
|
2015-05-29 01:52:55 +08:00
|
|
|
else
|
2017-12-28 01:29:36 +08:00
|
|
|
BIO_printf(bio_err, "config input");
|
|
|
|
|
2015-05-29 01:52:55 +08:00
|
|
|
NCONF_free(conf);
|
|
|
|
return NULL;
|
|
|
|
}
|
2017-06-13 01:24:02 +08:00
|
|
|
|
2015-05-29 14:07:10 +08:00
|
|
|
CONF *app_load_config(const char *filename)
|
|
|
|
{
|
|
|
|
BIO *in;
|
|
|
|
CONF *conf;
|
|
|
|
|
2015-09-04 18:49:06 +08:00
|
|
|
in = bio_open_default(filename, 'r', FORMAT_TEXT);
|
2015-05-29 14:07:10 +08:00
|
|
|
if (in == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2017-12-28 01:29:36 +08:00
|
|
|
conf = app_load_config_bio(in, filename);
|
2015-05-29 14:07:10 +08:00
|
|
|
BIO_free(in);
|
|
|
|
return conf;
|
|
|
|
}
|
2017-06-13 01:24:02 +08:00
|
|
|
|
2015-05-29 14:07:10 +08:00
|
|
|
CONF *app_load_config_quiet(const char *filename)
|
|
|
|
{
|
|
|
|
BIO *in;
|
|
|
|
CONF *conf;
|
|
|
|
|
2015-09-04 18:49:06 +08:00
|
|
|
in = bio_open_default_quiet(filename, 'r', FORMAT_TEXT);
|
2015-05-29 14:07:10 +08:00
|
|
|
if (in == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2017-12-28 01:29:36 +08:00
|
|
|
conf = app_load_config_bio(in, filename);
|
2015-05-29 14:07:10 +08:00
|
|
|
BIO_free(in);
|
|
|
|
return conf;
|
|
|
|
}
|
|
|
|
|
|
|
|
int app_load_modules(const CONF *config)
|
|
|
|
{
|
|
|
|
CONF *to_free = NULL;
|
|
|
|
|
|
|
|
if (config == NULL)
|
2016-05-04 04:40:33 +08:00
|
|
|
config = to_free = app_load_config_quiet(default_config_file);
|
2015-05-29 14:07:10 +08:00
|
|
|
if (config == NULL)
|
2016-05-04 04:40:33 +08:00
|
|
|
return 1;
|
2015-05-29 14:07:10 +08:00
|
|
|
|
|
|
|
if (CONF_modules_load(config, NULL, 0) <= 0) {
|
|
|
|
BIO_printf(bio_err, "Error configuring OpenSSL modules\n");
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
NCONF_free(to_free);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
NCONF_free(to_free);
|
|
|
|
return 1;
|
|
|
|
}
|
2015-05-29 01:52: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
|
|
|
int add_oid_section(CONF *conf)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
char *p;
|
|
|
|
STACK_OF(CONF_VALUE) *sktmp;
|
|
|
|
CONF_VALUE *cnf;
|
|
|
|
int i;
|
2015-05-07 01:43:59 +08:00
|
|
|
|
|
|
|
if ((p = NCONF_get_string(conf, NULL, "oid_section")) == NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
ERR_clear_error();
|
|
|
|
return 1;
|
|
|
|
}
|
2015-05-07 01:43:59 +08:00
|
|
|
if ((sktmp = NCONF_get_section(conf, p)) == 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, "problem loading oid section %s\n", p);
|
2015-01-22 11:40:55 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
for (i = 0; i < sk_CONF_VALUE_num(sktmp); i++) {
|
|
|
|
cnf = sk_CONF_VALUE_value(sktmp, i);
|
|
|
|
if (OBJ_create(cnf->value, cnf->name, cnf->name) == NID_undef) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
BIO_printf(bio_err, "problem creating object %s=%s\n",
|
2015-01-22 11:40:55 +08:00
|
|
|
cnf->name, cnf->value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 1;
|
2000-06-23 06:07:27 +08:00
|
|
|
}
|
|
|
|
|
2020-07-23 15:40:40 +08:00
|
|
|
CONF *app_load_config_modules(const char *configfile)
|
|
|
|
{
|
|
|
|
CONF *conf = NULL;
|
|
|
|
|
|
|
|
if (configfile != NULL) {
|
|
|
|
BIO_printf(bio_err, "Using configuration from %s\n", configfile);
|
|
|
|
|
|
|
|
if ((conf = app_load_config(configfile)) == NULL)
|
|
|
|
return NULL;
|
|
|
|
if (configfile != default_config_file && !app_load_modules(conf)) {
|
|
|
|
NCONF_free(conf);
|
|
|
|
conf = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return conf;
|
|
|
|
}
|
|
|
|
|
2020-12-11 00:10:52 +08:00
|
|
|
#define IS_HTTP(uri) ((uri) != NULL \
|
|
|
|
&& strncmp(uri, OSSL_HTTP_PREFIX, strlen(OSSL_HTTP_PREFIX)) == 0)
|
|
|
|
#define IS_HTTPS(uri) ((uri) != NULL \
|
|
|
|
&& strncmp(uri, OSSL_HTTPS_PREFIX, strlen(OSSL_HTTPS_PREFIX)) == 0)
|
2020-11-14 01:47:03 +08:00
|
|
|
|
2020-05-06 19:51:50 +08:00
|
|
|
X509 *load_cert_pass(const char *uri, int maybe_stdin,
|
|
|
|
const char *pass, const char *desc)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
2020-05-06 19:51:50 +08:00
|
|
|
X509 *cert = NULL;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2020-05-06 19:51:50 +08:00
|
|
|
if (desc == NULL)
|
|
|
|
desc = "certificate";
|
2020-11-14 01:47:03 +08:00
|
|
|
if (IS_HTTPS(uri))
|
|
|
|
BIO_printf(bio_err, "Loading %s over HTTPS is unsupported\n", desc);
|
|
|
|
else if (IS_HTTP(uri))
|
|
|
|
cert = X509_load_http(uri, NULL, NULL, 0 /* timeout */);
|
|
|
|
else
|
|
|
|
(void)load_key_certs_crls(uri, maybe_stdin, pass, desc,
|
|
|
|
NULL, NULL, NULL, &cert, NULL, NULL, NULL);
|
2020-05-06 19:51:50 +08:00
|
|
|
if (cert == NULL) {
|
2020-04-22 20:58:41 +08:00
|
|
|
BIO_printf(bio_err, "Unable to load %s\n", 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
|
|
|
ERR_print_errors(bio_err);
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2020-05-06 19:51:50 +08:00
|
|
|
return cert;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2000-06-23 01:42:50 +08:00
|
|
|
|
2020-10-24 22:31:57 +08:00
|
|
|
X509_CRL *load_crl(const char *uri, const char *desc)
|
2020-05-06 19:51:50 +08:00
|
|
|
{
|
|
|
|
X509_CRL *crl = NULL;
|
2017-12-16 03:50:37 +08:00
|
|
|
|
2020-05-06 19:51:50 +08:00
|
|
|
if (desc == NULL)
|
|
|
|
desc = "CRL";
|
2020-11-14 01:47:03 +08:00
|
|
|
if (IS_HTTPS(uri))
|
|
|
|
BIO_printf(bio_err, "Loading %s over HTTPS is unsupported\n", desc);
|
|
|
|
else if (IS_HTTP(uri))
|
|
|
|
crl = X509_CRL_load_http(uri, NULL, NULL, 0 /* timeout */);
|
|
|
|
else
|
|
|
|
(void)load_key_certs_crls(uri, 0, NULL, desc,
|
|
|
|
NULL, NULL, NULL, NULL, NULL, &crl, NULL);
|
2020-05-06 19:51:50 +08:00
|
|
|
if (crl == NULL) {
|
2020-04-22 20:58:41 +08:00
|
|
|
BIO_printf(bio_err, "Unable to load %s\n", desc);
|
2015-01-22 11:40:55 +08:00
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
}
|
2020-05-06 19:51:50 +08:00
|
|
|
return crl;
|
2017-12-16 03:50:37 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
X509_REQ *load_csr(const char *file, int format, const char *desc)
|
|
|
|
{
|
|
|
|
X509_REQ *req = NULL;
|
|
|
|
BIO *in;
|
|
|
|
|
2020-05-06 19:51:50 +08:00
|
|
|
if (desc == NULL)
|
|
|
|
desc = "CSR";
|
2017-12-16 03:50:37 +08:00
|
|
|
in = bio_open_default(file, 'r', format);
|
|
|
|
if (in == NULL)
|
|
|
|
goto end;
|
|
|
|
|
|
|
|
if (format == FORMAT_ASN1)
|
|
|
|
req = d2i_X509_REQ_bio(in, NULL);
|
|
|
|
else if (format == FORMAT_PEM)
|
|
|
|
req = PEM_read_bio_X509_REQ(in, NULL, NULL, NULL);
|
2017-12-27 02:33:04 +08:00
|
|
|
else
|
2017-12-23 02:50:17 +08:00
|
|
|
print_format_error(format, OPT_FMT_PEMDER);
|
2012-12-03 00:16:28 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
end:
|
2020-05-06 19:51:50 +08:00
|
|
|
if (req == NULL) {
|
2020-04-22 20:58:41 +08:00
|
|
|
BIO_printf(bio_err, "Unable to load %s\n", desc);
|
2017-12-16 03:50:37 +08:00
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_free(in);
|
2017-12-16 03:50:37 +08:00
|
|
|
return req;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2012-12-03 00:16:28 +08:00
|
|
|
|
2020-05-06 19:51:50 +08:00
|
|
|
void cleanse(char *str)
|
|
|
|
{
|
|
|
|
if (str != NULL)
|
|
|
|
OPENSSL_cleanse(str, strlen(str));
|
|
|
|
}
|
|
|
|
|
|
|
|
void clear_free(char *str)
|
|
|
|
{
|
|
|
|
if (str != NULL)
|
|
|
|
OPENSSL_clear_free(str, strlen(str));
|
|
|
|
}
|
|
|
|
|
|
|
|
EVP_PKEY *load_key(const char *uri, int format, int may_stdin,
|
2017-12-16 03:50:37 +08:00
|
|
|
const char *pass, ENGINE *e, const char *desc)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
EVP_PKEY *pkey = NULL;
|
2020-11-30 14:25:46 +08:00
|
|
|
char *allocated_uri = NULL;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2020-05-06 19:51:50 +08:00
|
|
|
if (desc == NULL)
|
|
|
|
desc = "private key";
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
if (format == FORMAT_ENGINE) {
|
2020-11-30 14:25:46 +08:00
|
|
|
uri = allocated_uri = make_engine_uri(e, uri, desc);
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2020-11-30 14:25:46 +08:00
|
|
|
(void)load_key_certs_crls(uri, may_stdin, pass, desc,
|
|
|
|
&pkey, NULL, NULL, NULL, NULL, NULL, NULL);
|
2017-12-27 02:33:04 +08:00
|
|
|
|
2020-11-30 14:25:46 +08:00
|
|
|
OPENSSL_free(allocated_uri);
|
2017-10-17 22:04:09 +08:00
|
|
|
return pkey;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2000-06-23 01:42:50 +08:00
|
|
|
|
2020-05-06 19:51:50 +08:00
|
|
|
EVP_PKEY *load_pubkey(const char *uri, int format, int maybe_stdin,
|
2017-12-16 03:50:37 +08:00
|
|
|
const char *pass, ENGINE *e, const char *desc)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
EVP_PKEY *pkey = NULL;
|
2020-11-30 14:25:46 +08:00
|
|
|
char *allocated_uri = NULL;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2020-05-06 19:51:50 +08:00
|
|
|
if (desc == NULL)
|
|
|
|
desc = "public key";
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
if (format == FORMAT_ENGINE) {
|
2020-11-30 14:25:46 +08:00
|
|
|
uri = allocated_uri = make_engine_uri(e, uri, desc);
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
2020-11-30 14:25:46 +08:00
|
|
|
(void)load_key_certs_crls(uri, maybe_stdin, pass, desc,
|
|
|
|
NULL, &pkey, NULL, NULL, NULL, NULL, NULL);
|
2020-11-09 18:48:56 +08:00
|
|
|
|
2020-11-30 14:25:46 +08:00
|
|
|
OPENSSL_free(allocated_uri);
|
2017-10-17 22:04:09 +08:00
|
|
|
return pkey;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2000-09-04 07:13:48 +08:00
|
|
|
|
2020-11-04 22:20:36 +08:00
|
|
|
EVP_PKEY *load_keyparams(const char *uri, int maybe_stdin, const char *keytype,
|
|
|
|
const char *desc)
|
2020-10-20 17:56:22 +08:00
|
|
|
{
|
|
|
|
EVP_PKEY *params = NULL;
|
|
|
|
|
|
|
|
if (desc == NULL)
|
|
|
|
desc = "key parameters";
|
|
|
|
|
|
|
|
(void)load_key_certs_crls(uri, maybe_stdin, NULL, desc,
|
|
|
|
NULL, NULL, ¶ms, NULL, NULL, NULL, NULL);
|
2020-11-04 22:20:36 +08:00
|
|
|
if (params != NULL && keytype != NULL && !EVP_PKEY_is_a(params, keytype)) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Unable to load %s from %s (unexpected parameters type)\n",
|
|
|
|
desc, uri);
|
2020-10-20 17:56:22 +08:00
|
|
|
ERR_print_errors(bio_err);
|
2020-11-04 22:20:36 +08:00
|
|
|
EVP_PKEY_free(params);
|
|
|
|
params = NULL;
|
2020-10-20 17:56:22 +08:00
|
|
|
}
|
|
|
|
return params;
|
|
|
|
}
|
|
|
|
|
2020-05-28 19:53:48 +08:00
|
|
|
void app_bail_out(char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list args;
|
|
|
|
|
|
|
|
va_start(args, fmt);
|
|
|
|
BIO_vprintf(bio_err, fmt, args);
|
|
|
|
va_end(args);
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2015-05-01 05:48:31 +08:00
|
|
|
void* app_malloc(int sz, const char *what)
|
|
|
|
{
|
|
|
|
void *vp = OPENSSL_malloc(sz);
|
|
|
|
|
2020-05-28 19:53:48 +08:00
|
|
|
if (vp == NULL)
|
|
|
|
app_bail_out("%s: Could not allocate %d bytes for %s\n",
|
|
|
|
opt_getprog(), sz, what);
|
2015-05-01 05:48:31 +08:00
|
|
|
return vp;
|
|
|
|
}
|
|
|
|
|
2016-01-16 13:08:38 +08:00
|
|
|
/*
|
2016-06-29 04:51:51 +08:00
|
|
|
* Initialize or extend, if *certs != NULL, a certificate stack.
|
2020-08-30 19:25:40 +08:00
|
|
|
* The caller is responsible for freeing *certs if its value is left not NULL.
|
2016-01-16 13:08:38 +08:00
|
|
|
*/
|
2020-08-15 03:58:34 +08:00
|
|
|
int load_certs(const char *uri, STACK_OF(X509) **certs,
|
2016-02-14 11:33:56 +08:00
|
|
|
const char *pass, const char *desc)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
2020-08-30 19:25:40 +08:00
|
|
|
int was_NULL = *certs == NULL;
|
2020-10-20 17:56:22 +08:00
|
|
|
int ret = load_key_certs_crls(uri, 0, pass, desc, NULL, NULL, NULL,
|
2020-08-30 19:25:40 +08:00
|
|
|
NULL, certs, NULL, NULL);
|
|
|
|
|
|
|
|
if (!ret && was_NULL) {
|
|
|
|
sk_X509_pop_free(*certs, X509_free);
|
|
|
|
*certs = NULL;
|
|
|
|
}
|
|
|
|
return ret;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2009-10-31 21:33:57 +08:00
|
|
|
|
2016-01-16 13:08:38 +08:00
|
|
|
/*
|
2016-06-29 04:51:51 +08:00
|
|
|
* Initialize or extend, if *crls != NULL, a certificate stack.
|
2020-08-30 19:25:40 +08:00
|
|
|
* The caller is responsible for freeing *crls if its value is left not NULL.
|
2016-01-16 13:08:38 +08:00
|
|
|
*/
|
2020-08-15 03:58:34 +08:00
|
|
|
int load_crls(const char *uri, STACK_OF(X509_CRL) **crls,
|
2016-02-14 11:33:56 +08:00
|
|
|
const char *pass, const char *desc)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
2020-08-30 19:25:40 +08:00
|
|
|
int was_NULL = *crls == NULL;
|
2020-10-20 17:56:22 +08:00
|
|
|
int ret = load_key_certs_crls(uri, 0, pass, desc, NULL, NULL, NULL,
|
2020-08-30 19:25:40 +08:00
|
|
|
NULL, NULL, NULL, crls);
|
|
|
|
|
|
|
|
if (!ret && was_NULL) {
|
|
|
|
sk_X509_CRL_pop_free(*crls, X509_CRL_free);
|
|
|
|
*crls = NULL;
|
|
|
|
}
|
|
|
|
return ret;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
2020-05-06 19:51:50 +08:00
|
|
|
/*
|
|
|
|
* Load those types of credentials for which the result pointer is not NULL.
|
|
|
|
* Reads from stdio if uri is NULL and maybe_stdin is nonzero.
|
2020-08-15 03:58:34 +08:00
|
|
|
* For non-NULL ppkey, pcert, and pcrl the first suitable value found is loaded.
|
|
|
|
* If pcerts is non-NULL and *pcerts == NULL then a new cert list is allocated.
|
|
|
|
* If pcerts is non-NULL then all available certificates are appended to *pcerts
|
|
|
|
* except any certificate assigned to *pcert.
|
|
|
|
* If pcrls is non-NULL and *pcrls == NULL then a new list of CRLs is allocated.
|
|
|
|
* If pcrls is non-NULL then all available CRLs are appended to *pcerts
|
|
|
|
* except any CRL assigned to *pcrl.
|
|
|
|
* In any case (also on error) the caller is responsible for freeing all members
|
|
|
|
* of *pcerts and *pcrls (as far as they are not NULL).
|
2020-05-06 19:51:50 +08:00
|
|
|
*/
|
2020-08-15 03:58:34 +08:00
|
|
|
int load_key_certs_crls(const char *uri, int maybe_stdin,
|
|
|
|
const char *pass, const char *desc,
|
|
|
|
EVP_PKEY **ppkey, EVP_PKEY **ppubkey,
|
2020-10-20 17:56:22 +08:00
|
|
|
EVP_PKEY **pparams,
|
2020-08-15 03:58:34 +08:00
|
|
|
X509 **pcert, STACK_OF(X509) **pcerts,
|
|
|
|
X509_CRL **pcrl, STACK_OF(X509_CRL) **pcrls)
|
2020-05-06 19:51:50 +08:00
|
|
|
{
|
|
|
|
PW_CB_DATA uidata;
|
|
|
|
OSSL_STORE_CTX *ctx = NULL;
|
2020-10-15 17:55:50 +08:00
|
|
|
OSSL_LIB_CTX *libctx = app_get0_libctx();
|
2020-07-24 20:53:27 +08:00
|
|
|
const char *propq = app_get0_propq();
|
2020-08-15 03:58:34 +08:00
|
|
|
int ncerts = 0;
|
|
|
|
int ncrls = 0;
|
2020-09-17 07:39:00 +08:00
|
|
|
const char *failed =
|
|
|
|
ppkey != NULL ? "key" : ppubkey != NULL ? "public key" :
|
2020-11-04 22:20:36 +08:00
|
|
|
pparams != NULL ? "params" : pcert != NULL ? "cert" :
|
|
|
|
pcrl != NULL ? "CRL" : pcerts != NULL ? "certs" :
|
|
|
|
pcrls != NULL ? "CRLs" : NULL;
|
2020-11-30 14:25:46 +08:00
|
|
|
int cnt_expectations = 0;
|
|
|
|
int expect = 0;
|
2020-05-06 19:51:50 +08:00
|
|
|
/* TODO make use of the engine reference 'eng' when loading pkeys */
|
|
|
|
|
2020-11-30 14:25:46 +08:00
|
|
|
if (ppkey != NULL) {
|
2020-05-06 19:51:50 +08:00
|
|
|
*ppkey = NULL;
|
2020-11-30 14:25:46 +08:00
|
|
|
cnt_expectations++;
|
|
|
|
expect = OSSL_STORE_INFO_PKEY;
|
|
|
|
}
|
|
|
|
if (ppubkey != NULL) {
|
2020-07-30 16:09:43 +08:00
|
|
|
*ppubkey = NULL;
|
2020-11-30 14:25:46 +08:00
|
|
|
cnt_expectations++;
|
|
|
|
expect = OSSL_STORE_INFO_PUBKEY;
|
|
|
|
}
|
|
|
|
if (pcert != NULL) {
|
2020-05-06 19:51:50 +08:00
|
|
|
*pcert = NULL;
|
2020-11-30 14:25:46 +08:00
|
|
|
cnt_expectations++;
|
|
|
|
expect = OSSL_STORE_INFO_CERT;
|
|
|
|
}
|
2020-09-17 07:39:00 +08:00
|
|
|
if (failed == NULL) {
|
|
|
|
BIO_printf(bio_err, "Internal error: nothing to load into from %s\n",
|
|
|
|
uri != NULL ? uri : "<stdin>");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2020-08-15 03:58:34 +08:00
|
|
|
if (pcerts != NULL && *pcerts == NULL
|
|
|
|
&& (*pcerts = sk_X509_new_null()) == NULL) {
|
2020-09-17 07:39:00 +08:00
|
|
|
BIO_printf(bio_err, "Out of memory loading");
|
2020-08-28 17:57:18 +08:00
|
|
|
goto end;
|
2020-11-30 14:25:46 +08:00
|
|
|
} else {
|
|
|
|
cnt_expectations++;
|
|
|
|
expect = OSSL_STORE_INFO_CERT;
|
2020-08-15 03:58:34 +08:00
|
|
|
}
|
2020-11-30 14:25:46 +08:00
|
|
|
if (pcrl != NULL) {
|
2020-05-06 19:51:50 +08:00
|
|
|
*pcrl = NULL;
|
2020-11-30 14:25:46 +08:00
|
|
|
cnt_expectations++;
|
|
|
|
expect = OSSL_STORE_INFO_CRL;
|
|
|
|
}
|
2020-08-15 03:58:34 +08:00
|
|
|
if (pcrls != NULL && *pcrls == NULL
|
|
|
|
&& (*pcrls = sk_X509_CRL_new_null()) == NULL) {
|
2020-09-17 07:39:00 +08:00
|
|
|
BIO_printf(bio_err, "Out of memory loading");
|
2020-08-28 17:57:18 +08:00
|
|
|
goto end;
|
2020-11-30 14:25:46 +08:00
|
|
|
} else {
|
|
|
|
cnt_expectations++;
|
|
|
|
expect = OSSL_STORE_INFO_CRL;
|
2020-08-15 03:58:34 +08:00
|
|
|
}
|
2020-05-06 19:51:50 +08:00
|
|
|
|
|
|
|
uidata.password = pass;
|
|
|
|
uidata.prompt_info = uri;
|
|
|
|
|
|
|
|
if (uri == NULL) {
|
|
|
|
BIO *bio;
|
|
|
|
|
|
|
|
if (!maybe_stdin) {
|
2020-09-17 07:39:00 +08:00
|
|
|
BIO_printf(bio_err, "No filename or uri specified for loading");
|
2020-05-06 19:51:50 +08:00
|
|
|
goto end;
|
|
|
|
}
|
2020-09-17 07:39:00 +08:00
|
|
|
uri = "<stdin>";
|
2020-05-06 19:51:50 +08:00
|
|
|
unbuffer(stdin);
|
|
|
|
bio = BIO_new_fp(stdin, 0);
|
|
|
|
if (bio != NULL)
|
2020-07-24 20:53:27 +08:00
|
|
|
ctx = OSSL_STORE_attach(bio, "file", libctx, propq,
|
2020-05-06 19:51:50 +08:00
|
|
|
get_ui_method(), &uidata, NULL, NULL);
|
|
|
|
} else {
|
2020-09-24 17:42:23 +08:00
|
|
|
ctx = OSSL_STORE_open_ex(uri, libctx, propq, get_ui_method(), &uidata,
|
|
|
|
NULL, NULL);
|
2020-05-06 19:51:50 +08:00
|
|
|
}
|
|
|
|
if (ctx == NULL) {
|
2020-09-17 07:39:00 +08:00
|
|
|
BIO_printf(bio_err, "Could not open file or uri for loading");
|
2020-05-06 19:51:50 +08:00
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
2020-11-30 14:25:46 +08:00
|
|
|
if (cnt_expectations != 1)
|
|
|
|
expect = 0;
|
|
|
|
if (!OSSL_STORE_expect(ctx, expect))
|
|
|
|
goto end;
|
|
|
|
|
2020-08-28 17:57:18 +08:00
|
|
|
failed = NULL;
|
2020-08-15 03:58:34 +08:00
|
|
|
while (!OSSL_STORE_eof(ctx)) {
|
2020-05-06 19:51:50 +08:00
|
|
|
OSSL_STORE_INFO *info = OSSL_STORE_load(ctx);
|
2020-09-17 07:39:00 +08:00
|
|
|
int type, ok = 1;
|
2020-05-06 19:51:50 +08:00
|
|
|
|
2020-09-17 07:39:00 +08:00
|
|
|
if (info == NULL)
|
|
|
|
break;
|
|
|
|
type = OSSL_STORE_INFO_get_type(info);
|
2020-05-06 19:51:50 +08:00
|
|
|
switch (type) {
|
|
|
|
case OSSL_STORE_INFO_PKEY:
|
|
|
|
if (ppkey != NULL && *ppkey == NULL)
|
2020-08-15 03:58:34 +08:00
|
|
|
ok = (*ppkey = OSSL_STORE_INFO_get1_PKEY(info)) != NULL;
|
2020-07-30 16:09:43 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* An EVP_PKEY with private parts also holds the public parts,
|
|
|
|
* so if the caller asked for a public key, and we got a private
|
|
|
|
* key, we can still pass it back.
|
|
|
|
*/
|
2020-08-15 03:58:34 +08:00
|
|
|
if (ok && ppubkey != NULL && *ppubkey == NULL)
|
|
|
|
ok = ((*ppubkey = OSSL_STORE_INFO_get1_PKEY(info)) != NULL);
|
2020-07-30 16:09:43 +08:00
|
|
|
break;
|
|
|
|
case OSSL_STORE_INFO_PUBKEY:
|
|
|
|
if (ppubkey != NULL && *ppubkey == NULL)
|
2020-08-15 03:58:34 +08:00
|
|
|
ok = ((*ppubkey = OSSL_STORE_INFO_get1_PUBKEY(info)) != NULL);
|
2020-05-06 19:51:50 +08:00
|
|
|
break;
|
2020-10-20 17:56:22 +08:00
|
|
|
case OSSL_STORE_INFO_PARAMS:
|
|
|
|
if (pparams != NULL && *pparams == NULL)
|
|
|
|
ok = ((*pparams = OSSL_STORE_INFO_get1_PARAMS(info)) != NULL);
|
|
|
|
break;
|
2020-05-06 19:51:50 +08:00
|
|
|
case OSSL_STORE_INFO_CERT:
|
|
|
|
if (pcert != NULL && *pcert == NULL)
|
2020-08-15 03:58:34 +08:00
|
|
|
ok = (*pcert = OSSL_STORE_INFO_get1_CERT(info)) != NULL;
|
|
|
|
else if (pcerts != NULL)
|
|
|
|
ok = X509_add_cert(*pcerts,
|
|
|
|
OSSL_STORE_INFO_get1_CERT(info),
|
|
|
|
X509_ADD_FLAG_DEFAULT);
|
|
|
|
ncerts += ok;
|
2020-05-06 19:51:50 +08:00
|
|
|
break;
|
|
|
|
case OSSL_STORE_INFO_CRL:
|
|
|
|
if (pcrl != NULL && *pcrl == NULL)
|
2020-08-15 03:58:34 +08:00
|
|
|
ok = (*pcrl = OSSL_STORE_INFO_get1_CRL(info)) != NULL;
|
|
|
|
else if (pcrls != NULL)
|
|
|
|
ok = sk_X509_CRL_push(*pcrls, OSSL_STORE_INFO_get1_CRL(info));
|
|
|
|
ncrls += ok;
|
2020-05-06 19:51:50 +08:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* skip any other type */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
OSSL_STORE_INFO_free(info);
|
2020-08-15 03:58:34 +08:00
|
|
|
if (!ok) {
|
|
|
|
failed = info == NULL ? NULL : OSSL_STORE_INFO_type_string(type);
|
2020-09-17 07:39:00 +08:00
|
|
|
BIO_printf(bio_err, "Error reading");
|
2020-05-06 19:51:50 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
end:
|
|
|
|
OSSL_STORE_close(ctx);
|
2020-08-28 17:57:18 +08:00
|
|
|
if (failed == NULL) {
|
2020-09-17 07:39:00 +08:00
|
|
|
int any = 0;
|
|
|
|
|
2020-10-20 17:56:22 +08:00
|
|
|
if ((ppkey != NULL && *ppkey == NULL)
|
|
|
|
|| (ppubkey != NULL && *ppubkey == NULL)) {
|
2020-08-28 17:57:18 +08:00
|
|
|
failed = "key";
|
2020-10-20 17:56:22 +08:00
|
|
|
} else if (pparams != NULL && *pparams == NULL) {
|
|
|
|
failed = "params";
|
2020-09-17 07:39:00 +08:00
|
|
|
} else if ((pcert != NULL || pcerts != NULL) && ncerts == 0) {
|
|
|
|
if (pcert == NULL)
|
|
|
|
any = 1;
|
2020-08-28 17:57:18 +08:00
|
|
|
failed = "cert";
|
2020-09-17 07:39:00 +08:00
|
|
|
} else if ((pcrl != NULL || pcrls != NULL) && ncrls == 0) {
|
|
|
|
if (pcrl == NULL)
|
|
|
|
any = 1;
|
2020-08-28 17:57:18 +08:00
|
|
|
failed = "CRL";
|
2020-09-17 07:39:00 +08:00
|
|
|
}
|
2020-08-28 17:57:18 +08:00
|
|
|
if (failed != NULL)
|
2020-09-17 07:39:00 +08:00
|
|
|
BIO_printf(bio_err, "Could not read");
|
|
|
|
if (any)
|
|
|
|
BIO_printf(bio_err, " any");
|
2020-08-15 03:58:34 +08:00
|
|
|
}
|
2020-09-17 07:39:00 +08:00
|
|
|
if (failed != NULL) {
|
|
|
|
if (desc != NULL && strstr(desc, failed) != NULL) {
|
|
|
|
BIO_printf(bio_err, " %s", desc);
|
|
|
|
} else {
|
|
|
|
BIO_printf(bio_err, " %s", failed);
|
|
|
|
if (desc != NULL)
|
|
|
|
BIO_printf(bio_err, " of %s", desc);
|
|
|
|
}
|
|
|
|
if (uri != NULL)
|
|
|
|
BIO_printf(bio_err, " from %s", uri);
|
|
|
|
BIO_printf(bio_err, "\n");
|
2020-08-28 17:57:18 +08:00
|
|
|
ERR_print_errors(bio_err);
|
2020-09-17 07:39:00 +08:00
|
|
|
}
|
2020-08-15 03:58:34 +08:00
|
|
|
return failed == NULL;
|
2020-05-06 19:51:50 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
#define X509V3_EXT_UNKNOWN_MASK (0xfL << 16)
|
2000-10-06 19:51:47 +08:00
|
|
|
/* Return error for unknown extensions */
|
2015-01-22 11:40:55 +08:00
|
|
|
#define X509V3_EXT_DEFAULT 0
|
2000-10-06 19:51:47 +08:00
|
|
|
/* Print error for unknown extensions */
|
2015-01-22 11:40:55 +08:00
|
|
|
#define X509V3_EXT_ERROR_UNKNOWN (1L << 16)
|
2000-10-06 19:51:47 +08:00
|
|
|
/* ASN1 parse unknown extensions */
|
2015-01-22 11:40:55 +08:00
|
|
|
#define X509V3_EXT_PARSE_UNKNOWN (2L << 16)
|
2000-10-06 19:51:47 +08:00
|
|
|
/* BIO_dump unknown extensions */
|
2015-01-22 11:40:55 +08:00
|
|
|
#define X509V3_EXT_DUMP_UNKNOWN (3L << 16)
|
2000-10-06 19:51:47 +08:00
|
|
|
|
2001-03-16 03:13:40 +08:00
|
|
|
#define X509_FLAG_CA (X509_FLAG_NO_ISSUER | X509_FLAG_NO_PUBKEY | \
|
2015-01-22 11:40:55 +08:00
|
|
|
X509_FLAG_NO_HEADER | X509_FLAG_NO_VERSION)
|
2001-03-16 03:13:40 +08:00
|
|
|
|
2000-10-06 19:51:47 +08:00
|
|
|
int set_cert_ex(unsigned long *flags, const char *arg)
|
|
|
|
{
|
2015-01-22 11:40:55 +08:00
|
|
|
static const NAME_EX_TBL cert_tbl[] = {
|
|
|
|
{"compatible", X509_FLAG_COMPAT, 0xffffffffl},
|
|
|
|
{"ca_default", X509_FLAG_CA, 0xffffffffl},
|
|
|
|
{"no_header", X509_FLAG_NO_HEADER, 0},
|
|
|
|
{"no_version", X509_FLAG_NO_VERSION, 0},
|
|
|
|
{"no_serial", X509_FLAG_NO_SERIAL, 0},
|
|
|
|
{"no_signame", X509_FLAG_NO_SIGNAME, 0},
|
|
|
|
{"no_validity", X509_FLAG_NO_VALIDITY, 0},
|
|
|
|
{"no_subject", X509_FLAG_NO_SUBJECT, 0},
|
|
|
|
{"no_issuer", X509_FLAG_NO_ISSUER, 0},
|
|
|
|
{"no_pubkey", X509_FLAG_NO_PUBKEY, 0},
|
|
|
|
{"no_extensions", X509_FLAG_NO_EXTENSIONS, 0},
|
|
|
|
{"no_sigdump", X509_FLAG_NO_SIGDUMP, 0},
|
|
|
|
{"no_aux", X509_FLAG_NO_AUX, 0},
|
|
|
|
{"no_attributes", X509_FLAG_NO_ATTRIBUTES, 0},
|
|
|
|
{"ext_default", X509V3_EXT_DEFAULT, X509V3_EXT_UNKNOWN_MASK},
|
|
|
|
{"ext_error", X509V3_EXT_ERROR_UNKNOWN, X509V3_EXT_UNKNOWN_MASK},
|
|
|
|
{"ext_parse", X509V3_EXT_PARSE_UNKNOWN, X509V3_EXT_UNKNOWN_MASK},
|
|
|
|
{"ext_dump", X509V3_EXT_DUMP_UNKNOWN, X509V3_EXT_UNKNOWN_MASK},
|
|
|
|
{NULL, 0, 0}
|
|
|
|
};
|
|
|
|
return set_multi_opts(flags, arg, cert_tbl);
|
2000-10-06 19:51:47 +08:00
|
|
|
}
|
2000-07-28 09:58:15 +08:00
|
|
|
|
|
|
|
int set_name_ex(unsigned long *flags, const char *arg)
|
|
|
|
{
|
2015-01-22 11:40:55 +08:00
|
|
|
static const NAME_EX_TBL ex_tbl[] = {
|
|
|
|
{"esc_2253", ASN1_STRFLGS_ESC_2253, 0},
|
2016-05-18 23:14:19 +08:00
|
|
|
{"esc_2254", ASN1_STRFLGS_ESC_2254, 0},
|
2015-01-22 11:40:55 +08:00
|
|
|
{"esc_ctrl", ASN1_STRFLGS_ESC_CTRL, 0},
|
|
|
|
{"esc_msb", ASN1_STRFLGS_ESC_MSB, 0},
|
|
|
|
{"use_quote", ASN1_STRFLGS_ESC_QUOTE, 0},
|
|
|
|
{"utf8", ASN1_STRFLGS_UTF8_CONVERT, 0},
|
|
|
|
{"ignore_type", ASN1_STRFLGS_IGNORE_TYPE, 0},
|
|
|
|
{"show_type", ASN1_STRFLGS_SHOW_TYPE, 0},
|
|
|
|
{"dump_all", ASN1_STRFLGS_DUMP_ALL, 0},
|
|
|
|
{"dump_nostr", ASN1_STRFLGS_DUMP_UNKNOWN, 0},
|
|
|
|
{"dump_der", ASN1_STRFLGS_DUMP_DER, 0},
|
|
|
|
{"compat", XN_FLAG_COMPAT, 0xffffffffL},
|
|
|
|
{"sep_comma_plus", XN_FLAG_SEP_COMMA_PLUS, XN_FLAG_SEP_MASK},
|
|
|
|
{"sep_comma_plus_space", XN_FLAG_SEP_CPLUS_SPC, XN_FLAG_SEP_MASK},
|
|
|
|
{"sep_semi_plus_space", XN_FLAG_SEP_SPLUS_SPC, XN_FLAG_SEP_MASK},
|
|
|
|
{"sep_multiline", XN_FLAG_SEP_MULTILINE, XN_FLAG_SEP_MASK},
|
|
|
|
{"dn_rev", XN_FLAG_DN_REV, 0},
|
|
|
|
{"nofname", XN_FLAG_FN_NONE, XN_FLAG_FN_MASK},
|
|
|
|
{"sname", XN_FLAG_FN_SN, XN_FLAG_FN_MASK},
|
|
|
|
{"lname", XN_FLAG_FN_LN, XN_FLAG_FN_MASK},
|
|
|
|
{"align", XN_FLAG_FN_ALIGN, 0},
|
|
|
|
{"oid", XN_FLAG_FN_OID, XN_FLAG_FN_MASK},
|
|
|
|
{"space_eq", XN_FLAG_SPC_EQ, 0},
|
|
|
|
{"dump_unknown", XN_FLAG_DUMP_UNKNOWN_FIELDS, 0},
|
|
|
|
{"RFC2253", XN_FLAG_RFC2253, 0xffffffffL},
|
|
|
|
{"oneline", XN_FLAG_ONELINE, 0xffffffffL},
|
|
|
|
{"multiline", XN_FLAG_MULTILINE, 0xffffffffL},
|
|
|
|
{"ca_default", XN_FLAG_MULTILINE, 0xffffffffL},
|
|
|
|
{NULL, 0, 0}
|
|
|
|
};
|
2015-09-11 23:13:52 +08:00
|
|
|
if (set_multi_opts(flags, arg, ex_tbl) == 0)
|
|
|
|
return 0;
|
2018-05-31 12:51:25 +08:00
|
|
|
if (*flags != XN_FLAG_COMPAT
|
|
|
|
&& (*flags & XN_FLAG_SEP_MASK) == 0)
|
2015-09-11 23:13:52 +08:00
|
|
|
*flags |= XN_FLAG_SEP_CPLUS_SPC;
|
|
|
|
return 1;
|
2001-03-16 03:13:40 +08:00
|
|
|
}
|
|
|
|
|
2001-03-16 10:04:17 +08:00
|
|
|
int set_ext_copy(int *copy_type, const char *arg)
|
|
|
|
{
|
2015-05-07 02:56:14 +08:00
|
|
|
if (strcasecmp(arg, "none") == 0)
|
2015-01-22 11:40:55 +08:00
|
|
|
*copy_type = EXT_COPY_NONE;
|
2015-05-07 02:56:14 +08:00
|
|
|
else if (strcasecmp(arg, "copy") == 0)
|
2015-01-22 11:40:55 +08:00
|
|
|
*copy_type = EXT_COPY_ADD;
|
2015-05-07 02:56:14 +08:00
|
|
|
else if (strcasecmp(arg, "copyall") == 0)
|
2015-01-22 11:40:55 +08:00
|
|
|
*copy_type = EXT_COPY_ALL;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
return 1;
|
2001-03-16 10:04:17 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int copy_extensions(X509 *x, X509_REQ *req, int copy_type)
|
|
|
|
{
|
2015-01-22 11:40:55 +08:00
|
|
|
STACK_OF(X509_EXTENSION) *exts = NULL;
|
|
|
|
X509_EXTENSION *ext, *tmpext;
|
|
|
|
ASN1_OBJECT *obj;
|
|
|
|
int i, idx, ret = 0;
|
|
|
|
if (!x || !req || (copy_type == EXT_COPY_NONE))
|
|
|
|
return 1;
|
|
|
|
exts = X509_REQ_get_extensions(req);
|
|
|
|
|
|
|
|
for (i = 0; i < sk_X509_EXTENSION_num(exts); i++) {
|
|
|
|
ext = sk_X509_EXTENSION_value(exts, i);
|
|
|
|
obj = X509_EXTENSION_get_object(ext);
|
|
|
|
idx = X509_get_ext_by_OBJ(x, obj, -1);
|
|
|
|
/* Does extension exist? */
|
|
|
|
if (idx != -1) {
|
|
|
|
/* If normal copy don't override existing extension */
|
|
|
|
if (copy_type == EXT_COPY_ADD)
|
|
|
|
continue;
|
|
|
|
/* Delete all extensions of same type */
|
|
|
|
do {
|
|
|
|
tmpext = X509_get_ext(x, idx);
|
|
|
|
X509_delete_ext(x, idx);
|
|
|
|
X509_EXTENSION_free(tmpext);
|
|
|
|
idx = X509_get_ext_by_OBJ(x, obj, -1);
|
|
|
|
} while (idx != -1);
|
|
|
|
}
|
|
|
|
if (!X509_add_ext(x, ext, -1))
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = 1;
|
|
|
|
|
|
|
|
end:
|
|
|
|
|
|
|
|
sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int set_multi_opts(unsigned long *flags, const char *arg,
|
|
|
|
const NAME_EX_TBL * in_tbl)
|
|
|
|
{
|
|
|
|
STACK_OF(CONF_VALUE) *vals;
|
|
|
|
CONF_VALUE *val;
|
|
|
|
int i, ret = 1;
|
|
|
|
if (!arg)
|
|
|
|
return 0;
|
|
|
|
vals = X509V3_parse_list(arg);
|
|
|
|
for (i = 0; i < sk_CONF_VALUE_num(vals); i++) {
|
|
|
|
val = sk_CONF_VALUE_value(vals, i);
|
|
|
|
if (!set_table_opts(flags, val->name, in_tbl))
|
|
|
|
ret = 0;
|
|
|
|
}
|
|
|
|
sk_CONF_VALUE_pop_free(vals, X509V3_conf_free);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int set_table_opts(unsigned long *flags, const char *arg,
|
|
|
|
const NAME_EX_TBL * in_tbl)
|
|
|
|
{
|
|
|
|
char c;
|
|
|
|
const NAME_EX_TBL *ptbl;
|
|
|
|
c = arg[0];
|
|
|
|
|
|
|
|
if (c == '-') {
|
|
|
|
c = 0;
|
|
|
|
arg++;
|
|
|
|
} else if (c == '+') {
|
|
|
|
c = 1;
|
|
|
|
arg++;
|
2017-06-13 01:24:02 +08:00
|
|
|
} else {
|
2015-01-22 11:40:55 +08:00
|
|
|
c = 1;
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
for (ptbl = in_tbl; ptbl->name; ptbl++) {
|
2015-05-07 02:56:14 +08:00
|
|
|
if (strcasecmp(arg, ptbl->name) == 0) {
|
2015-01-22 11:40:55 +08:00
|
|
|
*flags &= ~ptbl->mask;
|
|
|
|
if (c)
|
|
|
|
*flags |= ptbl->flag;
|
|
|
|
else
|
|
|
|
*flags &= ~ptbl->flag;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2020-03-23 15:30:37 +08:00
|
|
|
void print_name(BIO *out, const char *title, const X509_NAME *nm,
|
2015-01-22 11:40:55 +08:00
|
|
|
unsigned long lflags)
|
|
|
|
{
|
|
|
|
char *buf;
|
|
|
|
char mline = 0;
|
|
|
|
int indent = 0;
|
|
|
|
|
|
|
|
if (title)
|
|
|
|
BIO_puts(out, title);
|
|
|
|
if ((lflags & XN_FLAG_SEP_MASK) == XN_FLAG_SEP_MULTILINE) {
|
|
|
|
mline = 1;
|
|
|
|
indent = 4;
|
|
|
|
}
|
|
|
|
if (lflags == XN_FLAG_COMPAT) {
|
|
|
|
buf = X509_NAME_oneline(nm, 0, 0);
|
|
|
|
BIO_puts(out, buf);
|
|
|
|
BIO_puts(out, "\n");
|
|
|
|
OPENSSL_free(buf);
|
|
|
|
} else {
|
|
|
|
if (mline)
|
|
|
|
BIO_puts(out, "\n");
|
|
|
|
X509_NAME_print_ex(out, nm, indent, lflags);
|
|
|
|
BIO_puts(out, "\n");
|
|
|
|
}
|
2000-07-28 09:58:15 +08:00
|
|
|
}
|
|
|
|
|
2016-06-14 21:49:05 +08:00
|
|
|
void print_bignum_var(BIO *out, const BIGNUM *in, const char *var,
|
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 len, unsigned char *buffer)
|
2001-01-17 09:31:34 +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
|
|
|
BIO_printf(out, " static unsigned char %s_%d[] = {", var, len);
|
2017-06-13 01:24:02 +08:00
|
|
|
if (BN_is_zero(in)) {
|
2018-07-25 17:13:58 +08:00
|
|
|
BIO_printf(out, "\n 0x00");
|
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
|
|
|
int i, l;
|
|
|
|
|
|
|
|
l = BN_bn2bin(in, buffer);
|
|
|
|
for (i = 0; i < l; i++) {
|
2018-07-25 17:13:58 +08:00
|
|
|
BIO_printf(out, (i % 10) == 0 ? "\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
|
|
|
if (i < l - 1)
|
2018-07-25 17:13:58 +08:00
|
|
|
BIO_printf(out, "0x%02X,", buffer[i]);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
else
|
|
|
|
BIO_printf(out, "0x%02X", buffer[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
BIO_printf(out, "\n };\n");
|
|
|
|
}
|
2017-06-13 01:24:02 +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
|
|
|
void print_array(BIO *out, const char* title, int len, const unsigned char* d)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
BIO_printf(out, "unsigned char %s[%d] = {", title, len);
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
if ((i % 10) == 0)
|
|
|
|
BIO_printf(out, "\n ");
|
|
|
|
if (i < len - 1)
|
|
|
|
BIO_printf(out, "0x%02X, ", d[i]);
|
|
|
|
else
|
|
|
|
BIO_printf(out, "0x%02X", d[i]);
|
|
|
|
}
|
|
|
|
BIO_printf(out, "\n};\n");
|
|
|
|
}
|
|
|
|
|
2019-03-07 22:26:34 +08:00
|
|
|
X509_STORE *setup_verify(const char *CAfile, int noCAfile,
|
|
|
|
const char *CApath, int noCApath,
|
|
|
|
const char *CAstore, int noCAstore)
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
{
|
|
|
|
X509_STORE *store = X509_STORE_new();
|
2015-01-22 11:40:55 +08:00
|
|
|
X509_LOOKUP *lookup;
|
2020-10-15 17:55:50 +08:00
|
|
|
OSSL_LIB_CTX *libctx = app_get0_libctx();
|
2020-07-24 20:53:27 +08:00
|
|
|
const char *propq = app_get0_propq();
|
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-10-30 19:18:04 +08:00
|
|
|
if (store == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
goto end;
|
2015-09-22 23:00:52 +08:00
|
|
|
|
2016-06-29 06:18:50 +08:00
|
|
|
if (CAfile != NULL || !noCAfile) {
|
2015-09-22 23:00:52 +08:00
|
|
|
lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
|
|
|
|
if (lookup == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
goto end;
|
2019-03-07 22:26:34 +08:00
|
|
|
if (CAfile != NULL) {
|
2020-09-24 17:42:23 +08:00
|
|
|
if (!X509_LOOKUP_load_file_ex(lookup, CAfile, X509_FILETYPE_PEM,
|
|
|
|
libctx, propq)) {
|
2015-09-22 23:00:52 +08:00
|
|
|
BIO_printf(bio_err, "Error loading file %s\n", CAfile);
|
|
|
|
goto end;
|
|
|
|
}
|
2017-06-13 01:24:02 +08:00
|
|
|
} else {
|
2020-09-24 17:42:23 +08:00
|
|
|
X509_LOOKUP_load_file_ex(lookup, NULL, X509_FILETYPE_DEFAULT,
|
|
|
|
libctx, propq);
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
2015-09-22 23:00:52 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2016-06-29 06:18:50 +08:00
|
|
|
if (CApath != NULL || !noCApath) {
|
2015-09-22 23:00:52 +08:00
|
|
|
lookup = X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir());
|
|
|
|
if (lookup == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
goto end;
|
2019-03-07 22:26:34 +08:00
|
|
|
if (CApath != NULL) {
|
2015-09-22 23:00:52 +08:00
|
|
|
if (!X509_LOOKUP_add_dir(lookup, CApath, X509_FILETYPE_PEM)) {
|
|
|
|
BIO_printf(bio_err, "Error loading directory %s\n", CApath);
|
|
|
|
goto end;
|
|
|
|
}
|
2017-06-13 01:24:02 +08:00
|
|
|
} else {
|
2015-09-22 23:00:52 +08:00
|
|
|
X509_LOOKUP_add_dir(lookup, NULL, X509_FILETYPE_DEFAULT);
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
2015-09-22 23:00:52 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2019-03-07 22:26:34 +08:00
|
|
|
if (CAstore != NULL || !noCAstore) {
|
|
|
|
lookup = X509_STORE_add_lookup(store, X509_LOOKUP_store());
|
|
|
|
if (lookup == NULL)
|
|
|
|
goto end;
|
2020-09-24 17:42:23 +08:00
|
|
|
if (!X509_LOOKUP_add_store_ex(lookup, CAstore, libctx, propq)) {
|
2019-03-07 22:26:34 +08:00
|
|
|
if (CAstore != NULL)
|
|
|
|
BIO_printf(bio_err, "Error loading store URI %s\n", CAstore);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
ERR_clear_error();
|
|
|
|
return store;
|
|
|
|
end:
|
2020-04-22 20:58:41 +08:00
|
|
|
ERR_print_errors(bio_err);
|
2015-01-22 11:40:55 +08:00
|
|
|
X509_STORE_free(store);
|
|
|
|
return NULL;
|
2001-01-17 09:31:34 +08:00
|
|
|
}
|
2001-06-18 14:22:33 +08:00
|
|
|
|
2009-07-28 05:10:00 +08:00
|
|
|
static unsigned long index_serial_hash(const OPENSSL_CSTRING *a)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
const char *n;
|
2003-04-04 00:33:03 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
n = a[DB_serial];
|
|
|
|
while (*n == '0')
|
|
|
|
n++;
|
2016-05-20 22:46:29 +08:00
|
|
|
return OPENSSL_LH_strhash(n);
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2003-04-04 00:33:03 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
static int index_serial_cmp(const OPENSSL_CSTRING *a,
|
|
|
|
const OPENSSL_CSTRING *b)
|
|
|
|
{
|
|
|
|
const char *aa, *bb;
|
2003-04-04 00:33:03 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
for (aa = a[DB_serial]; *aa == '0'; aa++) ;
|
|
|
|
for (bb = b[DB_serial]; *bb == '0'; bb++) ;
|
2017-10-17 22:04:09 +08:00
|
|
|
return strcmp(aa, bb);
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2003-04-04 00:33:03 +08:00
|
|
|
|
|
|
|
static int index_name_qual(char **a)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
return (a[0][0] == 'V');
|
|
|
|
}
|
2003-04-04 00:33:03 +08:00
|
|
|
|
2009-07-28 05:10:00 +08:00
|
|
|
static unsigned long index_name_hash(const OPENSSL_CSTRING *a)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
2016-05-20 22:46:29 +08:00
|
|
|
return OPENSSL_LH_strhash(a[DB_name]);
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2003-04-04 00:33:03 +08:00
|
|
|
|
2009-07-28 05:10:00 +08:00
|
|
|
int index_name_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
2017-10-17 22:04:09 +08:00
|
|
|
return strcmp(a[DB_name], b[DB_name]);
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2003-04-04 00:33:03 +08:00
|
|
|
|
2009-07-28 05:10:00 +08:00
|
|
|
static IMPLEMENT_LHASH_HASH_FN(index_serial, OPENSSL_CSTRING)
|
|
|
|
static IMPLEMENT_LHASH_COMP_FN(index_serial, OPENSSL_CSTRING)
|
|
|
|
static IMPLEMENT_LHASH_HASH_FN(index_name, OPENSSL_CSTRING)
|
|
|
|
static IMPLEMENT_LHASH_COMP_FN(index_name, OPENSSL_CSTRING)
|
2003-04-04 00:33:03 +08:00
|
|
|
#undef BSIZE
|
|
|
|
#define BSIZE 256
|
2016-08-05 05:52:22 +08:00
|
|
|
BIGNUM *load_serial(const char *serialfile, int create, ASN1_INTEGER **retai)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
BIO *in = NULL;
|
|
|
|
BIGNUM *ret = NULL;
|
2015-01-24 00:58:26 +08:00
|
|
|
char buf[1024];
|
2015-01-22 11:40:55 +08:00
|
|
|
ASN1_INTEGER *ai = NULL;
|
|
|
|
|
|
|
|
ai = ASN1_INTEGER_new();
|
|
|
|
if (ai == NULL)
|
|
|
|
goto err;
|
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
in = BIO_new_file(serialfile, "r");
|
|
|
|
if (in == NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!create) {
|
|
|
|
perror(serialfile);
|
|
|
|
goto err;
|
|
|
|
}
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
ERR_clear_error();
|
|
|
|
ret = BN_new();
|
|
|
|
if (ret == NULL || !rand_serial(ret, ai))
|
|
|
|
BIO_printf(bio_err, "Out of memory\n");
|
2015-01-22 11:40:55 +08:00
|
|
|
} else {
|
|
|
|
if (!a2i_ASN1_INTEGER(in, ai, buf, 1024)) {
|
2020-04-22 20:58:41 +08:00
|
|
|
BIO_printf(bio_err, "Unable to load number from %s\n",
|
2015-01-22 11:40:55 +08:00
|
|
|
serialfile);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
ret = ASN1_INTEGER_to_BN(ai, NULL);
|
|
|
|
if (ret == NULL) {
|
2020-04-22 20:58:41 +08:00
|
|
|
BIO_printf(bio_err, "Error converting number from bin to BIGNUM\n");
|
2015-01-22 11:40:55 +08:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ret && retai) {
|
|
|
|
*retai = ai;
|
|
|
|
ai = NULL;
|
|
|
|
}
|
2003-04-04 00:33:03 +08:00
|
|
|
err:
|
2020-04-22 20:58:41 +08:00
|
|
|
ERR_print_errors(bio_err);
|
2015-03-25 23:31:18 +08:00
|
|
|
BIO_free(in);
|
2015-04-30 23:30:03 +08:00
|
|
|
ASN1_INTEGER_free(ai);
|
2017-10-17 22:04:09 +08:00
|
|
|
return ret;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
2016-08-05 05:52:22 +08:00
|
|
|
int save_serial(const char *serialfile, const char *suffix, const BIGNUM *serial,
|
2015-01-22 11:40:55 +08:00
|
|
|
ASN1_INTEGER **retai)
|
|
|
|
{
|
|
|
|
char buf[1][BSIZE];
|
|
|
|
BIO *out = NULL;
|
|
|
|
int ret = 0;
|
|
|
|
ASN1_INTEGER *ai = NULL;
|
|
|
|
int j;
|
|
|
|
|
|
|
|
if (suffix == NULL)
|
|
|
|
j = strlen(serialfile);
|
|
|
|
else
|
|
|
|
j = strlen(serialfile) + strlen(suffix) + 1;
|
|
|
|
if (j >= BSIZE) {
|
2020-04-22 20:58:41 +08:00
|
|
|
BIO_printf(bio_err, "File name too long\n");
|
2015-01-22 11:40:55 +08:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (suffix == NULL)
|
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
|
|
|
OPENSSL_strlcpy(buf[0], serialfile, BSIZE);
|
2015-01-22 11:40:55 +08:00
|
|
|
else {
|
2003-04-04 23:10:35 +08:00
|
|
|
#ifndef OPENSSL_SYS_VMS
|
2017-12-08 02:39:34 +08:00
|
|
|
j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", serialfile, suffix);
|
2003-04-04 23:10:35 +08:00
|
|
|
#else
|
2017-12-08 02:39:34 +08:00
|
|
|
j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", serialfile, suffix);
|
2003-04-04 23:10:35 +08:00
|
|
|
#endif
|
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
|
|
|
out = BIO_new_file(buf[0], "w");
|
2015-01-22 11:40:55 +08:00
|
|
|
if (out == NULL) {
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((ai = BN_to_ASN1_INTEGER(serial, NULL)) == NULL) {
|
|
|
|
BIO_printf(bio_err, "error converting serial to ASN.1 format\n");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
i2a_ASN1_INTEGER(out, ai);
|
|
|
|
BIO_puts(out, "\n");
|
|
|
|
ret = 1;
|
|
|
|
if (retai) {
|
|
|
|
*retai = ai;
|
|
|
|
ai = NULL;
|
|
|
|
}
|
|
|
|
err:
|
2020-04-22 20:58:41 +08:00
|
|
|
if (!ret)
|
|
|
|
ERR_print_errors(bio_err);
|
2015-03-25 23:31:18 +08:00
|
|
|
BIO_free_all(out);
|
2015-04-30 23:30:03 +08:00
|
|
|
ASN1_INTEGER_free(ai);
|
2017-10-17 22:04:09 +08:00
|
|
|
return ret;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2003-04-04 00:33:03 +08:00
|
|
|
|
2016-08-05 05:52:22 +08:00
|
|
|
int rotate_serial(const char *serialfile, const char *new_suffix,
|
|
|
|
const char *old_suffix)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
2016-03-19 02:02:17 +08:00
|
|
|
char buf[2][BSIZE];
|
2015-01-22 11:40:55 +08:00
|
|
|
int i, j;
|
|
|
|
|
|
|
|
i = strlen(serialfile) + strlen(old_suffix);
|
|
|
|
j = strlen(serialfile) + strlen(new_suffix);
|
|
|
|
if (i > j)
|
|
|
|
j = i;
|
|
|
|
if (j + 1 >= BSIZE) {
|
2020-04-22 20:58:41 +08:00
|
|
|
BIO_printf(bio_err, "File name too long\n");
|
2015-01-22 11:40:55 +08:00
|
|
|
goto err;
|
|
|
|
}
|
2003-04-04 23:10:35 +08:00
|
|
|
#ifndef OPENSSL_SYS_VMS
|
2017-12-08 02:39:34 +08:00
|
|
|
j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", serialfile, new_suffix);
|
|
|
|
j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s.%s", serialfile, old_suffix);
|
2003-04-04 23:10:35 +08:00
|
|
|
#else
|
2017-12-08 02:39:34 +08:00
|
|
|
j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", serialfile, new_suffix);
|
|
|
|
j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s-%s", serialfile, old_suffix);
|
2005-11-05 00:12:05 +08:00
|
|
|
#endif
|
2015-01-22 11:40:55 +08:00
|
|
|
if (rename(serialfile, buf[1]) < 0 && errno != ENOENT
|
2003-04-04 23:10:35 +08:00
|
|
|
#ifdef ENOTDIR
|
2015-01-22 11:40:55 +08:00
|
|
|
&& errno != ENOTDIR
|
|
|
|
#endif
|
|
|
|
) {
|
|
|
|
BIO_printf(bio_err,
|
2020-04-22 20:58:41 +08:00
|
|
|
"Unable to rename %s to %s\n", serialfile, buf[1]);
|
2015-01-22 11:40:55 +08:00
|
|
|
perror("reason");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (rename(buf[0], serialfile) < 0) {
|
|
|
|
BIO_printf(bio_err,
|
2020-04-22 20:58:41 +08:00
|
|
|
"Unable to rename %s to %s\n", buf[0], serialfile);
|
2015-01-22 11:40:55 +08:00
|
|
|
perror("reason");
|
|
|
|
rename(buf[1], serialfile);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
return 1;
|
2003-04-04 23:10:35 +08:00
|
|
|
err:
|
2020-04-22 20:58:41 +08:00
|
|
|
ERR_print_errors(bio_err);
|
2015-01-22 11:40:55 +08:00
|
|
|
return 0;
|
|
|
|
}
|
2003-04-04 23:10:35 +08:00
|
|
|
|
2004-04-20 20:05:26 +08:00
|
|
|
int rand_serial(BIGNUM *b, ASN1_INTEGER *ai)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
BIGNUM *btmp;
|
|
|
|
int ret = 0;
|
2015-05-01 09:37:06 +08:00
|
|
|
|
2017-08-17 03:49:25 +08:00
|
|
|
btmp = b == NULL ? BN_new() : b;
|
2015-10-30 19:18:04 +08:00
|
|
|
if (btmp == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
return 0;
|
|
|
|
|
2017-08-17 03:49:25 +08:00
|
|
|
if (!BN_rand(btmp, SERIAL_RAND_BITS, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY))
|
2015-01-22 11:40:55 +08:00
|
|
|
goto error;
|
|
|
|
if (ai && !BN_to_ASN1_INTEGER(btmp, ai))
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
ret = 1;
|
|
|
|
|
|
|
|
error:
|
|
|
|
|
2015-05-01 09:37:06 +08:00
|
|
|
if (btmp != b)
|
2015-01-22 11:40:55 +08:00
|
|
|
BN_free(btmp);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2004-04-20 20:05:26 +08:00
|
|
|
|
2016-08-05 05:52:22 +08:00
|
|
|
CA_DB *load_index(const char *dbfile, DB_ATTR *db_attr)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
CA_DB *retdb = NULL;
|
|
|
|
TXT_DB *tmpdb = 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 *in;
|
2015-01-22 11:40:55 +08:00
|
|
|
CONF *dbattr_conf = NULL;
|
2015-05-29 01:52:55 +08:00
|
|
|
char buf[BSIZE];
|
2018-03-06 03:40:02 +08:00
|
|
|
#ifndef OPENSSL_NO_POSIX_IO
|
|
|
|
FILE *dbfp;
|
|
|
|
struct stat dbst;
|
|
|
|
#endif
|
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
|
|
|
in = BIO_new_file(dbfile, "r");
|
2020-04-22 20:58:41 +08:00
|
|
|
if (in == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
goto err;
|
2018-03-06 03:40:02 +08:00
|
|
|
|
|
|
|
#ifndef OPENSSL_NO_POSIX_IO
|
|
|
|
BIO_get_fp(in, &dbfp);
|
|
|
|
if (fstat(fileno(dbfp), &dbst) == -1) {
|
2019-08-01 03:24:20 +08:00
|
|
|
ERR_raise_data(ERR_LIB_SYS, errno,
|
|
|
|
"calling fstat(%s)", dbfile);
|
2018-03-06 03:40:02 +08:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
if ((tmpdb = TXT_DB_read(in, DB_NUMBER)) == NULL)
|
|
|
|
goto err;
|
2003-04-04 00:33:03 +08:00
|
|
|
|
|
|
|
#ifndef OPENSSL_SYS_VMS
|
2017-12-08 02:39:34 +08:00
|
|
|
BIO_snprintf(buf, sizeof(buf), "%s.attr", dbfile);
|
2003-04-04 00:33:03 +08:00
|
|
|
#else
|
2017-12-08 02:39:34 +08:00
|
|
|
BIO_snprintf(buf, sizeof(buf), "%s-attr", dbfile);
|
2015-01-22 11:40:55 +08:00
|
|
|
#endif
|
2018-09-21 15:05:16 +08:00
|
|
|
dbattr_conf = app_load_config_quiet(buf);
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2015-05-02 11:10:31 +08:00
|
|
|
retdb = app_malloc(sizeof(*retdb), "new DB");
|
2015-01-22 11:40:55 +08:00
|
|
|
retdb->db = tmpdb;
|
|
|
|
tmpdb = NULL;
|
|
|
|
if (db_attr)
|
|
|
|
retdb->attributes = *db_attr;
|
|
|
|
else {
|
|
|
|
retdb->attributes.unique_subject = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dbattr_conf) {
|
|
|
|
char *p = NCONF_get_string(dbattr_conf, NULL, "unique_subject");
|
|
|
|
if (p) {
|
|
|
|
retdb->attributes.unique_subject = parse_yesno(p, 1);
|
|
|
|
}
|
|
|
|
}
|
2003-04-04 00:33:03 +08:00
|
|
|
|
2018-03-06 03:40:02 +08:00
|
|
|
retdb->dbfname = OPENSSL_strdup(dbfile);
|
|
|
|
#ifndef OPENSSL_NO_POSIX_IO
|
|
|
|
retdb->dbst = dbst;
|
|
|
|
#endif
|
|
|
|
|
2003-04-04 00:33:03 +08:00
|
|
|
err:
|
2020-04-22 20:58:41 +08:00
|
|
|
ERR_print_errors(bio_err);
|
2015-05-01 22:15:18 +08:00
|
|
|
NCONF_free(dbattr_conf);
|
2015-05-01 06:10:52 +08:00
|
|
|
TXT_DB_free(tmpdb);
|
2015-03-25 23:31:18 +08:00
|
|
|
BIO_free_all(in);
|
2015-01-22 11:40:55 +08:00
|
|
|
return retdb;
|
|
|
|
}
|
2003-04-04 00:33:03 +08:00
|
|
|
|
2018-04-19 07:52:26 +08:00
|
|
|
/*
|
|
|
|
* Returns > 0 on success, <= 0 on error
|
|
|
|
*/
|
2003-04-04 00:33:03 +08:00
|
|
|
int index_index(CA_DB *db)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
if (!TXT_DB_create_index(db->db, DB_serial, NULL,
|
|
|
|
LHASH_HASH_FN(index_serial),
|
|
|
|
LHASH_COMP_FN(index_serial))) {
|
|
|
|
BIO_printf(bio_err,
|
2020-04-22 20:58:41 +08:00
|
|
|
"Error creating serial number index:(%ld,%ld,%ld)\n",
|
2015-01-22 11:40:55 +08:00
|
|
|
db->db->error, db->db->arg1, db->db->arg2);
|
2020-04-22 20:58:41 +08:00
|
|
|
goto err;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (db->attributes.unique_subject
|
|
|
|
&& !TXT_DB_create_index(db->db, DB_name, index_name_qual,
|
|
|
|
LHASH_HASH_FN(index_name),
|
|
|
|
LHASH_COMP_FN(index_name))) {
|
2020-04-22 20:58:41 +08:00
|
|
|
BIO_printf(bio_err, "Error creating name index:(%ld,%ld,%ld)\n",
|
2015-01-22 11:40:55 +08:00
|
|
|
db->db->error, db->db->arg1, db->db->arg2);
|
2020-04-22 20:58:41 +08:00
|
|
|
goto err;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
return 1;
|
2020-04-22 20:58:41 +08:00
|
|
|
err:
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
return 0;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2003-04-04 00:33:03 +08:00
|
|
|
|
2005-04-06 03:11:19 +08:00
|
|
|
int save_index(const char *dbfile, const char *suffix, CA_DB *db)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
char buf[3][BSIZE];
|
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 *out;
|
2015-01-22 11:40:55 +08:00
|
|
|
int j;
|
|
|
|
|
|
|
|
j = strlen(dbfile) + strlen(suffix);
|
|
|
|
if (j + 6 >= BSIZE) {
|
2020-04-22 20:58:41 +08:00
|
|
|
BIO_printf(bio_err, "File name too long\n");
|
2015-01-22 11:40:55 +08:00
|
|
|
goto err;
|
|
|
|
}
|
2003-04-04 00:33:03 +08:00
|
|
|
#ifndef OPENSSL_SYS_VMS
|
2017-12-08 02:39:34 +08:00
|
|
|
j = BIO_snprintf(buf[2], sizeof(buf[2]), "%s.attr", dbfile);
|
|
|
|
j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s.attr.%s", dbfile, suffix);
|
|
|
|
j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", dbfile, suffix);
|
2003-04-04 00:33:03 +08:00
|
|
|
#else
|
2017-12-08 02:39:34 +08:00
|
|
|
j = BIO_snprintf(buf[2], sizeof(buf[2]), "%s-attr", dbfile);
|
|
|
|
j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s-attr-%s", dbfile, suffix);
|
|
|
|
j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", dbfile, suffix);
|
2003-04-04 02:07:39 +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
|
|
|
out = BIO_new_file(buf[0], "w");
|
|
|
|
if (out == NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
perror(dbfile);
|
2020-04-22 20:58:41 +08:00
|
|
|
BIO_printf(bio_err, "Unable to open '%s'\n", dbfile);
|
2015-01-22 11:40:55 +08:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
j = TXT_DB_write(out, db->db);
|
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_free(out);
|
2015-01-22 11:40:55 +08:00
|
|
|
if (j <= 0)
|
|
|
|
goto err;
|
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
out = BIO_new_file(buf[1], "w");
|
|
|
|
if (out == NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
perror(buf[2]);
|
2020-04-22 20:58:41 +08:00
|
|
|
BIO_printf(bio_err, "Unable to open '%s'\n", buf[2]);
|
2015-01-22 11:40:55 +08:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
BIO_printf(out, "unique_subject = %s\n",
|
|
|
|
db->attributes.unique_subject ? "yes" : "no");
|
|
|
|
BIO_free(out);
|
|
|
|
|
|
|
|
return 1;
|
2003-04-04 00:33:03 +08:00
|
|
|
err:
|
2020-04-22 20:58:41 +08:00
|
|
|
ERR_print_errors(bio_err);
|
2015-01-22 11:40:55 +08:00
|
|
|
return 0;
|
|
|
|
}
|
2003-04-04 00:33:03 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
int rotate_index(const char *dbfile, const char *new_suffix,
|
|
|
|
const char *old_suffix)
|
|
|
|
{
|
|
|
|
char buf[5][BSIZE];
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
i = strlen(dbfile) + strlen(old_suffix);
|
|
|
|
j = strlen(dbfile) + strlen(new_suffix);
|
|
|
|
if (i > j)
|
|
|
|
j = i;
|
|
|
|
if (j + 6 >= BSIZE) {
|
2020-04-22 20:58:41 +08:00
|
|
|
BIO_printf(bio_err, "File name too long\n");
|
2015-01-22 11:40:55 +08:00
|
|
|
goto err;
|
|
|
|
}
|
2003-04-04 00:33:03 +08:00
|
|
|
#ifndef OPENSSL_SYS_VMS
|
2017-12-08 02:39:34 +08:00
|
|
|
j = BIO_snprintf(buf[4], sizeof(buf[4]), "%s.attr", dbfile);
|
|
|
|
j = BIO_snprintf(buf[3], sizeof(buf[3]), "%s.attr.%s", dbfile, old_suffix);
|
|
|
|
j = BIO_snprintf(buf[2], sizeof(buf[2]), "%s.attr.%s", dbfile, new_suffix);
|
|
|
|
j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s.%s", dbfile, old_suffix);
|
|
|
|
j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", dbfile, new_suffix);
|
2003-04-04 00:33:03 +08:00
|
|
|
#else
|
2017-12-08 02:39:34 +08:00
|
|
|
j = BIO_snprintf(buf[4], sizeof(buf[4]), "%s-attr", dbfile);
|
|
|
|
j = BIO_snprintf(buf[3], sizeof(buf[3]), "%s-attr-%s", dbfile, old_suffix);
|
|
|
|
j = BIO_snprintf(buf[2], sizeof(buf[2]), "%s-attr-%s", dbfile, new_suffix);
|
|
|
|
j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s-%s", dbfile, old_suffix);
|
|
|
|
j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", dbfile, new_suffix);
|
2003-04-04 02:07:39 +08:00
|
|
|
#endif
|
2015-01-22 11:40:55 +08:00
|
|
|
if (rename(dbfile, buf[1]) < 0 && errno != ENOENT
|
2005-11-05 00:12:05 +08:00
|
|
|
#ifdef ENOTDIR
|
2015-01-22 11:40:55 +08:00
|
|
|
&& errno != ENOTDIR
|
2005-11-05 00:12:05 +08:00
|
|
|
#endif
|
2015-01-22 11:40:55 +08:00
|
|
|
) {
|
2020-04-22 20:58:41 +08:00
|
|
|
BIO_printf(bio_err, "Unable to rename %s to %s\n", dbfile, buf[1]);
|
2015-01-22 11:40:55 +08:00
|
|
|
perror("reason");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (rename(buf[0], dbfile) < 0) {
|
2020-04-22 20:58:41 +08:00
|
|
|
BIO_printf(bio_err, "Unable to rename %s to %s\n", buf[0], dbfile);
|
2015-01-22 11:40:55 +08:00
|
|
|
perror("reason");
|
|
|
|
rename(buf[1], dbfile);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (rename(buf[4], buf[3]) < 0 && errno != ENOENT
|
2005-11-05 00:12:05 +08:00
|
|
|
#ifdef ENOTDIR
|
2015-01-22 11:40:55 +08:00
|
|
|
&& errno != ENOTDIR
|
|
|
|
#endif
|
|
|
|
) {
|
2020-04-22 20:58:41 +08:00
|
|
|
BIO_printf(bio_err, "Unable to rename %s to %s\n", buf[4], buf[3]);
|
2015-01-22 11:40:55 +08:00
|
|
|
perror("reason");
|
|
|
|
rename(dbfile, buf[0]);
|
|
|
|
rename(buf[1], dbfile);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (rename(buf[2], buf[4]) < 0) {
|
2020-04-22 20:58:41 +08:00
|
|
|
BIO_printf(bio_err, "Unable to rename %s to %s\n", buf[2], buf[4]);
|
2015-01-22 11:40:55 +08:00
|
|
|
perror("reason");
|
|
|
|
rename(buf[3], buf[4]);
|
|
|
|
rename(dbfile, buf[0]);
|
|
|
|
rename(buf[1], dbfile);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
return 1;
|
2003-04-04 00:33:03 +08:00
|
|
|
err:
|
2020-04-22 20:58:41 +08:00
|
|
|
ERR_print_errors(bio_err);
|
2015-01-22 11:40:55 +08:00
|
|
|
return 0;
|
|
|
|
}
|
2003-04-04 00:33:03 +08:00
|
|
|
|
|
|
|
void free_index(CA_DB *db)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
if (db) {
|
2015-05-01 06:10:52 +08:00
|
|
|
TXT_DB_free(db->db);
|
2018-03-06 03:40:02 +08:00
|
|
|
OPENSSL_free(db->dbfname);
|
2015-01-22 11:40:55 +08:00
|
|
|
OPENSSL_free(db);
|
|
|
|
}
|
|
|
|
}
|
2003-11-28 22:07:14 +08:00
|
|
|
|
2005-04-16 02:29:33 +08:00
|
|
|
int parse_yesno(const char *str, int def)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
if (str) {
|
|
|
|
switch (*str) {
|
|
|
|
case 'f': /* false */
|
|
|
|
case 'F': /* FALSE */
|
|
|
|
case 'n': /* no */
|
|
|
|
case 'N': /* NO */
|
|
|
|
case '0': /* 0 */
|
2015-04-27 09:28:38 +08:00
|
|
|
return 0;
|
2015-01-22 11:40:55 +08:00
|
|
|
case 't': /* true */
|
|
|
|
case 'T': /* TRUE */
|
|
|
|
case 'y': /* yes */
|
|
|
|
case 'Y': /* YES */
|
|
|
|
case '1': /* 1 */
|
2015-04-27 09:28:38 +08:00
|
|
|
return 1;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
}
|
2015-04-27 09:28:38 +08:00
|
|
|
return def;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2003-11-28 22:45:09 +08:00
|
|
|
|
2003-11-28 22:07:14 +08:00
|
|
|
/*
|
2015-04-30 02:50:00 +08:00
|
|
|
* name is expected to be in the format /type0=value0/type1=value1/type2=...
|
2020-09-02 19:52:23 +08:00
|
|
|
* where + can be used instead of / to form multi-valued RDNs if canmulti
|
|
|
|
* and characters may be escaped by \
|
2003-11-28 22:07:14 +08:00
|
|
|
*/
|
2020-06-27 16:28:45 +08:00
|
|
|
X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
|
|
|
|
const char *desc)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
2015-04-30 02:50:00 +08:00
|
|
|
int nextismulti = 0;
|
|
|
|
char *work;
|
|
|
|
X509_NAME *n;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2018-09-03 22:23:37 +08:00
|
|
|
if (*cp++ != '/') {
|
|
|
|
BIO_printf(bio_err,
|
2020-06-27 16:28:45 +08:00
|
|
|
"%s: %s name is expected to be in the format "
|
2018-09-03 22:23:37 +08:00
|
|
|
"/type0=value0/type1=value1/type2=... where characters may "
|
|
|
|
"be escaped by \\. This name is not in that format: '%s'\n",
|
2020-06-27 16:28:45 +08:00
|
|
|
opt_getprog(), desc, --cp);
|
2015-04-30 02:50:00 +08:00
|
|
|
return NULL;
|
2018-09-03 22:23:37 +08:00
|
|
|
}
|
2015-04-30 02:50:00 +08:00
|
|
|
|
|
|
|
n = X509_NAME_new();
|
2020-06-27 16:28:45 +08:00
|
|
|
if (n == NULL) {
|
|
|
|
BIO_printf(bio_err, "%s: Out of memory\n", opt_getprog());
|
2015-04-30 02:50:00 +08:00
|
|
|
return NULL;
|
2020-06-27 16:28:45 +08:00
|
|
|
}
|
2015-04-30 16:43:11 +08:00
|
|
|
work = OPENSSL_strdup(cp);
|
2019-03-19 07:35:03 +08:00
|
|
|
if (work == NULL) {
|
2020-06-27 16:28:45 +08:00
|
|
|
BIO_printf(bio_err, "%s: Error copying %s name input\n",
|
|
|
|
opt_getprog(), desc);
|
2015-04-30 02:50:00 +08:00
|
|
|
goto err;
|
2019-03-19 07:35:03 +08:00
|
|
|
}
|
2015-04-30 02:50:00 +08:00
|
|
|
|
2020-05-20 15:14:30 +08:00
|
|
|
while (*cp != '\0') {
|
2015-04-30 02:50:00 +08:00
|
|
|
char *bp = work;
|
|
|
|
char *typestr = bp;
|
|
|
|
unsigned char *valstr;
|
|
|
|
int nid;
|
|
|
|
int ismulti = nextismulti;
|
|
|
|
nextismulti = 0;
|
|
|
|
|
|
|
|
/* Collect the type */
|
2020-05-20 15:14:30 +08:00
|
|
|
while (*cp != '\0' && *cp != '=')
|
2015-04-30 02:50:00 +08:00
|
|
|
*bp++ = *cp++;
|
2020-06-27 16:28:45 +08:00
|
|
|
*bp++ = '\0';
|
2015-04-30 02:50:00 +08:00
|
|
|
if (*cp == '\0') {
|
2015-01-22 11:40:55 +08:00
|
|
|
BIO_printf(bio_err,
|
2020-06-27 16:28:45 +08:00
|
|
|
"%s: Missing '=' after RDN type string '%s' in %s name string\n",
|
|
|
|
opt_getprog(), typestr, desc);
|
2015-04-30 02:50:00 +08:00
|
|
|
goto err;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2015-04-30 02:50:00 +08:00
|
|
|
++cp;
|
|
|
|
|
|
|
|
/* Collect the value. */
|
|
|
|
valstr = (unsigned char *)bp;
|
2020-05-20 15:14:30 +08:00
|
|
|
for (; *cp != '\0' && *cp != '/'; *bp++ = *cp++) {
|
2020-09-02 19:52:23 +08:00
|
|
|
/* unescaped '+' symbol string signals further member of multiRDN */
|
2015-04-30 02:50:00 +08:00
|
|
|
if (canmulti && *cp == '+') {
|
|
|
|
nextismulti = 1;
|
2015-01-22 11:40:55 +08:00
|
|
|
break;
|
2015-04-30 02:50:00 +08:00
|
|
|
}
|
|
|
|
if (*cp == '\\' && *++cp == '\0') {
|
|
|
|
BIO_printf(bio_err,
|
2020-06-27 16:28:45 +08:00
|
|
|
"%s: Escape character at end of %s name string\n",
|
|
|
|
opt_getprog(), desc);
|
2015-04-30 02:50:00 +08:00
|
|
|
goto err;
|
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
*bp++ = '\0';
|
|
|
|
|
2015-04-30 02:50:00 +08:00
|
|
|
/* If not at EOS (must be + or /), move forward. */
|
2020-05-20 15:14:30 +08:00
|
|
|
if (*cp != '\0')
|
2015-04-30 02:50:00 +08:00
|
|
|
++cp;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2015-04-30 02:50:00 +08:00
|
|
|
/* Parse */
|
|
|
|
nid = OBJ_txt2nid(typestr);
|
|
|
|
if (nid == NID_undef) {
|
2020-06-27 16:28:45 +08:00
|
|
|
BIO_printf(bio_err,
|
|
|
|
"%s: Skipping unknown %s name attribute \"%s\"\n",
|
|
|
|
opt_getprog(), desc, typestr);
|
2020-09-02 19:52:23 +08:00
|
|
|
if (ismulti)
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Hint: a '+' in a value string needs be escaped using '\\' else a new member of a multi-valued RDN is expected\n");
|
2015-01-22 11:40:55 +08:00
|
|
|
continue;
|
|
|
|
}
|
2018-10-05 02:49:21 +08:00
|
|
|
if (*valstr == '\0') {
|
|
|
|
BIO_printf(bio_err,
|
2020-06-27 16:28:45 +08:00
|
|
|
"%s: No value provided for %s name attribute \"%s\", skipped\n",
|
|
|
|
opt_getprog(), desc, typestr);
|
2018-10-05 02:49:21 +08:00
|
|
|
continue;
|
|
|
|
}
|
2015-04-30 02:50:00 +08:00
|
|
|
if (!X509_NAME_add_entry_by_NID(n, nid, chtype,
|
|
|
|
valstr, strlen((char *)valstr),
|
2019-03-19 07:35:03 +08:00
|
|
|
-1, ismulti ? -1 : 0)) {
|
2020-05-20 15:14:30 +08:00
|
|
|
ERR_print_errors(bio_err);
|
2020-06-27 16:28:45 +08:00
|
|
|
BIO_printf(bio_err,
|
|
|
|
"%s: Error adding %s name attribute \"/%s=%s\"\n",
|
|
|
|
opt_getprog(), desc, typestr ,valstr);
|
2015-04-30 02:50:00 +08:00
|
|
|
goto err;
|
2019-03-19 07:35:03 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
2015-04-30 16:43:11 +08:00
|
|
|
OPENSSL_free(work);
|
2015-01-22 11:40:55 +08:00
|
|
|
return n;
|
|
|
|
|
2015-04-30 02:50:00 +08:00
|
|
|
err:
|
2015-01-22 11:40:55 +08:00
|
|
|
X509_NAME_free(n);
|
2015-04-30 16:43:11 +08:00
|
|
|
OPENSSL_free(work);
|
2015-01-22 11:40:55 +08:00
|
|
|
return NULL;
|
2003-11-28 22:07:14 +08:00
|
|
|
}
|
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
/*
|
|
|
|
* Read whole contents of a BIO into an allocated memory buffer and return
|
|
|
|
* it.
|
2006-04-09 06:25:47 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
int bio_to_mem(unsigned char **out, int maxlen, BIO *in)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
BIO *mem;
|
|
|
|
int len, ret;
|
|
|
|
unsigned char tbuf[1024];
|
2016-03-19 02:02:17 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
mem = BIO_new(BIO_s_mem());
|
2015-10-30 19:18:04 +08:00
|
|
|
if (mem == NULL)
|
2015-01-22 11:40:55 +08:00
|
|
|
return -1;
|
|
|
|
for (;;) {
|
|
|
|
if ((maxlen != -1) && maxlen < 1024)
|
|
|
|
len = maxlen;
|
|
|
|
else
|
|
|
|
len = 1024;
|
|
|
|
len = BIO_read(in, tbuf, len);
|
2016-02-02 13:37:41 +08:00
|
|
|
if (len < 0) {
|
|
|
|
BIO_free(mem);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (len == 0)
|
2015-01-22 11:40:55 +08:00
|
|
|
break;
|
|
|
|
if (BIO_write(mem, tbuf, len) != len) {
|
|
|
|
BIO_free(mem);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
maxlen -= len;
|
|
|
|
|
|
|
|
if (maxlen == 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
ret = BIO_get_mem_data(mem, (char **)out);
|
|
|
|
BIO_set_flags(mem, BIO_FLAGS_MEM_RDONLY);
|
|
|
|
BIO_free(mem);
|
|
|
|
return ret;
|
|
|
|
}
|
2006-04-09 06:25:47 +08:00
|
|
|
|
2016-02-02 13:37:41 +08:00
|
|
|
int pkey_ctrl_string(EVP_PKEY_CTX *ctx, const char *value)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
int rv;
|
|
|
|
char *stmp, *vtmp = NULL;
|
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
|
|
|
stmp = OPENSSL_strdup(value);
|
2015-01-22 11:40:55 +08:00
|
|
|
if (!stmp)
|
|
|
|
return -1;
|
|
|
|
vtmp = strchr(stmp, ':');
|
|
|
|
if (vtmp) {
|
|
|
|
*vtmp = 0;
|
|
|
|
vtmp++;
|
|
|
|
}
|
|
|
|
rv = EVP_PKEY_CTX_ctrl_str(ctx, stmp, vtmp);
|
|
|
|
OPENSSL_free(stmp);
|
|
|
|
return rv;
|
|
|
|
}
|
2006-04-09 08:34:00 +08:00
|
|
|
|
2015-04-29 23:27:08 +08:00
|
|
|
static void nodes_print(const char *name, STACK_OF(X509_POLICY_NODE) *nodes)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
X509_POLICY_NODE *node;
|
|
|
|
int i;
|
2015-04-29 23:27:08 +08:00
|
|
|
|
|
|
|
BIO_printf(bio_err, "%s Policies:", name);
|
2015-01-22 11:40:55 +08:00
|
|
|
if (nodes) {
|
2015-04-29 23:27:08 +08:00
|
|
|
BIO_puts(bio_err, "\n");
|
2015-01-22 11:40:55 +08:00
|
|
|
for (i = 0; i < sk_X509_POLICY_NODE_num(nodes); i++) {
|
|
|
|
node = sk_X509_POLICY_NODE_value(nodes, i);
|
2015-04-29 23:27:08 +08:00
|
|
|
X509_POLICY_NODE_print(bio_err, node, 2);
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2017-06-13 01:24:02 +08:00
|
|
|
} else {
|
2015-04-29 23:27:08 +08:00
|
|
|
BIO_puts(bio_err, " <empty>\n");
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2004-09-08 02:38:46 +08:00
|
|
|
|
2015-04-29 23:27:08 +08:00
|
|
|
void policies_print(X509_STORE_CTX *ctx)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
X509_POLICY_TREE *tree;
|
|
|
|
int explicit_policy;
|
|
|
|
tree = X509_STORE_CTX_get0_policy_tree(ctx);
|
|
|
|
explicit_policy = X509_STORE_CTX_get_explicit_policy(ctx);
|
|
|
|
|
2015-04-29 23:27:08 +08:00
|
|
|
BIO_printf(bio_err, "Require explicit Policy: %s\n",
|
2015-01-22 11:40:55 +08:00
|
|
|
explicit_policy ? "True" : "False");
|
|
|
|
|
2015-04-29 23:27:08 +08:00
|
|
|
nodes_print("Authority", X509_policy_tree_get0_policies(tree));
|
|
|
|
nodes_print("User", X509_policy_tree_get0_user_policies(tree));
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2005-11-04 17:30:55 +08:00
|
|
|
|
2015-01-05 08:34:00 +08:00
|
|
|
/*-
|
|
|
|
* next_protos_parse parses a comma separated list of strings into a string
|
2012-06-04 06:00:21 +08:00
|
|
|
* in a format suitable for passing to SSL_CTX_set_next_protos_advertised.
|
|
|
|
* outlen: (output) set to the length of the resulting buffer on success.
|
|
|
|
* err: (maybe NULL) on failure, an error message line is written to this BIO.
|
2016-03-11 04:34:48 +08:00
|
|
|
* in: a NUL terminated string like "abc,def,ghi"
|
2012-06-04 06:00:21 +08:00
|
|
|
*
|
2016-03-11 04:34:48 +08:00
|
|
|
* returns: a malloc'd buffer or NULL on failure.
|
2012-06-04 06:00:21 +08:00
|
|
|
*/
|
2016-03-05 21:47:55 +08:00
|
|
|
unsigned char *next_protos_parse(size_t *outlen, const char *in)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
size_t len;
|
|
|
|
unsigned char *out;
|
|
|
|
size_t i, start = 0;
|
2019-10-12 05:52:19 +08:00
|
|
|
size_t skipped = 0;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
len = strlen(in);
|
2019-10-12 05:52:19 +08:00
|
|
|
if (len == 0 || len >= 65535)
|
2015-01-22 11:40:55 +08:00
|
|
|
return NULL;
|
|
|
|
|
2019-10-12 05:52:19 +08:00
|
|
|
out = app_malloc(len + 1, "NPN buffer");
|
2015-01-22 11:40:55 +08:00
|
|
|
for (i = 0; i <= len; ++i) {
|
|
|
|
if (i == len || in[i] == ',') {
|
2019-10-12 05:52:19 +08:00
|
|
|
/*
|
|
|
|
* Zero-length ALPN elements are invalid on the wire, we could be
|
|
|
|
* strict and reject the entire string, but just ignoring extra
|
|
|
|
* commas seems harmless and more friendly.
|
|
|
|
*
|
|
|
|
* Every comma we skip in this way puts the input buffer another
|
|
|
|
* byte ahead of the output buffer, so all stores into the output
|
|
|
|
* buffer need to be decremented by the number commas skipped.
|
|
|
|
*/
|
|
|
|
if (i == start) {
|
|
|
|
++start;
|
|
|
|
++skipped;
|
|
|
|
continue;
|
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
if (i - start > 255) {
|
|
|
|
OPENSSL_free(out);
|
|
|
|
return NULL;
|
|
|
|
}
|
2019-10-12 05:52:19 +08:00
|
|
|
out[start-skipped] = (unsigned char)(i - start);
|
2015-01-22 11:40:55 +08:00
|
|
|
start = i + 1;
|
2017-06-13 01:24:02 +08:00
|
|
|
} else {
|
2019-10-12 05:52:19 +08:00
|
|
|
out[i + 1 - skipped] = in[i];
|
2017-06-13 01:24:02 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
2019-10-12 05:52:19 +08:00
|
|
|
if (len <= skipped) {
|
|
|
|
OPENSSL_free(out);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
*outlen = len + 1 - skipped;
|
2015-01-22 11:40:55 +08:00
|
|
|
return out;
|
|
|
|
}
|
2012-06-04 06:00:21 +08:00
|
|
|
|
2012-10-08 23:10:07 +08:00
|
|
|
void print_cert_checks(BIO *bio, X509 *x,
|
2015-01-22 11:40:55 +08:00
|
|
|
const char *checkhost,
|
|
|
|
const char *checkemail, const char *checkip)
|
|
|
|
{
|
|
|
|
if (x == NULL)
|
|
|
|
return;
|
|
|
|
if (checkhost) {
|
|
|
|
BIO_printf(bio, "Hostname %s does%s match certificate\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
|
|
|
checkhost,
|
|
|
|
X509_check_host(x, checkhost, 0, 0, NULL) == 1
|
|
|
|
? "" : " NOT");
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (checkemail) {
|
|
|
|
BIO_printf(bio, "Email %s does%s match certificate\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
|
|
|
checkemail, X509_check_email(x, checkemail, 0, 0)
|
|
|
|
? "" : " NOT");
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (checkip) {
|
|
|
|
BIO_printf(bio, "IP %s does%s match certificate\n",
|
|
|
|
checkip, X509_check_ip_asc(x, checkip, 0) ? "" : " NOT");
|
|
|
|
}
|
|
|
|
}
|
2012-10-08 23:10:07 +08:00
|
|
|
|
2020-12-04 18:09:29 +08:00
|
|
|
static int do_pkey_ctx_init(EVP_PKEY_CTX *pkctx, STACK_OF(OPENSSL_STRING) *opts)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (opts == NULL)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
for (i = 0; i < sk_OPENSSL_STRING_num(opts); i++) {
|
|
|
|
char *opt = sk_OPENSSL_STRING_value(opts, i);
|
|
|
|
if (pkey_ctrl_string(pkctx, opt) <= 0) {
|
|
|
|
BIO_printf(bio_err, "parameter error \"%s\"\n", opt);
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int do_x509_init(X509 *x, STACK_OF(OPENSSL_STRING) *opts)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (opts == NULL)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
for (i = 0; i < sk_OPENSSL_STRING_num(opts); i++) {
|
|
|
|
char *opt = sk_OPENSSL_STRING_value(opts, i);
|
|
|
|
if (x509_ctrl_string(x, opt) <= 0) {
|
|
|
|
BIO_printf(bio_err, "parameter error \"%s\"\n", opt);
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int do_x509_req_init(X509_REQ *x, STACK_OF(OPENSSL_STRING) *opts)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (opts == NULL)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
for (i = 0; i < sk_OPENSSL_STRING_num(opts); i++) {
|
|
|
|
char *opt = sk_OPENSSL_STRING_value(opts, i);
|
|
|
|
if (x509_req_ctrl_string(x, opt) <= 0) {
|
|
|
|
BIO_printf(bio_err, "parameter error \"%s\"\n", opt);
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int do_sign_init(EVP_MD_CTX *ctx, EVP_PKEY *pkey,
|
|
|
|
const EVP_MD *md, STACK_OF(OPENSSL_STRING) *sigopts)
|
|
|
|
{
|
|
|
|
EVP_PKEY_CTX *pkctx = NULL;
|
|
|
|
int def_nid;
|
|
|
|
|
|
|
|
if (ctx == NULL)
|
|
|
|
return 0;
|
|
|
|
/*
|
|
|
|
* 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;
|
|
|
|
}
|
|
|
|
return EVP_DigestSignInit(ctx, &pkctx, md, NULL, pkey)
|
|
|
|
&& do_pkey_ctx_init(pkctx, sigopts);
|
|
|
|
}
|
|
|
|
|
2020-12-10 22:23:41 +08:00
|
|
|
static int adapt_keyid_ext(X509 *cert, X509V3_CTX *ext_ctx,
|
|
|
|
const char *name, const char *value, int add_default)
|
|
|
|
{
|
|
|
|
const STACK_OF(X509_EXTENSION) *exts = X509_get0_extensions(cert);
|
|
|
|
X509_EXTENSION *new_ext = X509V3_EXT_nconf(NULL, ext_ctx, name, value);
|
|
|
|
int idx, rv = 0;
|
|
|
|
|
|
|
|
if (new_ext == NULL)
|
|
|
|
return rv;
|
|
|
|
|
|
|
|
idx = X509v3_get_ext_by_OBJ(exts, X509_EXTENSION_get_object(new_ext), -1);
|
|
|
|
if (idx >= 0) {
|
|
|
|
X509_EXTENSION *found_ext = X509v3_get_ext(exts, idx);
|
|
|
|
ASN1_OCTET_STRING *data = X509_EXTENSION_get_data(found_ext);
|
|
|
|
int disabled = ASN1_STRING_length(data) <= 2; /* config said "none" */
|
|
|
|
|
|
|
|
if (disabled) {
|
|
|
|
X509_delete_ext(cert, idx);
|
|
|
|
X509_EXTENSION_free(found_ext);
|
|
|
|
} /* else keep existing key identifier, which might be outdated */
|
|
|
|
rv = 1;
|
|
|
|
} else {
|
|
|
|
rv = !add_default || X509_add_ext(cert, new_ext, -1);
|
|
|
|
}
|
|
|
|
X509_EXTENSION_free(new_ext);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Ensure RFC 5280 compliance, adapt keyIDs as needed, and sign the cert info */
|
2020-12-04 18:09:29 +08:00
|
|
|
int do_X509_sign(X509 *cert, EVP_PKEY *pkey, const EVP_MD *md,
|
2020-12-10 22:23:41 +08:00
|
|
|
STACK_OF(OPENSSL_STRING) *sigopts, X509V3_CTX *ext_ctx)
|
2020-12-04 18:09:29 +08:00
|
|
|
{
|
|
|
|
const STACK_OF(X509_EXTENSION) *exts = X509_get0_extensions(cert);
|
|
|
|
EVP_MD_CTX *mctx = EVP_MD_CTX_new();
|
2020-12-10 22:23:41 +08:00
|
|
|
int self_sign;
|
2020-12-04 18:09:29 +08:00
|
|
|
int rv = 0;
|
|
|
|
|
|
|
|
if (sk_X509_EXTENSION_num(exts /* may be NULL */) > 0) {
|
|
|
|
/* Prevent X509_V_ERR_EXTENSIONS_REQUIRE_VERSION_3 */
|
|
|
|
if (!X509_set_version(cert, 2)) /* Make sure cert is X509 v3 */
|
|
|
|
goto end;
|
|
|
|
|
2020-12-10 22:23:41 +08:00
|
|
|
/*
|
|
|
|
* Add default SKID before such that default AKID can make use of it
|
|
|
|
* in case the certificate is self-signed
|
|
|
|
*/
|
|
|
|
/* Prevent X509_V_ERR_MISSING_SUBJECT_KEY_IDENTIFIER */
|
|
|
|
if (!adapt_keyid_ext(cert, ext_ctx, "subjectKeyIdentifier", "hash", 1))
|
|
|
|
goto end;
|
|
|
|
/* Prevent X509_V_ERR_MISSING_AUTHORITY_KEY_IDENTIFIER */
|
|
|
|
ERR_set_mark();
|
|
|
|
self_sign = X509_check_private_key(cert, pkey);
|
|
|
|
ERR_pop_to_mark();
|
|
|
|
if (!adapt_keyid_ext(cert, ext_ctx, "authorityKeyIdentifier",
|
|
|
|
"keyid, issuer", !self_sign))
|
|
|
|
goto end;
|
|
|
|
|
2020-12-04 18:09:29 +08:00
|
|
|
/* TODO any further measures for ensuring default RFC 5280 compliance */
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mctx != NULL && do_sign_init(mctx, pkey, md, sigopts) > 0)
|
|
|
|
rv = (X509_sign_ctx(cert, mctx) > 0);
|
|
|
|
end:
|
|
|
|
EVP_MD_CTX_free(mctx);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Sign the certificate request info */
|
|
|
|
int do_X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md,
|
|
|
|
STACK_OF(OPENSSL_STRING) *sigopts)
|
|
|
|
{
|
|
|
|
int rv = 0;
|
|
|
|
EVP_MD_CTX *mctx = EVP_MD_CTX_new();
|
|
|
|
|
|
|
|
if (do_sign_init(mctx, pkey, md, sigopts) > 0)
|
|
|
|
rv = (X509_REQ_sign_ctx(x, mctx) > 0);
|
|
|
|
EVP_MD_CTX_free(mctx);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Sign the CRL info */
|
|
|
|
int do_X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md,
|
|
|
|
STACK_OF(OPENSSL_STRING) *sigopts)
|
|
|
|
{
|
|
|
|
int rv = 0;
|
|
|
|
EVP_MD_CTX *mctx = EVP_MD_CTX_new();
|
|
|
|
|
|
|
|
if (do_sign_init(mctx, pkey, md, sigopts) > 0)
|
|
|
|
rv = (X509_CRL_sign_ctx(x, mctx) > 0);
|
|
|
|
EVP_MD_CTX_free(mctx);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
int do_X509_verify(X509 *x, EVP_PKEY *pkey, STACK_OF(OPENSSL_STRING) *vfyopts)
|
|
|
|
{
|
|
|
|
int rv = 0;
|
|
|
|
|
|
|
|
if (do_x509_init(x, vfyopts) > 0)
|
|
|
|
rv = (X509_verify(x, pkey) > 0);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
int do_X509_REQ_verify(X509_REQ *x, EVP_PKEY *pkey,
|
|
|
|
STACK_OF(OPENSSL_STRING) *vfyopts)
|
|
|
|
{
|
|
|
|
int rv = 0;
|
|
|
|
|
|
|
|
if (do_x509_req_init(x, vfyopts) > 0)
|
|
|
|
rv = (X509_REQ_verify(x, pkey) > 0);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
2012-12-07 02:43:40 +08:00
|
|
|
/* Get first http URL from a DIST_POINT structure */
|
|
|
|
|
|
|
|
static const char *get_dp_url(DIST_POINT *dp)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
GENERAL_NAMES *gens;
|
|
|
|
GENERAL_NAME *gen;
|
|
|
|
int i, gtype;
|
|
|
|
ASN1_STRING *uri;
|
|
|
|
if (!dp->distpoint || dp->distpoint->type != 0)
|
|
|
|
return NULL;
|
|
|
|
gens = dp->distpoint->name.fullname;
|
|
|
|
for (i = 0; i < sk_GENERAL_NAME_num(gens); i++) {
|
|
|
|
gen = sk_GENERAL_NAME_value(gens, i);
|
|
|
|
uri = GENERAL_NAME_get0_value(gen, >ype);
|
|
|
|
if (gtype == GEN_URI && ASN1_STRING_length(uri) > 6) {
|
2016-08-16 21:06:48 +08:00
|
|
|
const char *uptr = (const char *)ASN1_STRING_get0_data(uri);
|
2020-11-14 01:47:03 +08:00
|
|
|
|
|
|
|
if (IS_HTTP(uptr)) /* can/should not use HTTPS here */
|
2015-01-22 11:40:55 +08:00
|
|
|
return uptr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Look through a CRLDP structure and attempt to find an http URL to
|
|
|
|
* downloads a CRL from.
|
2012-12-07 02:43:40 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
static X509_CRL *load_crl_crldp(STACK_OF(DIST_POINT) *crldp)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
const char *urlptr = NULL;
|
|
|
|
for (i = 0; i < sk_DIST_POINT_num(crldp); i++) {
|
|
|
|
DIST_POINT *dp = sk_DIST_POINT_value(crldp, i);
|
|
|
|
urlptr = get_dp_url(dp);
|
|
|
|
if (urlptr)
|
2020-10-24 22:31:57 +08:00
|
|
|
return load_crl(urlptr, "CRL via CDP");
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2020-03-07 18:51:42 +08:00
|
|
|
* Example of downloading CRLs from CRLDP:
|
|
|
|
* not usable for real world as it always downloads and doesn't cache anything.
|
2012-12-07 02:43:40 +08:00
|
|
|
*/
|
|
|
|
|
2020-03-23 15:30:37 +08:00
|
|
|
static STACK_OF(X509_CRL) *crls_http_cb(const X509_STORE_CTX *ctx,
|
|
|
|
const X509_NAME *nm)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
X509 *x;
|
|
|
|
STACK_OF(X509_CRL) *crls = NULL;
|
|
|
|
X509_CRL *crl;
|
|
|
|
STACK_OF(DIST_POINT) *crldp;
|
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
|
|
|
|
|
|
|
crls = sk_X509_CRL_new_null();
|
|
|
|
if (!crls)
|
|
|
|
return NULL;
|
2015-01-22 11:40:55 +08:00
|
|
|
x = X509_STORE_CTX_get_current_cert(ctx);
|
|
|
|
crldp = X509_get_ext_d2i(x, NID_crl_distribution_points, NULL, NULL);
|
|
|
|
crl = load_crl_crldp(crldp);
|
|
|
|
sk_DIST_POINT_pop_free(crldp, DIST_POINT_free);
|
2016-04-27 01:28:03 +08:00
|
|
|
if (!crl) {
|
|
|
|
sk_X509_CRL_free(crls);
|
2015-01-22 11:40:55 +08:00
|
|
|
return NULL;
|
2016-04-27 01:28:03 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
sk_X509_CRL_push(crls, crl);
|
|
|
|
/* Try to download delta CRL */
|
|
|
|
crldp = X509_get_ext_d2i(x, NID_freshest_crl, NULL, NULL);
|
|
|
|
crl = load_crl_crldp(crldp);
|
|
|
|
sk_DIST_POINT_pop_free(crldp, DIST_POINT_free);
|
|
|
|
if (crl)
|
|
|
|
sk_X509_CRL_push(crls, crl);
|
|
|
|
return crls;
|
|
|
|
}
|
2012-12-07 02:43:40 +08:00
|
|
|
|
|
|
|
void store_setup_crl_download(X509_STORE *st)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
X509_STORE_set_lookup_crls_cb(st, crls_http_cb);
|
|
|
|
}
|
2012-12-07 02:43:40 +08:00
|
|
|
|
2019-10-31 06:39:35 +08:00
|
|
|
#ifndef OPENSSL_NO_SOCK
|
|
|
|
static const char *tls_error_hint(void)
|
|
|
|
{
|
|
|
|
unsigned long err = ERR_peek_error();
|
|
|
|
|
|
|
|
if (ERR_GET_LIB(err) != ERR_LIB_SSL)
|
|
|
|
err = ERR_peek_last_error();
|
|
|
|
if (ERR_GET_LIB(err) != ERR_LIB_SSL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
switch (ERR_GET_REASON(err)) {
|
|
|
|
case SSL_R_WRONG_VERSION_NUMBER:
|
|
|
|
return "The server does not support (a suitable version of) TLS";
|
|
|
|
case SSL_R_UNKNOWN_PROTOCOL:
|
|
|
|
return "The server does not support HTTPS";
|
|
|
|
case SSL_R_CERTIFICATE_VERIFY_FAILED:
|
|
|
|
return "Cannot authenticate server via its TLS certificate, likely due to mismatch with our trusted TLS certs or missing revocation status";
|
|
|
|
case SSL_AD_REASON_OFFSET + TLS1_AD_UNKNOWN_CA:
|
|
|
|
return "Server did not accept our TLS certificate, likely due to mismatch with server's trust anchor or missing revocation status";
|
|
|
|
case SSL_AD_REASON_OFFSET + SSL3_AD_HANDSHAKE_FAILURE:
|
|
|
|
return "TLS handshake failure. Possibly the server requires our TLS certificate but did not receive it";
|
|
|
|
default: /* no error or no hint available for error */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* HTTP callback function that supports TLS connection also via HTTPS proxy */
|
|
|
|
BIO *app_http_tls_cb(BIO *hbio, void *arg, int connect, int detail)
|
|
|
|
{
|
|
|
|
APP_HTTP_TLS_INFO *info = (APP_HTTP_TLS_INFO *)arg;
|
|
|
|
SSL_CTX *ssl_ctx = info->ssl_ctx;
|
|
|
|
SSL *ssl;
|
|
|
|
BIO *sbio = NULL;
|
|
|
|
|
|
|
|
if (connect && detail) { /* connecting with TLS */
|
|
|
|
if ((info->use_proxy
|
|
|
|
&& !OSSL_HTTP_proxy_connect(hbio, info->server, info->port,
|
|
|
|
NULL, NULL, /* no proxy credentials */
|
|
|
|
info->timeout, bio_err, opt_getprog()))
|
|
|
|
|| (sbio = BIO_new(BIO_f_ssl())) == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (ssl_ctx == NULL || (ssl = SSL_new(ssl_ctx)) == NULL) {
|
|
|
|
BIO_free(sbio);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
SSL_set_tlsext_host_name(ssl, info->server);
|
|
|
|
|
|
|
|
SSL_set_connect_state(ssl);
|
|
|
|
BIO_set_ssl(sbio, ssl, BIO_CLOSE);
|
|
|
|
|
|
|
|
hbio = BIO_push(sbio, hbio);
|
|
|
|
} else if (!connect && !detail) { /* disconnecting after error */
|
|
|
|
const char *hint = tls_error_hint();
|
|
|
|
if (hint != NULL)
|
2020-02-20 01:00:26 +08:00
|
|
|
ERR_add_error_data(2, " : ", hint);
|
2019-10-31 06:39:35 +08:00
|
|
|
/*
|
|
|
|
* If we pop sbio and BIO_free() it this may lead to libssl double free.
|
|
|
|
* Rely on BIO_free_all() done by OSSL_HTTP_transfer() in http_client.c
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
return hbio;
|
|
|
|
}
|
|
|
|
|
|
|
|
ASN1_VALUE *app_http_get_asn1(const char *url, const char *proxy,
|
2020-02-20 01:00:26 +08:00
|
|
|
const char *no_proxy, SSL_CTX *ssl_ctx,
|
2019-10-31 06:39:35 +08:00
|
|
|
const STACK_OF(CONF_VALUE) *headers,
|
|
|
|
long timeout, const char *expected_content_type,
|
|
|
|
const ASN1_ITEM *it)
|
|
|
|
{
|
|
|
|
APP_HTTP_TLS_INFO info;
|
|
|
|
char *server;
|
|
|
|
char *port;
|
|
|
|
int use_ssl;
|
|
|
|
ASN1_VALUE *resp = NULL;
|
|
|
|
|
|
|
|
if (url == NULL || it == NULL) {
|
2020-11-04 19:23:19 +08:00
|
|
|
ERR_raise(ERR_LIB_HTTP, ERR_R_PASSED_NULL_PARAMETER);
|
2019-10-31 06:39:35 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2020-09-03 19:32:56 +08:00
|
|
|
if (!OSSL_HTTP_parse_url(url, &server, &port, NULL, NULL, &use_ssl))
|
2019-10-31 06:39:35 +08:00
|
|
|
return NULL;
|
|
|
|
if (use_ssl && ssl_ctx == NULL) {
|
2020-11-04 23:14:00 +08:00
|
|
|
ERR_raise_data(ERR_LIB_HTTP, ERR_R_PASSED_NULL_PARAMETER,
|
|
|
|
"missing SSL_CTX");
|
2019-10-31 06:39:35 +08:00
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
info.server = server;
|
|
|
|
info.port = port;
|
|
|
|
info.use_proxy = proxy != NULL;
|
|
|
|
info.timeout = timeout;
|
|
|
|
info.ssl_ctx = ssl_ctx;
|
2020-02-20 01:00:26 +08:00
|
|
|
resp = OSSL_HTTP_get_asn1(url, proxy, no_proxy,
|
2019-10-31 06:39:35 +08:00
|
|
|
NULL, NULL, app_http_tls_cb, &info,
|
|
|
|
headers, 0 /* maxline */, 0 /* max_resp_len */,
|
|
|
|
timeout, expected_content_type, it);
|
|
|
|
end:
|
|
|
|
OPENSSL_free(server);
|
|
|
|
OPENSSL_free(port);
|
|
|
|
return resp;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
ASN1_VALUE *app_http_post_asn1(const char *host, const char *port,
|
|
|
|
const char *path, const char *proxy,
|
2020-02-20 01:00:26 +08:00
|
|
|
const char *no_proxy, SSL_CTX *ssl_ctx,
|
2019-10-31 06:39:35 +08:00
|
|
|
const STACK_OF(CONF_VALUE) *headers,
|
|
|
|
const char *content_type,
|
|
|
|
ASN1_VALUE *req, const ASN1_ITEM *req_it,
|
|
|
|
long timeout, const ASN1_ITEM *rsp_it)
|
|
|
|
{
|
|
|
|
APP_HTTP_TLS_INFO info;
|
|
|
|
|
|
|
|
info.server = host;
|
|
|
|
info.port = port;
|
|
|
|
info.use_proxy = proxy != NULL;
|
|
|
|
info.timeout = timeout;
|
|
|
|
info.ssl_ctx = ssl_ctx;
|
|
|
|
return OSSL_HTTP_post_asn1(host, port, path, ssl_ctx != NULL,
|
2020-02-20 01:00:26 +08:00
|
|
|
proxy, no_proxy,
|
2019-10-31 06:39:35 +08:00
|
|
|
NULL, NULL, app_http_tls_cb, &info,
|
|
|
|
headers, content_type, req, req_it,
|
|
|
|
0 /* maxline */,
|
|
|
|
0 /* max_resp_len */, timeout, NULL, rsp_it);
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2005-11-06 19:40:59 +08:00
|
|
|
/*
|
|
|
|
* Platform-specific sections
|
|
|
|
*/
|
2005-11-04 17:30:55 +08:00
|
|
|
#if defined(_WIN32)
|
2005-11-05 00:12:05 +08:00
|
|
|
# ifdef fileno
|
|
|
|
# undef fileno
|
|
|
|
# define fileno(a) (int)_fileno(a)
|
|
|
|
# endif
|
|
|
|
|
|
|
|
# include <windows.h>
|
|
|
|
# include <tchar.h>
|
|
|
|
|
|
|
|
static int WIN32_rename(const char *from, const char *to)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
TCHAR *tfrom = NULL, *tto;
|
|
|
|
DWORD err;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (sizeof(TCHAR) == 1) {
|
|
|
|
tfrom = (TCHAR *)from;
|
|
|
|
tto = (TCHAR *)to;
|
|
|
|
} else { /* UNICODE path */
|
|
|
|
|
|
|
|
size_t i, flen = strlen(from) + 1, tlen = strlen(to) + 1;
|
2015-05-06 05:09:01 +08:00
|
|
|
tfrom = malloc(sizeof(*tfrom) * (flen + tlen));
|
2015-01-22 11:40:55 +08:00
|
|
|
if (tfrom == NULL)
|
|
|
|
goto err;
|
|
|
|
tto = tfrom + flen;
|
|
|
|
# if !defined(_WIN32_WCE) || _WIN32_WCE>=101
|
|
|
|
if (!MultiByteToWideChar(CP_ACP, 0, from, flen, (WCHAR *)tfrom, flen))
|
|
|
|
# endif
|
|
|
|
for (i = 0; i < flen; i++)
|
|
|
|
tfrom[i] = (TCHAR)from[i];
|
|
|
|
# if !defined(_WIN32_WCE) || _WIN32_WCE>=101
|
|
|
|
if (!MultiByteToWideChar(CP_ACP, 0, to, tlen, (WCHAR *)tto, tlen))
|
|
|
|
# endif
|
|
|
|
for (i = 0; i < tlen; i++)
|
|
|
|
tto[i] = (TCHAR)to[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
if (MoveFile(tfrom, tto))
|
|
|
|
goto ok;
|
|
|
|
err = GetLastError();
|
|
|
|
if (err == ERROR_ALREADY_EXISTS || err == ERROR_FILE_EXISTS) {
|
|
|
|
if (DeleteFile(tto) && MoveFile(tfrom, tto))
|
|
|
|
goto ok;
|
|
|
|
err = GetLastError();
|
|
|
|
}
|
|
|
|
if (err == ERROR_FILE_NOT_FOUND || err == ERROR_PATH_NOT_FOUND)
|
|
|
|
errno = ENOENT;
|
|
|
|
else if (err == ERROR_ACCESS_DENIED)
|
|
|
|
errno = EACCES;
|
|
|
|
else
|
|
|
|
errno = EINVAL; /* we could map more codes... */
|
|
|
|
err:
|
|
|
|
ret = -1;
|
|
|
|
ok:
|
|
|
|
if (tfrom != NULL && tfrom != (TCHAR *)from)
|
|
|
|
free(tfrom);
|
|
|
|
return ret;
|
|
|
|
}
|
2005-11-06 19:40:59 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/* app_tminterval section */
|
|
|
|
#if defined(_WIN32)
|
2015-01-22 11:40:55 +08:00
|
|
|
double app_tminterval(int stop, int usertime)
|
|
|
|
{
|
|
|
|
FILETIME now;
|
|
|
|
double ret = 0;
|
|
|
|
static ULARGE_INTEGER tmstart;
|
|
|
|
static int warning = 1;
|
|
|
|
# ifdef _WIN32_WINNT
|
|
|
|
static HANDLE proc = NULL;
|
|
|
|
|
|
|
|
if (proc == NULL) {
|
|
|
|
if (check_winnt())
|
|
|
|
proc = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE,
|
|
|
|
GetCurrentProcessId());
|
|
|
|
if (proc == NULL)
|
|
|
|
proc = (HANDLE) - 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (usertime && proc != (HANDLE) - 1) {
|
|
|
|
FILETIME junk;
|
|
|
|
GetProcessTimes(proc, &junk, &junk, &junk, &now);
|
|
|
|
} else
|
|
|
|
# endif
|
|
|
|
{
|
|
|
|
SYSTEMTIME systime;
|
2005-11-07 01:11:04 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
if (usertime && warning) {
|
|
|
|
BIO_printf(bio_err, "To get meaningful results, run "
|
|
|
|
"this program on idle system.\n");
|
|
|
|
warning = 0;
|
|
|
|
}
|
|
|
|
GetSystemTime(&systime);
|
|
|
|
SystemTimeToFileTime(&systime, &now);
|
|
|
|
}
|
2005-11-07 01:11:04 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
if (stop == TM_START) {
|
|
|
|
tmstart.u.LowPart = now.dwLowDateTime;
|
|
|
|
tmstart.u.HighPart = now.dwHighDateTime;
|
|
|
|
} else {
|
|
|
|
ULARGE_INTEGER tmstop;
|
2005-11-07 01:11:04 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
tmstop.u.LowPart = now.dwLowDateTime;
|
|
|
|
tmstop.u.HighPart = now.dwHighDateTime;
|
2005-11-07 01:11:04 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
ret = (__int64)(tmstop.QuadPart - tmstart.QuadPart) * 1e-7;
|
|
|
|
}
|
2005-11-07 01:11:04 +08:00
|
|
|
|
2017-10-17 22:04:09 +08:00
|
|
|
return ret;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2018-12-20 19:59:31 +08:00
|
|
|
#elif defined(OPENSSL_SYS_VXWORKS)
|
2015-01-22 11:40:55 +08:00
|
|
|
# include <time.h>
|
2005-11-06 19:40:59 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
double app_tminterval(int stop, int usertime)
|
|
|
|
{
|
|
|
|
double ret = 0;
|
|
|
|
# ifdef CLOCK_REALTIME
|
|
|
|
static struct timespec tmstart;
|
|
|
|
struct timespec now;
|
|
|
|
# else
|
|
|
|
static unsigned long tmstart;
|
|
|
|
unsigned long now;
|
|
|
|
# endif
|
|
|
|
static int warning = 1;
|
|
|
|
|
|
|
|
if (usertime && warning) {
|
|
|
|
BIO_printf(bio_err, "To get meaningful results, run "
|
|
|
|
"this program on idle system.\n");
|
|
|
|
warning = 0;
|
|
|
|
}
|
|
|
|
# ifdef CLOCK_REALTIME
|
|
|
|
clock_gettime(CLOCK_REALTIME, &now);
|
|
|
|
if (stop == TM_START)
|
|
|
|
tmstart = now;
|
|
|
|
else
|
|
|
|
ret = ((now.tv_sec + now.tv_nsec * 1e-9)
|
|
|
|
- (tmstart.tv_sec + tmstart.tv_nsec * 1e-9));
|
|
|
|
# else
|
|
|
|
now = tickGet();
|
|
|
|
if (stop == TM_START)
|
|
|
|
tmstart = now;
|
|
|
|
else
|
|
|
|
ret = (now - tmstart) / (double)sysClkRateGet();
|
|
|
|
# endif
|
2017-10-17 22:04:09 +08:00
|
|
|
return ret;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2005-11-06 19:40:59 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
#elif defined(_SC_CLK_TCK) /* by means of unistd.h */
|
|
|
|
# include <sys/times.h>
|
2005-11-06 19:40:59 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
double app_tminterval(int stop, int usertime)
|
|
|
|
{
|
|
|
|
double ret = 0;
|
2020-05-08 03:37:28 +08:00
|
|
|
struct tms rus;
|
2020-05-22 16:07:43 +08:00
|
|
|
clock_t now = times(&rus);
|
|
|
|
static clock_t tmstart;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
if (usertime)
|
|
|
|
now = rus.tms_utime;
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (stop == TM_START) {
|
2015-01-22 11:40:55 +08:00
|
|
|
tmstart = now;
|
2017-06-13 01:24:02 +08:00
|
|
|
} else {
|
2020-05-22 16:07:43 +08:00
|
|
|
long int tck = sysconf(_SC_CLK_TCK);
|
2015-01-22 11:40:55 +08:00
|
|
|
ret = (now - tmstart) / (double)tck;
|
|
|
|
}
|
|
|
|
|
2017-10-17 22:04:09 +08:00
|
|
|
return ret;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2005-11-06 19:40:59 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
#else
|
|
|
|
# include <sys/time.h>
|
|
|
|
# include <sys/resource.h>
|
2005-11-06 19:40:59 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
double app_tminterval(int stop, int usertime)
|
|
|
|
{
|
|
|
|
double ret = 0;
|
|
|
|
struct rusage rus;
|
|
|
|
struct timeval now;
|
|
|
|
static struct timeval tmstart;
|
|
|
|
|
|
|
|
if (usertime)
|
|
|
|
getrusage(RUSAGE_SELF, &rus), now = rus.ru_utime;
|
|
|
|
else
|
|
|
|
gettimeofday(&now, NULL);
|
|
|
|
|
|
|
|
if (stop == TM_START)
|
|
|
|
tmstart = now;
|
|
|
|
else
|
|
|
|
ret = ((now.tv_sec + now.tv_usec * 1e-6)
|
|
|
|
- (tmstart.tv_sec + tmstart.tv_usec * 1e-6));
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2005-11-06 19:40:59 +08:00
|
|
|
#endif
|
2005-11-05 00:12:05 +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 app_access(const char* name, int flag)
|
|
|
|
{
|
|
|
|
#ifdef _WIN32
|
|
|
|
return _access(name, flag);
|
|
|
|
#else
|
|
|
|
return access(name, flag);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2005-11-04 17:30:55 +08:00
|
|
|
int app_isdir(const char *name)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
2018-08-16 10:36:01 +08:00
|
|
|
return opt_isdir(name);
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2005-11-04 17:30:55 +08:00
|
|
|
|
2005-11-06 19:40:59 +08:00
|
|
|
/* raw_read|write section */
|
2016-09-15 17:20:18 +08:00
|
|
|
#if defined(__VMS)
|
|
|
|
# include "vms_term_sock.h"
|
|
|
|
static int stdin_sock = -1;
|
|
|
|
|
|
|
|
static void close_stdin_sock(void)
|
|
|
|
{
|
|
|
|
TerminalSocket (TERM_SOCK_DELETE, &stdin_sock);
|
|
|
|
}
|
|
|
|
|
|
|
|
int fileno_stdin(void)
|
|
|
|
{
|
|
|
|
if (stdin_sock == -1) {
|
|
|
|
TerminalSocket(TERM_SOCK_CREATE, &stdin_sock);
|
|
|
|
atexit(close_stdin_sock);
|
|
|
|
}
|
|
|
|
|
|
|
|
return stdin_sock;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
int fileno_stdin(void)
|
|
|
|
{
|
|
|
|
return fileno(stdin);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
int fileno_stdout(void)
|
|
|
|
{
|
|
|
|
return fileno(stdout);
|
|
|
|
}
|
|
|
|
|
2005-11-04 17:30:55 +08:00
|
|
|
#if defined(_WIN32) && defined(STD_INPUT_HANDLE)
|
2015-01-22 11:40:55 +08:00
|
|
|
int raw_read_stdin(void *buf, int siz)
|
|
|
|
{
|
|
|
|
DWORD n;
|
|
|
|
if (ReadFile(GetStdHandle(STD_INPUT_HANDLE), buf, siz, &n, NULL))
|
2017-10-17 22:04:09 +08:00
|
|
|
return n;
|
2015-01-22 11:40:55 +08:00
|
|
|
else
|
2017-10-17 22:04:09 +08:00
|
|
|
return -1;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2016-09-15 17:20:18 +08:00
|
|
|
#elif defined(__VMS)
|
2017-06-13 01:24:02 +08:00
|
|
|
# include <sys/socket.h>
|
2016-09-21 00:43:24 +08:00
|
|
|
|
2016-09-15 17:20:18 +08:00
|
|
|
int raw_read_stdin(void *buf, int siz)
|
|
|
|
{
|
|
|
|
return recv(fileno_stdin(), buf, siz, 0);
|
|
|
|
}
|
2005-11-04 17:30:55 +08:00
|
|
|
#else
|
2020-09-07 05:37:47 +08:00
|
|
|
# if defined(__TANDEM)
|
|
|
|
# if defined(OPENSSL_TANDEM_FLOSS)
|
|
|
|
# include <floss.h(floss_read)>
|
|
|
|
# endif
|
|
|
|
# endif
|
2015-01-22 11:40:55 +08:00
|
|
|
int raw_read_stdin(void *buf, int siz)
|
|
|
|
{
|
2016-09-15 17:20:18 +08:00
|
|
|
return read(fileno_stdin(), buf, siz);
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2005-11-04 17:30:55 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(_WIN32) && defined(STD_OUTPUT_HANDLE)
|
2015-01-22 11:40:55 +08:00
|
|
|
int raw_write_stdout(const void *buf, int siz)
|
|
|
|
{
|
|
|
|
DWORD n;
|
|
|
|
if (WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), buf, siz, &n, NULL))
|
2017-10-17 22:04:09 +08:00
|
|
|
return n;
|
2015-01-22 11:40:55 +08:00
|
|
|
else
|
2017-10-17 22:04:09 +08:00
|
|
|
return -1;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2020-09-21 19:14:26 +08:00
|
|
|
#elif defined(OPENSSL_SYS_TANDEM) && defined(OPENSSL_THREADS) && defined(_SPT_MODEL_)
|
2020-09-07 05:37:47 +08:00
|
|
|
# if defined(__TANDEM)
|
|
|
|
# if defined(OPENSSL_TANDEM_FLOSS)
|
|
|
|
# include <floss.h(floss_write)>
|
|
|
|
# endif
|
|
|
|
# endif
|
|
|
|
int raw_write_stdout(const void *buf,int siz)
|
|
|
|
{
|
|
|
|
return write(fileno(stdout),(void*)buf,siz);
|
|
|
|
}
|
2005-11-04 17:30:55 +08:00
|
|
|
#else
|
2020-09-07 05:37:47 +08:00
|
|
|
# if defined(__TANDEM)
|
|
|
|
# if defined(OPENSSL_TANDEM_FLOSS)
|
|
|
|
# include <floss.h(floss_write)>
|
|
|
|
# endif
|
|
|
|
# endif
|
2015-01-22 11:40:55 +08:00
|
|
|
int raw_write_stdout(const void *buf, int siz)
|
|
|
|
{
|
2016-09-15 17:20:18 +08:00
|
|
|
return write(fileno_stdout(), buf, siz);
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2005-11-04 17:30:55 +08:00
|
|
|
#endif
|
2015-09-06 16:51:04 +08:00
|
|
|
|
|
|
|
/*
|
2018-08-16 10:36:01 +08:00
|
|
|
* Centralized handling of input and output files with format specification
|
2015-09-06 16:51:04 +08:00
|
|
|
* The format is meant to show what the input and output is supposed to be,
|
|
|
|
* and is therefore a show of intent more than anything else. However, it
|
2018-08-16 10:36:01 +08:00
|
|
|
* does impact behavior on some platforms, such as differentiating between
|
2015-09-06 16:51:04 +08:00
|
|
|
* text and binary input/output on non-Unix platforms
|
|
|
|
*/
|
2015-09-06 18:20:12 +08:00
|
|
|
BIO *dup_bio_in(int format)
|
2015-09-06 16:51:04 +08:00
|
|
|
{
|
2015-09-06 18:20:12 +08:00
|
|
|
return BIO_new_fp(stdin,
|
2018-08-16 10:36:01 +08:00
|
|
|
BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0));
|
2015-09-06 18:20:12 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
BIO *dup_bio_out(int format)
|
|
|
|
{
|
|
|
|
BIO *b = BIO_new_fp(stdout,
|
2018-08-16 10:36:01 +08:00
|
|
|
BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0));
|
2018-01-28 16:49:46 +08:00
|
|
|
void *prefix = NULL;
|
|
|
|
|
2015-09-06 16:51:04 +08:00
|
|
|
#ifdef OPENSSL_SYS_VMS
|
2018-08-16 10:36:01 +08:00
|
|
|
if (FMT_istext(format))
|
2015-09-06 18:20:12 +08:00
|
|
|
b = BIO_push(BIO_new(BIO_f_linebuffer()), b);
|
2016-03-22 01:30:30 +08:00
|
|
|
#endif
|
2018-01-28 16:49:46 +08:00
|
|
|
|
2018-12-14 22:48:53 +08:00
|
|
|
if (FMT_istext(format)
|
|
|
|
&& (prefix = getenv("HARNESS_OSSL_PREFIX")) != NULL) {
|
2019-11-27 23:13:12 +08:00
|
|
|
b = BIO_push(BIO_new(BIO_f_prefix()), b);
|
|
|
|
BIO_set_prefix(b, prefix);
|
2018-01-28 16:49:46 +08:00
|
|
|
}
|
|
|
|
|
2016-03-22 01:30:30 +08:00
|
|
|
return b;
|
|
|
|
}
|
|
|
|
|
|
|
|
BIO *dup_bio_err(int format)
|
|
|
|
{
|
|
|
|
BIO *b = BIO_new_fp(stderr,
|
2018-08-16 10:36:01 +08:00
|
|
|
BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0));
|
2016-03-22 01:30:30 +08:00
|
|
|
#ifdef OPENSSL_SYS_VMS
|
2018-08-16 10:36:01 +08:00
|
|
|
if (FMT_istext(format))
|
2016-03-22 01:30:30 +08:00
|
|
|
b = BIO_push(BIO_new(BIO_f_linebuffer()), b);
|
2015-09-06 16:51:04 +08:00
|
|
|
#endif
|
|
|
|
return b;
|
|
|
|
}
|
|
|
|
|
|
|
|
void unbuffer(FILE *fp)
|
|
|
|
{
|
2016-03-30 14:32:19 +08:00
|
|
|
/*
|
|
|
|
* On VMS, setbuf() will only take 32-bit pointers, and a compilation
|
|
|
|
* with /POINTER_SIZE=64 will give off a MAYLOSEDATA2 warning here.
|
|
|
|
* However, we trust that the C RTL will never give us a FILE pointer
|
|
|
|
* above the first 4 GB of memory, so we simply turn off the warning
|
|
|
|
* temporarily.
|
|
|
|
*/
|
|
|
|
#if defined(OPENSSL_SYS_VMS) && defined(__DECC)
|
|
|
|
# pragma environment save
|
|
|
|
# pragma message disable maylosedata2
|
|
|
|
#endif
|
2015-09-06 16:51:04 +08:00
|
|
|
setbuf(fp, NULL);
|
2016-03-30 14:32:19 +08:00
|
|
|
#if defined(OPENSSL_SYS_VMS) && defined(__DECC)
|
|
|
|
# pragma environment restore
|
|
|
|
#endif
|
2015-09-06 16:51:04 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static const char *modestr(char mode, int format)
|
|
|
|
{
|
|
|
|
OPENSSL_assert(mode == 'a' || mode == 'r' || mode == 'w');
|
|
|
|
|
|
|
|
switch (mode) {
|
|
|
|
case 'a':
|
2018-08-16 10:36:01 +08:00
|
|
|
return FMT_istext(format) ? "a" : "ab";
|
2015-09-06 16:51:04 +08:00
|
|
|
case 'r':
|
2018-08-16 10:36:01 +08:00
|
|
|
return FMT_istext(format) ? "r" : "rb";
|
2015-09-06 16:51:04 +08:00
|
|
|
case 'w':
|
2018-08-16 10:36:01 +08:00
|
|
|
return FMT_istext(format) ? "w" : "wb";
|
2015-09-06 16:51:04 +08:00
|
|
|
}
|
|
|
|
/* The assert above should make sure we never reach this point */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *modeverb(char mode)
|
|
|
|
{
|
|
|
|
switch (mode) {
|
|
|
|
case 'a':
|
|
|
|
return "appending";
|
|
|
|
case 'r':
|
|
|
|
return "reading";
|
|
|
|
case 'w':
|
|
|
|
return "writing";
|
|
|
|
}
|
|
|
|
return "(doing something)";
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Open a file for writing, owner-read-only.
|
|
|
|
*/
|
|
|
|
BIO *bio_open_owner(const char *filename, int format, int private)
|
|
|
|
{
|
|
|
|
FILE *fp = NULL;
|
|
|
|
BIO *b = NULL;
|
2016-01-14 21:07:57 +08:00
|
|
|
int fd = -1, bflags, mode, textmode;
|
2015-09-06 16:51:04 +08:00
|
|
|
|
|
|
|
if (!private || filename == NULL || strcmp(filename, "-") == 0)
|
|
|
|
return bio_open_default(filename, 'w', format);
|
|
|
|
|
|
|
|
mode = O_WRONLY;
|
|
|
|
#ifdef O_CREAT
|
|
|
|
mode |= O_CREAT;
|
|
|
|
#endif
|
|
|
|
#ifdef O_TRUNC
|
|
|
|
mode |= O_TRUNC;
|
|
|
|
#endif
|
2018-08-16 10:36:01 +08:00
|
|
|
textmode = FMT_istext(format);
|
2016-01-14 21:07:57 +08:00
|
|
|
if (!textmode) {
|
2015-09-06 16:51:04 +08:00
|
|
|
#ifdef O_BINARY
|
|
|
|
mode |= O_BINARY;
|
|
|
|
#elif defined(_O_BINARY)
|
|
|
|
mode |= _O_BINARY;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2016-01-14 21:08:49 +08:00
|
|
|
#ifdef OPENSSL_SYS_VMS
|
|
|
|
/* VMS doesn't have O_BINARY, it just doesn't make sense. But,
|
|
|
|
* it still needs to know that we're going binary, or fdopen()
|
|
|
|
* will fail with "invalid argument"... so we tell VMS what the
|
|
|
|
* context is.
|
|
|
|
*/
|
|
|
|
if (!textmode)
|
|
|
|
fd = open(filename, mode, 0600, "ctx=bin");
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
fd = open(filename, mode, 0600);
|
2015-09-06 16:51:04 +08:00
|
|
|
if (fd < 0)
|
|
|
|
goto err;
|
|
|
|
fp = fdopen(fd, modestr('w', format));
|
|
|
|
if (fp == NULL)
|
|
|
|
goto err;
|
|
|
|
bflags = BIO_CLOSE;
|
2016-01-14 21:07:57 +08:00
|
|
|
if (textmode)
|
2015-09-06 16:51:04 +08:00
|
|
|
bflags |= BIO_FP_TEXT;
|
|
|
|
b = BIO_new_fp(fp, bflags);
|
|
|
|
if (b)
|
|
|
|
return b;
|
|
|
|
|
|
|
|
err:
|
|
|
|
BIO_printf(bio_err, "%s: Can't open \"%s\" for writing, %s\n",
|
|
|
|
opt_getprog(), filename, strerror(errno));
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
/* If we have fp, then fdopen took over fd, so don't close both. */
|
|
|
|
if (fp)
|
|
|
|
fclose(fp);
|
|
|
|
else if (fd >= 0)
|
|
|
|
close(fd);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static BIO *bio_open_default_(const char *filename, char mode, int format,
|
|
|
|
int quiet)
|
|
|
|
{
|
|
|
|
BIO *ret;
|
|
|
|
|
|
|
|
if (filename == NULL || strcmp(filename, "-") == 0) {
|
2015-09-06 18:20:12 +08:00
|
|
|
ret = mode == 'r' ? dup_bio_in(format) : dup_bio_out(format);
|
2015-09-06 16:51:04 +08:00
|
|
|
if (quiet) {
|
|
|
|
ERR_clear_error();
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
if (ret != NULL)
|
|
|
|
return ret;
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Can't open %s, %s\n",
|
|
|
|
mode == 'r' ? "stdin" : "stdout", strerror(errno));
|
|
|
|
} else {
|
|
|
|
ret = BIO_new_file(filename, modestr(mode, format));
|
|
|
|
if (quiet) {
|
|
|
|
ERR_clear_error();
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
if (ret != NULL)
|
|
|
|
return ret;
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Can't open %s for %s, %s\n",
|
|
|
|
filename, modeverb(mode), strerror(errno));
|
|
|
|
}
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
BIO *bio_open_default(const char *filename, char mode, int format)
|
|
|
|
{
|
|
|
|
return bio_open_default_(filename, mode, format, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
BIO *bio_open_default_quiet(const char *filename, char mode, int format)
|
|
|
|
{
|
|
|
|
return bio_open_default_(filename, mode, format, 1);
|
|
|
|
}
|
|
|
|
|
2015-10-06 21:04:11 +08:00
|
|
|
void wait_for_async(SSL *s)
|
|
|
|
{
|
2016-04-20 19:56:54 +08:00
|
|
|
/* On Windows select only works for sockets, so we simply don't wait */
|
|
|
|
#ifndef OPENSSL_SYS_WINDOWS
|
2016-01-25 23:28:57 +08:00
|
|
|
int width = 0;
|
2015-10-06 21:04:11 +08:00
|
|
|
fd_set asyncfds;
|
2016-01-25 23:28:57 +08:00
|
|
|
OSSL_ASYNC_FD *fds;
|
|
|
|
size_t numfds;
|
2017-07-26 08:04:05 +08:00
|
|
|
size_t i;
|
2015-10-06 21:04:11 +08:00
|
|
|
|
2016-01-25 23:28:57 +08:00
|
|
|
if (!SSL_get_all_async_fds(s, NULL, &numfds))
|
|
|
|
return;
|
|
|
|
if (numfds == 0)
|
2015-10-06 21:04:11 +08:00
|
|
|
return;
|
2016-05-17 02:58:00 +08:00
|
|
|
fds = app_malloc(sizeof(OSSL_ASYNC_FD) * numfds, "allocate async fds");
|
2016-01-25 23:28:57 +08:00
|
|
|
if (!SSL_get_all_async_fds(s, fds, &numfds)) {
|
|
|
|
OPENSSL_free(fds);
|
2017-07-26 08:04:05 +08:00
|
|
|
return;
|
2016-01-25 23:28:57 +08:00
|
|
|
}
|
2015-10-06 21:04:11 +08:00
|
|
|
|
|
|
|
FD_ZERO(&asyncfds);
|
2017-07-26 08:04:05 +08:00
|
|
|
for (i = 0; i < numfds; i++) {
|
|
|
|
if (width <= (int)fds[i])
|
|
|
|
width = (int)fds[i] + 1;
|
|
|
|
openssl_fdset((int)fds[i], &asyncfds);
|
2016-01-25 23:28:57 +08:00
|
|
|
}
|
2015-10-06 21:04:11 +08:00
|
|
|
select(width, (void *)&asyncfds, NULL, NULL, NULL);
|
2017-07-26 08:04:05 +08:00
|
|
|
OPENSSL_free(fds);
|
2016-04-20 19:56:54 +08:00
|
|
|
#endif
|
2015-10-06 21:04:11 +08:00
|
|
|
}
|
2016-05-20 18:53:26 +08:00
|
|
|
|
|
|
|
/* if OPENSSL_SYS_WINDOWS is defined then so is OPENSSL_SYS_MSDOS */
|
|
|
|
#if defined(OPENSSL_SYS_MSDOS)
|
|
|
|
int has_stdin_waiting(void)
|
|
|
|
{
|
|
|
|
# if defined(OPENSSL_SYS_WINDOWS)
|
|
|
|
HANDLE inhand = GetStdHandle(STD_INPUT_HANDLE);
|
|
|
|
DWORD events = 0;
|
|
|
|
INPUT_RECORD inputrec;
|
|
|
|
DWORD insize = 1;
|
|
|
|
BOOL peeked;
|
|
|
|
|
|
|
|
if (inhand == INVALID_HANDLE_VALUE) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
peeked = PeekConsoleInput(inhand, &inputrec, insize, &events);
|
|
|
|
if (!peeked) {
|
|
|
|
/* Probably redirected input? _kbhit() does not work in this case */
|
|
|
|
if (!feof(stdin)) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
return _kbhit();
|
|
|
|
}
|
|
|
|
#endif
|
2016-08-16 21:06:48 +08:00
|
|
|
|
|
|
|
/* Corrupt a signature by modifying final byte */
|
2016-08-17 19:34:22 +08:00
|
|
|
void corrupt_signature(const ASN1_STRING *signature)
|
2016-08-16 21:06:48 +08:00
|
|
|
{
|
2016-08-17 19:34:22 +08:00
|
|
|
unsigned char *s = signature->data;
|
|
|
|
s[signature->length - 1] ^= 0x1;
|
2016-08-16 21:06:48 +08:00
|
|
|
}
|
2016-08-19 23:21:21 +08:00
|
|
|
|
|
|
|
int set_cert_times(X509 *x, const char *startdate, const char *enddate,
|
|
|
|
int days)
|
|
|
|
{
|
|
|
|
if (startdate == NULL || strcmp(startdate, "today") == 0) {
|
2016-08-20 20:02:09 +08:00
|
|
|
if (X509_gmtime_adj(X509_getm_notBefore(x), 0) == NULL)
|
|
|
|
return 0;
|
|
|
|
} else {
|
2017-06-12 04:36:07 +08:00
|
|
|
if (!ASN1_TIME_set_string_X509(X509_getm_notBefore(x), startdate))
|
2016-08-20 20:02:09 +08:00
|
|
|
return 0;
|
2016-08-19 23:21:21 +08:00
|
|
|
}
|
|
|
|
if (enddate == NULL) {
|
2016-08-20 20:02:09 +08:00
|
|
|
if (X509_time_adj_ex(X509_getm_notAfter(x), days, 0, NULL)
|
|
|
|
== NULL)
|
|
|
|
return 0;
|
2017-06-12 04:36:07 +08:00
|
|
|
} else if (!ASN1_TIME_set_string_X509(X509_getm_notAfter(x), enddate)) {
|
2016-08-20 20:02:09 +08:00
|
|
|
return 0;
|
2016-08-19 23:21:21 +08:00
|
|
|
}
|
2016-08-20 20:02:09 +08:00
|
|
|
return 1;
|
2016-08-19 23:21:21 +08:00
|
|
|
}
|
2017-02-10 05:20:59 +08:00
|
|
|
|
2020-09-04 06:42:56 +08:00
|
|
|
int set_crl_lastupdate(X509_CRL *crl, const char *lastupdate)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
ASN1_TIME *tm = ASN1_TIME_new();
|
|
|
|
|
|
|
|
if (tm == NULL)
|
|
|
|
goto end;
|
|
|
|
|
|
|
|
if (lastupdate == NULL) {
|
|
|
|
if (X509_gmtime_adj(tm, 0) == NULL)
|
|
|
|
goto end;
|
|
|
|
} else {
|
|
|
|
if (!ASN1_TIME_set_string_X509(tm, lastupdate))
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!X509_CRL_set1_lastUpdate(crl, tm))
|
|
|
|
goto end;
|
|
|
|
|
|
|
|
ret = 1;
|
|
|
|
end:
|
|
|
|
ASN1_TIME_free(tm);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int set_crl_nextupdate(X509_CRL *crl, const char *nextupdate,
|
|
|
|
long days, long hours, long secs)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
ASN1_TIME *tm = ASN1_TIME_new();
|
|
|
|
|
|
|
|
if (tm == NULL)
|
|
|
|
goto end;
|
|
|
|
|
|
|
|
if (nextupdate == NULL) {
|
|
|
|
if (X509_time_adj_ex(tm, days, hours * 60 * 60 + secs, NULL) == NULL)
|
|
|
|
goto end;
|
|
|
|
} else {
|
|
|
|
if (!ASN1_TIME_set_string_X509(tm, nextupdate))
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!X509_CRL_set1_nextUpdate(crl, tm))
|
|
|
|
goto end;
|
|
|
|
|
|
|
|
ret = 1;
|
|
|
|
end:
|
|
|
|
ASN1_TIME_free(tm);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2017-02-10 05:20:59 +08:00
|
|
|
void make_uppercase(char *string)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; string[i] != '\0'; i++)
|
|
|
|
string[i] = toupper((unsigned char)string[i]);
|
|
|
|
}
|
2018-08-16 10:36:01 +08:00
|
|
|
|
|
|
|
int opt_printf_stderr(const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
ret = BIO_vprintf(bio_err, fmt, ap);
|
|
|
|
va_end(ap);
|
|
|
|
return ret;
|
|
|
|
}
|
2019-08-24 16:56:34 +08:00
|
|
|
|
|
|
|
OSSL_PARAM *app_params_new_from_opts(STACK_OF(OPENSSL_STRING) *opts,
|
|
|
|
const OSSL_PARAM *paramdefs)
|
|
|
|
{
|
|
|
|
OSSL_PARAM *params = NULL;
|
|
|
|
size_t sz = (size_t)sk_OPENSSL_STRING_num(opts);
|
|
|
|
size_t params_n;
|
|
|
|
char *opt = "", *stmp, *vtmp = NULL;
|
2020-02-10 11:37:53 +08:00
|
|
|
int found = 1;
|
2019-08-24 16:56:34 +08:00
|
|
|
|
|
|
|
if (opts == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
params = OPENSSL_zalloc(sizeof(OSSL_PARAM) * (sz + 1));
|
|
|
|
if (params == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for (params_n = 0; params_n < sz; params_n++) {
|
|
|
|
opt = sk_OPENSSL_STRING_value(opts, (int)params_n);
|
|
|
|
if ((stmp = OPENSSL_strdup(opt)) == NULL
|
|
|
|
|| (vtmp = strchr(stmp, ':')) == NULL)
|
|
|
|
goto err;
|
|
|
|
/* Replace ':' with 0 to terminate the string pointed to by stmp */
|
|
|
|
*vtmp = 0;
|
|
|
|
/* Skip over the separator so that vmtp points to the value */
|
|
|
|
vtmp++;
|
|
|
|
if (!OSSL_PARAM_allocate_from_text(¶ms[params_n], paramdefs,
|
2020-02-10 11:37:53 +08:00
|
|
|
stmp, vtmp, strlen(vtmp), &found))
|
2019-08-24 16:56:34 +08:00
|
|
|
goto err;
|
|
|
|
OPENSSL_free(stmp);
|
|
|
|
}
|
|
|
|
params[params_n] = OSSL_PARAM_construct_end();
|
|
|
|
return params;
|
|
|
|
err:
|
|
|
|
OPENSSL_free(stmp);
|
2020-02-10 11:37:53 +08:00
|
|
|
BIO_printf(bio_err, "Parameter %s '%s'\n", found ? "error" : "unknown",
|
|
|
|
opt);
|
2019-08-24 16:56:34 +08:00
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
app_params_free(params);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void app_params_free(OSSL_PARAM *params)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (params != NULL) {
|
|
|
|
for (i = 0; params[i].key != NULL; ++i)
|
|
|
|
OPENSSL_free(params[i].data);
|
|
|
|
OPENSSL_free(params);
|
|
|
|
}
|
|
|
|
}
|