| 
									
										
										
										
											2016-05-18 02:18:30 +08:00
										 |  |  | /*
 | 
					
						
							| 
									
										
										
										
											2018-01-28 16:49:46 +08:00
										 |  |  |  * Copyright 1995-2018 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>
 | 
					
						
							| 
									
										
										
										
											2000-06-23 01:42:50 +08:00
										 |  |  | #include <openssl/pem.h>
 | 
					
						
							|  |  |  | #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>
 | 
					
						
							| 
									
										
										
										
											2003-01-31 01:39:26 +08:00
										 |  |  | #ifndef OPENSSL_NO_ENGINE
 | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  | # include <openssl/engine.h>
 | 
					
						
							| 
									
										
										
										
											2003-01-31 01:39:26 +08:00
										 |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											2005-07-16 20:37:36 +08:00
										 |  |  | #ifndef OPENSSL_NO_RSA
 | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  | # include <openssl/rsa.h>
 | 
					
						
							| 
									
										
										
										
											2005-07-16 20:37:36 +08:00
										 |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											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>
 | 
					
						
							| 
									
										
										
										
											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
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											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; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											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
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											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
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											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; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     conf = NCONF_new(NULL); | 
					
						
							|  |  |  |     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
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master.  The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt.  Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that.  There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
        For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
        RT3515: Use 3DES in pkcs12 if built with no-rc2
        RT1766: s_client -reconnect and -starttls broke
        RT2932: Catch write errors
        RT2604: port should be 'unsigned short'
        RT2983: total_bytes undeclared #ifdef RENEG
        RT1523: Add -nocert to fix output in x509 app
        RT3508: Remove unused variable introduced by b09eb24
        RT3511: doc fix; req default serial is random
        RT1325,2973: Add more extensions to c_rehash
        RT2119,3407: Updated to dgst.pod
        RT2379: Additional typo fix
        RT2693: Extra include of string.h
        RT2880: HFS is case-insensitive filenames
        RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
        Add SCSV support
        Add -misalign to speed command
        Make dhparam, dsaparam, ecparam, x509 output C in proper style
        Make some internal ocsp.c functions void
        Only display cert usages with -help in verify
        Use global bio_err, remove "BIO*err" parameter from functions
        For filenames, - always means stdin (or stdout as appropriate)
        Add aliases for -des/aes "wrap" ciphers.
        *Remove support for IISSGC (server gated crypto)
        *The undocumented OCSP -header flag is now "-header name=value"
        *Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
											
										 
											2015-04-25 03:26:15 +08:00
										 |  |  | static int load_pkcs12(BIO *in, const char *desc, | 
					
						
							| 
									
										
										
										
											2018-12-12 01:31:55 +08:00
										 |  |  |                        pem_password_cb *pem_cb, PW_CB_DATA *cb_data, | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |                        EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     const char *pass; | 
					
						
							|  |  |  |     char tpass[PEM_BUFSIZE]; | 
					
						
							|  |  |  |     int len, ret = 0; | 
					
						
							|  |  |  |     PKCS12 *p12; | 
					
						
							|  |  |  |     p12 = d2i_PKCS12_bio(in, NULL); | 
					
						
							|  |  |  |     if (p12 == NULL) { | 
					
						
							| 
									
										
											  
											
												Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master.  The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt.  Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that.  There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
        For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
        RT3515: Use 3DES in pkcs12 if built with no-rc2
        RT1766: s_client -reconnect and -starttls broke
        RT2932: Catch write errors
        RT2604: port should be 'unsigned short'
        RT2983: total_bytes undeclared #ifdef RENEG
        RT1523: Add -nocert to fix output in x509 app
        RT3508: Remove unused variable introduced by b09eb24
        RT3511: doc fix; req default serial is random
        RT1325,2973: Add more extensions to c_rehash
        RT2119,3407: Updated to dgst.pod
        RT2379: Additional typo fix
        RT2693: Extra include of string.h
        RT2880: HFS is case-insensitive filenames
        RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
        Add SCSV support
        Add -misalign to speed command
        Make dhparam, dsaparam, ecparam, x509 output C in proper style
        Make some internal ocsp.c functions void
        Only display cert usages with -help in verify
        Use global bio_err, remove "BIO*err" parameter from functions
        For filenames, - always means stdin (or stdout as appropriate)
        Add aliases for -des/aes "wrap" ciphers.
        *Remove support for IISSGC (server gated crypto)
        *The undocumented OCSP -header flag is now "-header name=value"
        *Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
											
										 
											2015-04-25 03:26:15 +08:00
										 |  |  |         BIO_printf(bio_err, "Error loading PKCS12 file for %s\n", desc); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         goto die; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     /* See if an empty password will do */ | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     if (PKCS12_verify_mac(p12, "", 0) || PKCS12_verify_mac(p12, NULL, 0)) { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         pass = ""; | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     } else { | 
					
						
							| 
									
										
										
										
											2019-09-17 03:28:57 +08:00
										 |  |  |         if (pem_cb == NULL) | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |             pem_cb = (pem_password_cb *)password_callback; | 
					
						
							|  |  |  |         len = pem_cb(tpass, PEM_BUFSIZE, 0, cb_data); | 
					
						
							|  |  |  |         if (len < 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, "Passphrase callback error for %s\n", desc); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |             goto die; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |         if (len < PEM_BUFSIZE) | 
					
						
							|  |  |  |             tpass[len] = 0; | 
					
						
							|  |  |  |         if (!PKCS12_verify_mac(p12, tpass, len)) { | 
					
						
							| 
									
										
											  
											
												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, | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |                        "Mac verify error (wrong password?) in PKCS12 file for %s\n", | 
					
						
							|  |  |  |                        desc); | 
					
						
							|  |  |  |             goto die; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |         pass = tpass; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     ret = PKCS12_parse(p12, pass, pkey, cert, ca); | 
					
						
							|  |  |  |  die: | 
					
						
							| 
									
										
										
										
											2015-04-12 04:32:54 +08:00
										 |  |  |     PKCS12_free(p12); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |     return ret; | 
					
						
							|  |  |  | } | 
					
						
							| 
									
										
										
										
											2004-12-29 09:07:14 +08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-02-14 11:33:56 +08:00
										 |  |  | X509 *load_cert(const char *file, int format, const char *cert_descrip) | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  | { | 
					
						
							|  |  |  |     X509 *x = NULL; | 
					
						
							|  |  |  |     BIO *cert; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (format == FORMAT_HTTP) { | 
					
						
							| 
									
										
										
										
											2019-10-31 06:39:35 +08:00
										 |  |  | #if !defined(OPENSSL_NO_SOCK)
 | 
					
						
							|  |  |  |         x = X509_load_http(file, NULL, NULL, 0 /* timeout */); | 
					
						
							| 
									
										
										
										
											2016-02-25 13:56:35 +08:00
										 |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         return x; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (file == 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
										 |  |  |         unbuffer(stdin); | 
					
						
							| 
									
										
										
										
											2015-09-06 18:20:12 +08:00
										 |  |  |         cert = dup_bio_in(format); | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     } else { | 
					
						
							| 
									
										
										
										
											2015-09-04 18:49:06 +08:00
										 |  |  |         cert = bio_open_default(file, 'r', format); | 
					
						
							| 
									
										
										
										
											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
										 |  |  |     if (cert == NULL) | 
					
						
							|  |  |  |         goto end; | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     if (format == FORMAT_ASN1) { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         x = d2i_X509_bio(cert, NULL); | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     } else if (format == FORMAT_PEM) { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         x = PEM_read_bio_X509_AUX(cert, NULL, | 
					
						
							|  |  |  |                                   (pem_password_cb *)password_callback, NULL); | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     } else if (format == FORMAT_PKCS12) { | 
					
						
							| 
									
										
											  
											
												Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master.  The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt.  Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that.  There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
        For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
        RT3515: Use 3DES in pkcs12 if built with no-rc2
        RT1766: s_client -reconnect and -starttls broke
        RT2932: Catch write errors
        RT2604: port should be 'unsigned short'
        RT2983: total_bytes undeclared #ifdef RENEG
        RT1523: Add -nocert to fix output in x509 app
        RT3508: Remove unused variable introduced by b09eb24
        RT3511: doc fix; req default serial is random
        RT1325,2973: Add more extensions to c_rehash
        RT2119,3407: Updated to dgst.pod
        RT2379: Additional typo fix
        RT2693: Extra include of string.h
        RT2880: HFS is case-insensitive filenames
        RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
        Add SCSV support
        Add -misalign to speed command
        Make dhparam, dsaparam, ecparam, x509 output C in proper style
        Make some internal ocsp.c functions void
        Only display cert usages with -help in verify
        Use global bio_err, remove "BIO*err" parameter from functions
        For filenames, - always means stdin (or stdout as appropriate)
        Add aliases for -des/aes "wrap" ciphers.
        *Remove support for IISSGC (server gated crypto)
        *The undocumented OCSP -header flag is now "-header name=value"
        *Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
											
										 
											2015-04-25 03:26:15 +08:00
										 |  |  |         if (!load_pkcs12(cert, cert_descrip, NULL, NULL, NULL, &x, NULL)) | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |             goto end; | 
					
						
							|  |  |  |     } 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
										 |  |  |         BIO_printf(bio_err, "bad input format specified for %s\n", cert_descrip); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         goto end; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |  end: | 
					
						
							|  |  |  |     if (x == 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, "unable to load certificate\n"); | 
					
						
							|  |  |  |         ERR_print_errors(bio_err); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |     } | 
					
						
							| 
									
										
										
										
											2015-05-02 02:37:16 +08:00
										 |  |  |     BIO_free(cert); | 
					
						
							| 
									
										
										
										
											2017-10-17 22:04:09 +08:00
										 |  |  |     return x; | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  | } | 
					
						
							| 
									
										
										
										
											2000-06-23 01:42:50 +08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-12-07 02:43:40 +08:00
										 |  |  | X509_CRL *load_crl(const char *infile, int format) | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  | { | 
					
						
							|  |  |  |     X509_CRL *x = NULL; | 
					
						
							|  |  |  |     BIO *in = NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (format == FORMAT_HTTP) { | 
					
						
							| 
									
										
										
										
											2019-10-31 06:39:35 +08:00
										 |  |  | #if !defined(OPENSSL_NO_SOCK)
 | 
					
						
							|  |  |  |         x = X509_CRL_load_http(infile, NULL, NULL, 0 /* timeout */); | 
					
						
							| 
									
										
										
										
											2016-02-25 13:56:35 +08:00
										 |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         return x; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-09-04 18:49:06 +08:00
										 |  |  |     in = bio_open_default(infile, 'r', format); | 
					
						
							| 
									
										
											  
											
												Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master.  The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt.  Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that.  There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
        For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
        RT3515: Use 3DES in pkcs12 if built with no-rc2
        RT1766: s_client -reconnect and -starttls broke
        RT2932: Catch write errors
        RT2604: port should be 'unsigned short'
        RT2983: total_bytes undeclared #ifdef RENEG
        RT1523: Add -nocert to fix output in x509 app
        RT3508: Remove unused variable introduced by b09eb24
        RT3511: doc fix; req default serial is random
        RT1325,2973: Add more extensions to c_rehash
        RT2119,3407: Updated to dgst.pod
        RT2379: Additional typo fix
        RT2693: Extra include of string.h
        RT2880: HFS is case-insensitive filenames
        RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
        Add SCSV support
        Add -misalign to speed command
        Make dhparam, dsaparam, ecparam, x509 output C in proper style
        Make some internal ocsp.c functions void
        Only display cert usages with -help in verify
        Use global bio_err, remove "BIO*err" parameter from functions
        For filenames, - always means stdin (or stdout as appropriate)
        Add aliases for -des/aes "wrap" ciphers.
        *Remove support for IISSGC (server gated crypto)
        *The undocumented OCSP -header flag is now "-header name=value"
        *Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
											
										 
											2015-04-25 03:26:15 +08:00
										 |  |  |     if (in == NULL) | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         goto end; | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     if (format == FORMAT_ASN1) { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         x = d2i_X509_CRL_bio(in, NULL); | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     } else if (format == FORMAT_PEM) { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         x = PEM_read_bio_X509_CRL(in, NULL, NULL, NULL); | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     } else { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         BIO_printf(bio_err, "bad input format specified for input crl\n"); | 
					
						
							|  |  |  |         goto end; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     if (x == NULL) { | 
					
						
							|  |  |  |         BIO_printf(bio_err, "unable to load CRL\n"); | 
					
						
							|  |  |  |         ERR_print_errors(bio_err); | 
					
						
							|  |  |  |         goto end; | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2012-12-03 00:16:28 +08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |  end: | 
					
						
							|  |  |  |     BIO_free(in); | 
					
						
							| 
									
										
										
										
											2017-10-17 22:04:09 +08:00
										 |  |  |     return x; | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  | } | 
					
						
							| 
									
										
										
										
											2012-12-03 00:16:28 +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
										 |  |  | EVP_PKEY *load_key(const char *file, int format, int maybe_stdin, | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |                    const char *pass, ENGINE *e, const char *key_descrip) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     BIO *key = NULL; | 
					
						
							|  |  |  |     EVP_PKEY *pkey = NULL; | 
					
						
							|  |  |  |     PW_CB_DATA cb_data; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     cb_data.password = pass; | 
					
						
							|  |  |  |     cb_data.prompt_info = file; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (file == NULL && (!maybe_stdin || format == FORMAT_ENGINE)) { | 
					
						
							| 
									
										
											  
											
												Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master.  The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt.  Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that.  There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
        For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
        RT3515: Use 3DES in pkcs12 if built with no-rc2
        RT1766: s_client -reconnect and -starttls broke
        RT2932: Catch write errors
        RT2604: port should be 'unsigned short'
        RT2983: total_bytes undeclared #ifdef RENEG
        RT1523: Add -nocert to fix output in x509 app
        RT3508: Remove unused variable introduced by b09eb24
        RT3511: doc fix; req default serial is random
        RT1325,2973: Add more extensions to c_rehash
        RT2119,3407: Updated to dgst.pod
        RT2379: Additional typo fix
        RT2693: Extra include of string.h
        RT2880: HFS is case-insensitive filenames
        RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
        Add SCSV support
        Add -misalign to speed command
        Make dhparam, dsaparam, ecparam, x509 output C in proper style
        Make some internal ocsp.c functions void
        Only display cert usages with -help in verify
        Use global bio_err, remove "BIO*err" parameter from functions
        For filenames, - always means stdin (or stdout as appropriate)
        Add aliases for -des/aes "wrap" ciphers.
        *Remove support for IISSGC (server gated crypto)
        *The undocumented OCSP -header flag is now "-header name=value"
        *Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
											
										 
											2015-04-25 03:26:15 +08:00
										 |  |  |         BIO_printf(bio_err, "no keyfile specified\n"); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         goto end; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     if (format == FORMAT_ENGINE) { | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |         if (e == 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, "no engine specified\n"); | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |         } else { | 
					
						
							| 
									
										
										
										
											2016-02-02 13:37:41 +08:00
										 |  |  | #ifndef OPENSSL_NO_ENGINE
 | 
					
						
							| 
									
										
										
										
											2016-09-29 03:28:00 +08:00
										 |  |  |             if (ENGINE_init(e)) { | 
					
						
							| 
									
										
										
										
											2018-08-16 10:36:01 +08:00
										 |  |  |                 pkey = ENGINE_load_private_key(e, file, | 
					
						
							|  |  |  |                                                (UI_METHOD *)get_ui_method(), | 
					
						
							|  |  |  |                                                &cb_data); | 
					
						
							| 
									
										
										
										
											2016-09-29 03:28:00 +08:00
										 |  |  |                 ENGINE_finish(e); | 
					
						
							|  |  |  |             } | 
					
						
							| 
									
										
										
										
											2016-02-02 13:37:41 +08:00
										 |  |  |             if (pkey == NULL) { | 
					
						
							| 
									
										
											  
											
												Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master.  The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt.  Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that.  There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
        For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
        RT3515: Use 3DES in pkcs12 if built with no-rc2
        RT1766: s_client -reconnect and -starttls broke
        RT2932: Catch write errors
        RT2604: port should be 'unsigned short'
        RT2983: total_bytes undeclared #ifdef RENEG
        RT1523: Add -nocert to fix output in x509 app
        RT3508: Remove unused variable introduced by b09eb24
        RT3511: doc fix; req default serial is random
        RT1325,2973: Add more extensions to c_rehash
        RT2119,3407: Updated to dgst.pod
        RT2379: Additional typo fix
        RT2693: Extra include of string.h
        RT2880: HFS is case-insensitive filenames
        RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
        Add SCSV support
        Add -misalign to speed command
        Make dhparam, dsaparam, ecparam, x509 output C in proper style
        Make some internal ocsp.c functions void
        Only display cert usages with -help in verify
        Use global bio_err, remove "BIO*err" parameter from functions
        For filenames, - always means stdin (or stdout as appropriate)
        Add aliases for -des/aes "wrap" ciphers.
        *Remove support for IISSGC (server gated crypto)
        *The undocumented OCSP -header flag is now "-header name=value"
        *Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
											
										 
											2015-04-25 03:26:15 +08:00
										 |  |  |                 BIO_printf(bio_err, "cannot load %s from engine\n", key_descrip); | 
					
						
							|  |  |  |                 ERR_print_errors(bio_err); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |             } | 
					
						
							| 
									
										
										
										
											2016-02-02 13:37:41 +08:00
										 |  |  | #else
 | 
					
						
							|  |  |  |             BIO_printf(bio_err, "engines not supported\n"); | 
					
						
							|  |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         } | 
					
						
							|  |  |  |         goto end; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     if (file == NULL && maybe_stdin) { | 
					
						
							| 
									
										
											  
											
												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
										 |  |  |         unbuffer(stdin); | 
					
						
							| 
									
										
										
										
											2015-09-06 18:20:12 +08:00
										 |  |  |         key = dup_bio_in(format); | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     } else { | 
					
						
							| 
									
										
										
										
											2015-09-04 18:49:06 +08:00
										 |  |  |         key = bio_open_default(file, 'r', format); | 
					
						
							| 
									
										
										
										
											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
										 |  |  |     if (key == NULL) | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         goto end; | 
					
						
							|  |  |  |     if (format == FORMAT_ASN1) { | 
					
						
							|  |  |  |         pkey = d2i_PrivateKey_bio(key, NULL); | 
					
						
							|  |  |  |     } else if (format == FORMAT_PEM) { | 
					
						
							| 
									
										
										
										
											2018-12-12 01:31:55 +08:00
										 |  |  |         pkey = PEM_read_bio_PrivateKey(key, NULL, wrap_password_callback, &cb_data); | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     } else if (format == FORMAT_PKCS12) { | 
					
						
							| 
									
										
										
										
											2018-12-12 01:31:55 +08:00
										 |  |  |         if (!load_pkcs12(key, key_descrip, wrap_password_callback, &cb_data, | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |                          &pkey, NULL, NULL)) | 
					
						
							|  |  |  |             goto end; | 
					
						
							| 
									
										
										
										
											2010-04-06 19:18:59 +08:00
										 |  |  | #if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_DSA) && !defined (OPENSSL_NO_RC4)
 | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     } else if (format == FORMAT_MSBLOB) { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         pkey = b2i_PrivateKey_bio(key); | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     } else if (format == FORMAT_PVK) { | 
					
						
							| 
									
										
										
										
											2018-12-12 01:31:55 +08:00
										 |  |  |         pkey = b2i_PVK_bio(key, wrap_password_callback, &cb_data); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											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
										 |  |  |         BIO_printf(bio_err, "bad input format specified for key file\n"); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         goto end; | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2000-06-23 01:42:50 +08:00
										 |  |  |  end: | 
					
						
							| 
									
										
										
										
											2015-05-02 02:37:16 +08:00
										 |  |  |     BIO_free(key); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |     if (pkey == NULL) { | 
					
						
							| 
									
										
											  
											
												Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master.  The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt.  Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that.  There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
        For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
        RT3515: Use 3DES in pkcs12 if built with no-rc2
        RT1766: s_client -reconnect and -starttls broke
        RT2932: Catch write errors
        RT2604: port should be 'unsigned short'
        RT2983: total_bytes undeclared #ifdef RENEG
        RT1523: Add -nocert to fix output in x509 app
        RT3508: Remove unused variable introduced by b09eb24
        RT3511: doc fix; req default serial is random
        RT1325,2973: Add more extensions to c_rehash
        RT2119,3407: Updated to dgst.pod
        RT2379: Additional typo fix
        RT2693: Extra include of string.h
        RT2880: HFS is case-insensitive filenames
        RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
        Add SCSV support
        Add -misalign to speed command
        Make dhparam, dsaparam, ecparam, x509 output C in proper style
        Make some internal ocsp.c functions void
        Only display cert usages with -help in verify
        Use global bio_err, remove "BIO*err" parameter from functions
        For filenames, - always means stdin (or stdout as appropriate)
        Add aliases for -des/aes "wrap" ciphers.
        *Remove support for IISSGC (server gated crypto)
        *The undocumented OCSP -header flag is now "-header name=value"
        *Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
											
										 
											2015-04-25 03:26:15 +08:00
										 |  |  |         BIO_printf(bio_err, "unable to load %s\n", key_descrip); | 
					
						
							|  |  |  |         ERR_print_errors(bio_err); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |     } | 
					
						
							| 
									
										
										
										
											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
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master.  The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt.  Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that.  There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
        For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
        RT3515: Use 3DES in pkcs12 if built with no-rc2
        RT1766: s_client -reconnect and -starttls broke
        RT2932: Catch write errors
        RT2604: port should be 'unsigned short'
        RT2983: total_bytes undeclared #ifdef RENEG
        RT1523: Add -nocert to fix output in x509 app
        RT3508: Remove unused variable introduced by b09eb24
        RT3511: doc fix; req default serial is random
        RT1325,2973: Add more extensions to c_rehash
        RT2119,3407: Updated to dgst.pod
        RT2379: Additional typo fix
        RT2693: Extra include of string.h
        RT2880: HFS is case-insensitive filenames
        RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
        Add SCSV support
        Add -misalign to speed command
        Make dhparam, dsaparam, ecparam, x509 output C in proper style
        Make some internal ocsp.c functions void
        Only display cert usages with -help in verify
        Use global bio_err, remove "BIO*err" parameter from functions
        For filenames, - always means stdin (or stdout as appropriate)
        Add aliases for -des/aes "wrap" ciphers.
        *Remove support for IISSGC (server gated crypto)
        *The undocumented OCSP -header flag is now "-header name=value"
        *Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
											
										 
											2015-04-25 03:26:15 +08:00
										 |  |  | EVP_PKEY *load_pubkey(const char *file, int format, int maybe_stdin, | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |                       const char *pass, ENGINE *e, const char *key_descrip) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     BIO *key = NULL; | 
					
						
							|  |  |  |     EVP_PKEY *pkey = NULL; | 
					
						
							|  |  |  |     PW_CB_DATA cb_data; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     cb_data.password = pass; | 
					
						
							|  |  |  |     cb_data.prompt_info = file; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (file == NULL && (!maybe_stdin || format == FORMAT_ENGINE)) { | 
					
						
							| 
									
										
											  
											
												Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master.  The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt.  Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that.  There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
        For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
        RT3515: Use 3DES in pkcs12 if built with no-rc2
        RT1766: s_client -reconnect and -starttls broke
        RT2932: Catch write errors
        RT2604: port should be 'unsigned short'
        RT2983: total_bytes undeclared #ifdef RENEG
        RT1523: Add -nocert to fix output in x509 app
        RT3508: Remove unused variable introduced by b09eb24
        RT3511: doc fix; req default serial is random
        RT1325,2973: Add more extensions to c_rehash
        RT2119,3407: Updated to dgst.pod
        RT2379: Additional typo fix
        RT2693: Extra include of string.h
        RT2880: HFS is case-insensitive filenames
        RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
        Add SCSV support
        Add -misalign to speed command
        Make dhparam, dsaparam, ecparam, x509 output C in proper style
        Make some internal ocsp.c functions void
        Only display cert usages with -help in verify
        Use global bio_err, remove "BIO*err" parameter from functions
        For filenames, - always means stdin (or stdout as appropriate)
        Add aliases for -des/aes "wrap" ciphers.
        *Remove support for IISSGC (server gated crypto)
        *The undocumented OCSP -header flag is now "-header name=value"
        *Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
											
										 
											2015-04-25 03:26:15 +08:00
										 |  |  |         BIO_printf(bio_err, "no keyfile specified\n"); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         goto end; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     if (format == FORMAT_ENGINE) { | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |         if (e == NULL) { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |             BIO_printf(bio_err, "no engine specified\n"); | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |         } else { | 
					
						
							| 
									
										
										
										
											2016-02-02 13:37:41 +08:00
										 |  |  | #ifndef OPENSSL_NO_ENGINE
 | 
					
						
							| 
									
										
										
										
											2018-08-16 10:36:01 +08:00
										 |  |  |             pkey = ENGINE_load_public_key(e, file, (UI_METHOD *)get_ui_method(), | 
					
						
							|  |  |  |                                           &cb_data); | 
					
						
							| 
									
										
										
										
											2016-02-02 13:37:41 +08:00
										 |  |  |             if (pkey == NULL) { | 
					
						
							|  |  |  |                 BIO_printf(bio_err, "cannot load %s from engine\n", key_descrip); | 
					
						
							|  |  |  |                 ERR_print_errors(bio_err); | 
					
						
							|  |  |  |             } | 
					
						
							|  |  |  | #else
 | 
					
						
							|  |  |  |             BIO_printf(bio_err, "engines not supported\n"); | 
					
						
							|  |  |  | #endif
 | 
					
						
							|  |  |  |         } | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         goto end; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     if (file == NULL && maybe_stdin) { | 
					
						
							| 
									
										
											  
											
												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
										 |  |  |         unbuffer(stdin); | 
					
						
							| 
									
										
										
										
											2015-09-06 18:20:12 +08:00
										 |  |  |         key = dup_bio_in(format); | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     } else { | 
					
						
							| 
									
										
										
										
											2015-09-04 18:49:06 +08:00
										 |  |  |         key = bio_open_default(file, 'r', format); | 
					
						
							| 
									
										
										
										
											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
										 |  |  |     if (key == NULL) | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         goto end; | 
					
						
							|  |  |  |     if (format == FORMAT_ASN1) { | 
					
						
							|  |  |  |         pkey = d2i_PUBKEY_bio(key, NULL); | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     } else if (format == FORMAT_ASN1RSA) { | 
					
						
							| 
									
										
										
										
											2016-02-02 13:37:41 +08:00
										 |  |  | #ifndef OPENSSL_NO_RSA
 | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         RSA *rsa; | 
					
						
							|  |  |  |         rsa = d2i_RSAPublicKey_bio(key, NULL); | 
					
						
							|  |  |  |         if (rsa) { | 
					
						
							|  |  |  |             pkey = EVP_PKEY_new(); | 
					
						
							| 
									
										
										
										
											2015-10-30 19:18:04 +08:00
										 |  |  |             if (pkey != NULL) | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |                 EVP_PKEY_set1_RSA(pkey, rsa); | 
					
						
							|  |  |  |             RSA_free(rsa); | 
					
						
							|  |  |  |         } else | 
					
						
							| 
									
										
										
										
											2016-02-02 13:37:41 +08:00
										 |  |  | #else
 | 
					
						
							|  |  |  |         BIO_printf(bio_err, "RSA keys not supported\n"); | 
					
						
							|  |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |             pkey = NULL; | 
					
						
							|  |  |  |     } else if (format == FORMAT_PEMRSA) { | 
					
						
							| 
									
										
										
										
											2016-02-02 13:37:41 +08:00
										 |  |  | #ifndef OPENSSL_NO_RSA
 | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         RSA *rsa; | 
					
						
							|  |  |  |         rsa = PEM_read_bio_RSAPublicKey(key, NULL, | 
					
						
							|  |  |  |                                         (pem_password_cb *)password_callback, | 
					
						
							|  |  |  |                                         &cb_data); | 
					
						
							| 
									
										
										
										
											2015-10-30 19:18:04 +08:00
										 |  |  |         if (rsa != NULL) { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |             pkey = EVP_PKEY_new(); | 
					
						
							| 
									
										
										
										
											2015-10-30 19:18:04 +08:00
										 |  |  |             if (pkey != NULL) | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |                 EVP_PKEY_set1_RSA(pkey, rsa); | 
					
						
							|  |  |  |             RSA_free(rsa); | 
					
						
							|  |  |  |         } else | 
					
						
							| 
									
										
										
										
											2016-02-02 13:37:41 +08:00
										 |  |  | #else
 | 
					
						
							|  |  |  |         BIO_printf(bio_err, "RSA keys not supported\n"); | 
					
						
							|  |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |             pkey = NULL; | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     } else if (format == FORMAT_PEM) { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         pkey = PEM_read_bio_PUBKEY(key, NULL, | 
					
						
							|  |  |  |                                    (pem_password_cb *)password_callback, | 
					
						
							|  |  |  |                                    &cb_data); | 
					
						
							| 
									
										
										
										
											2009-04-27 06:18:22 +08:00
										 |  |  | #if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_DSA)
 | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     } else if (format == FORMAT_MSBLOB) { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         pkey = b2i_PublicKey_bio(key); | 
					
						
							| 
									
										
										
										
											2009-04-27 06:18:22 +08:00
										 |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     } | 
					
						
							| 
									
										
										
										
											2000-09-04 07:13:48 +08:00
										 |  |  |  end: | 
					
						
							| 
									
										
										
										
											2015-05-02 02:37:16 +08:00
										 |  |  |     BIO_free(key); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |     if (pkey == NULL) | 
					
						
							| 
									
										
											  
											
												Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master.  The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt.  Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that.  There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
        For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
        RT3515: Use 3DES in pkcs12 if built with no-rc2
        RT1766: s_client -reconnect and -starttls broke
        RT2932: Catch write errors
        RT2604: port should be 'unsigned short'
        RT2983: total_bytes undeclared #ifdef RENEG
        RT1523: Add -nocert to fix output in x509 app
        RT3508: Remove unused variable introduced by b09eb24
        RT3511: doc fix; req default serial is random
        RT1325,2973: Add more extensions to c_rehash
        RT2119,3407: Updated to dgst.pod
        RT2379: Additional typo fix
        RT2693: Extra include of string.h
        RT2880: HFS is case-insensitive filenames
        RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
        Add SCSV support
        Add -misalign to speed command
        Make dhparam, dsaparam, ecparam, x509 output C in proper style
        Make some internal ocsp.c functions void
        Only display cert usages with -help in verify
        Use global bio_err, remove "BIO*err" parameter from functions
        For filenames, - always means stdin (or stdout as appropriate)
        Add aliases for -des/aes "wrap" ciphers.
        *Remove support for IISSGC (server gated crypto)
        *The undocumented OCSP -header flag is now "-header name=value"
        *Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
											
										 
											2015-04-25 03:26:15 +08:00
										 |  |  |         BIO_printf(bio_err, "unable to load %s\n", key_descrip); | 
					
						
							| 
									
										
										
										
											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
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master.  The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt.  Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that.  There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
        For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
        RT3515: Use 3DES in pkcs12 if built with no-rc2
        RT1766: s_client -reconnect and -starttls broke
        RT2932: Catch write errors
        RT2604: port should be 'unsigned short'
        RT2983: total_bytes undeclared #ifdef RENEG
        RT1523: Add -nocert to fix output in x509 app
        RT3508: Remove unused variable introduced by b09eb24
        RT3511: doc fix; req default serial is random
        RT1325,2973: Add more extensions to c_rehash
        RT2119,3407: Updated to dgst.pod
        RT2379: Additional typo fix
        RT2693: Extra include of string.h
        RT2880: HFS is case-insensitive filenames
        RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
        Add SCSV support
        Add -misalign to speed command
        Make dhparam, dsaparam, ecparam, x509 output C in proper style
        Make some internal ocsp.c functions void
        Only display cert usages with -help in verify
        Use global bio_err, remove "BIO*err" parameter from functions
        For filenames, - always means stdin (or stdout as appropriate)
        Add aliases for -des/aes "wrap" ciphers.
        *Remove support for IISSGC (server gated crypto)
        *The undocumented OCSP -header flag is now "-header name=value"
        *Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
											
										 
											2015-04-25 03:26:15 +08:00
										 |  |  | static int load_certs_crls(const char *file, int format, | 
					
						
							| 
									
										
										
										
											2016-02-14 11:33:56 +08:00
										 |  |  |                            const char *pass, const char *desc, | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |                            STACK_OF(X509) **pcerts, | 
					
						
							|  |  |  |                            STACK_OF(X509_CRL) **pcrls) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     int i; | 
					
						
							|  |  |  |     BIO *bio; | 
					
						
							|  |  |  |     STACK_OF(X509_INFO) *xis = NULL; | 
					
						
							|  |  |  |     X509_INFO *xi; | 
					
						
							|  |  |  |     PW_CB_DATA cb_data; | 
					
						
							|  |  |  |     int rv = 0; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     cb_data.password = pass; | 
					
						
							|  |  |  |     cb_data.prompt_info = file; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (format != FORMAT_PEM) { | 
					
						
							| 
									
										
											  
											
												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, "bad input format specified for %s\n", desc); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         return 0; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-09-04 18:49:06 +08:00
										 |  |  |     bio = bio_open_default(file, 'r', FORMAT_PEM); | 
					
						
							| 
									
										
											  
											
												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 (bio == NULL) | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         return 0; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     xis = PEM_X509_INFO_read_bio(bio, NULL, | 
					
						
							|  |  |  |                                  (pem_password_cb *)password_callback, | 
					
						
							|  |  |  |                                  &cb_data); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     BIO_free(bio); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     if (pcerts != NULL && *pcerts == NULL) { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         *pcerts = sk_X509_new_null(); | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |         if (*pcerts == NULL) | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |             goto end; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     if (pcrls != NULL && *pcrls == NULL) { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         *pcrls = sk_X509_CRL_new_null(); | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |         if (*pcrls == NULL) | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |             goto end; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     for (i = 0; i < sk_X509_INFO_num(xis); i++) { | 
					
						
							|  |  |  |         xi = sk_X509_INFO_value(xis, i); | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |         if (xi->x509 != NULL && pcerts != NULL) { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |             if (!sk_X509_push(*pcerts, xi->x509)) | 
					
						
							|  |  |  |                 goto end; | 
					
						
							|  |  |  |             xi->x509 = NULL; | 
					
						
							|  |  |  |         } | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |         if (xi->crl != NULL && pcrls != NULL) { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |             if (!sk_X509_CRL_push(*pcrls, xi->crl)) | 
					
						
							|  |  |  |                 goto end; | 
					
						
							|  |  |  |             xi->crl = NULL; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     if (pcerts != NULL && sk_X509_num(*pcerts) > 0) | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         rv = 1; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     if (pcrls != NULL && sk_X509_CRL_num(*pcrls) > 0) | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         rv = 1; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |  end: | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-05-01 05:33:59 +08:00
										 |  |  |     sk_X509_INFO_pop_free(xis, X509_INFO_free); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  | 
 | 
					
						
							|  |  |  |     if (rv == 0) { | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |         if (pcerts != NULL) { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |             sk_X509_pop_free(*pcerts, X509_free); | 
					
						
							|  |  |  |             *pcerts = NULL; | 
					
						
							|  |  |  |         } | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |         if (pcrls != NULL) { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |             sk_X509_CRL_pop_free(*pcrls, X509_CRL_free); | 
					
						
							|  |  |  |             *pcrls = 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, "unable to load %s\n", | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |                    pcerts ? "certificates" : "CRLs"); | 
					
						
							| 
									
										
											  
											
												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
										 |  |  |     } | 
					
						
							|  |  |  |     return rv; | 
					
						
							|  |  |  | } | 
					
						
							| 
									
										
										
										
											2000-06-23 01:42:50 +08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-05-01 05:48:31 +08:00
										 |  |  | void* app_malloc(int sz, const char *what) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     void *vp = OPENSSL_malloc(sz); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (vp == NULL) { | 
					
						
							|  |  |  |         BIO_printf(bio_err, "%s: Could not allocate %d bytes for %s\n", | 
					
						
							|  |  |  |                 opt_getprog(), sz, what); | 
					
						
							|  |  |  |         ERR_print_errors(bio_err); | 
					
						
							|  |  |  |         exit(1); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     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. | 
					
						
							| 
									
										
										
										
											2016-01-16 13:08:38 +08:00
										 |  |  |  */ | 
					
						
							|  |  |  | int load_certs(const char *file, STACK_OF(X509) **certs, int format, | 
					
						
							| 
									
										
										
										
											2016-02-14 11:33:56 +08:00
										 |  |  |                const char *pass, const char *desc) | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											2016-02-14 11:33:56 +08:00
										 |  |  |     return load_certs_crls(file, format, pass, desc, certs, NULL); | 
					
						
							| 
									
										
										
										
											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. | 
					
						
							| 
									
										
										
										
											2016-01-16 13:08:38 +08:00
										 |  |  |  */ | 
					
						
							|  |  |  | int load_crls(const char *file, STACK_OF(X509_CRL) **crls, int format, | 
					
						
							| 
									
										
										
										
											2016-02-14 11:33:56 +08:00
										 |  |  |               const char *pass, const char *desc) | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											2016-02-14 11:33:56 +08:00
										 |  |  |     return load_certs_crls(file, format, pass, desc, NULL, crls); | 
					
						
							| 
									
										
										
										
											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; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | void print_name(BIO *out, const char *title, X509_NAME *nm, | 
					
						
							|  |  |  |                 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; | 
					
						
							| 
									
										
											  
											
												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) { | 
					
						
							| 
									
										
										
										
											2015-09-22 23:00:52 +08:00
										 |  |  |             if (!X509_LOOKUP_load_file(lookup, CAfile, X509_FILETYPE_PEM)) { | 
					
						
							|  |  |  |                 BIO_printf(bio_err, "Error loading file %s\n", CAfile); | 
					
						
							|  |  |  |                 goto end; | 
					
						
							|  |  |  |             } | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |         } else { | 
					
						
							| 
									
										
										
										
											2015-09-22 23:00:52 +08:00
										 |  |  |             X509_LOOKUP_load_file(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
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											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; | 
					
						
							|  |  |  |         if (!X509_LOOKUP_add_store(lookup, CAstore)) { | 
					
						
							|  |  |  |             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: | 
					
						
							|  |  |  |     X509_STORE_free(store); | 
					
						
							|  |  |  |     return NULL; | 
					
						
							| 
									
										
										
										
											2001-01-17 09:31:34 +08:00
										 |  |  | } | 
					
						
							| 
									
										
										
										
											2001-06-18 14:22:33 +08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2003-01-31 01:39:26 +08:00
										 |  |  | #ifndef OPENSSL_NO_ENGINE
 | 
					
						
							| 
									
										
										
										
											2001-11-16 02:48:42 +08:00
										 |  |  | /* Try to load an engine in a shareable library */ | 
					
						
							| 
									
										
										
										
											2016-02-14 11:33:56 +08:00
										 |  |  | static ENGINE *try_load_engine(const char *engine) | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  | { | 
					
						
							|  |  |  |     ENGINE *e = ENGINE_by_id("dynamic"); | 
					
						
							|  |  |  |     if (e) { | 
					
						
							|  |  |  |         if (!ENGINE_ctrl_cmd_string(e, "SO_PATH", engine, 0) | 
					
						
							|  |  |  |             || !ENGINE_ctrl_cmd_string(e, "LOAD", NULL, 0)) { | 
					
						
							|  |  |  |             ENGINE_free(e); | 
					
						
							|  |  |  |             e = NULL; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     return e; | 
					
						
							|  |  |  | } | 
					
						
							| 
									
										
										
										
											2016-10-20 01:49:22 +08:00
										 |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											2001-11-16 02:48:42 +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
										 |  |  | ENGINE *setup_engine(const char *engine, int debug) | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  | { | 
					
						
							|  |  |  |     ENGINE *e = NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-10-20 01:49:22 +08:00
										 |  |  | #ifndef OPENSSL_NO_ENGINE
 | 
					
						
							| 
									
										
										
										
											2017-06-13 01:24:02 +08:00
										 |  |  |     if (engine != NULL) { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         if (strcmp(engine, "auto") == 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, "enabling auto ENGINE support\n"); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |             ENGINE_register_all_complete(); | 
					
						
							|  |  |  |             return NULL; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |         if ((e = ENGINE_by_id(engine)) == NULL | 
					
						
							| 
									
										
										
										
											2016-02-14 11:33:56 +08:00
										 |  |  |             && (e = try_load_engine(engine)) == 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, "invalid engine \"%s\"\n", engine); | 
					
						
							|  |  |  |             ERR_print_errors(bio_err); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |             return NULL; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |         if (debug) { | 
					
						
							| 
									
										
											  
											
												Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master.  The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt.  Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that.  There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
        For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
        RT3515: Use 3DES in pkcs12 if built with no-rc2
        RT1766: s_client -reconnect and -starttls broke
        RT2932: Catch write errors
        RT2604: port should be 'unsigned short'
        RT2983: total_bytes undeclared #ifdef RENEG
        RT1523: Add -nocert to fix output in x509 app
        RT3508: Remove unused variable introduced by b09eb24
        RT3511: doc fix; req default serial is random
        RT1325,2973: Add more extensions to c_rehash
        RT2119,3407: Updated to dgst.pod
        RT2379: Additional typo fix
        RT2693: Extra include of string.h
        RT2880: HFS is case-insensitive filenames
        RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
        Add SCSV support
        Add -misalign to speed command
        Make dhparam, dsaparam, ecparam, x509 output C in proper style
        Make some internal ocsp.c functions void
        Only display cert usages with -help in verify
        Use global bio_err, remove "BIO*err" parameter from functions
        For filenames, - always means stdin (or stdout as appropriate)
        Add aliases for -des/aes "wrap" ciphers.
        *Remove support for IISSGC (server gated crypto)
        *The undocumented OCSP -header flag is now "-header name=value"
        *Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
											
										 
											2015-04-25 03:26:15 +08:00
										 |  |  |             ENGINE_ctrl(e, ENGINE_CTRL_SET_LOGSTREAM, 0, bio_err, 0); | 
					
						
							| 
									
										
										
										
											2001-06-18 14:22:33 +08:00
										 |  |  |         } | 
					
						
							| 
									
										
										
										
											2018-08-16 10:36:01 +08:00
										 |  |  |         ENGINE_ctrl_cmd(e, "SET_USER_INTERFACE", 0, (void *)get_ui_method(), | 
					
						
							|  |  |  |                         0, 1); | 
					
						
							| 
									
										
										
										
											2016-09-29 02:40:25 +08:00
										 |  |  |         if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) { | 
					
						
							| 
									
										
											  
											
												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 use that engine\n"); | 
					
						
							|  |  |  |             ERR_print_errors(bio_err); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |             ENGINE_free(e); | 
					
						
							|  |  |  |             return 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, "engine \"%s\" set.\n", ENGINE_get_id(e)); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |     } | 
					
						
							| 
									
										
										
										
											2016-10-20 01:49:22 +08:00
										 |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |     return e; | 
					
						
							|  |  |  | } | 
					
						
							| 
									
										
										
										
											2002-02-22 22:01:21 +08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-09-29 05:39:18 +08:00
										 |  |  | void release_engine(ENGINE *e) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | #ifndef OPENSSL_NO_ENGINE
 | 
					
						
							|  |  |  |     if (e != NULL) | 
					
						
							|  |  |  |         /* Free our "structural" reference. */ | 
					
						
							|  |  |  |         ENGINE_free(e); | 
					
						
							|  |  |  | #endif
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											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)) { | 
					
						
							|  |  |  |             BIO_printf(bio_err, "unable to load number from %s\n", | 
					
						
							|  |  |  |                        serialfile); | 
					
						
							|  |  |  |             goto err; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |         ret = ASN1_INTEGER_to_BN(ai, NULL); | 
					
						
							|  |  |  |         if (ret == NULL) { | 
					
						
							|  |  |  |             BIO_printf(bio_err, | 
					
						
							|  |  |  |                        "error converting number from bin to BIGNUM\n"); | 
					
						
							|  |  |  |             goto err; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (ret && retai) { | 
					
						
							|  |  |  |         *retai = ai; | 
					
						
							|  |  |  |         ai = NULL; | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2003-04-04 00:33:03 +08:00
										 |  |  |  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) { | 
					
						
							|  |  |  |         BIO_printf(bio_err, "file name too long\n"); | 
					
						
							|  |  |  |         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) { | 
					
						
							|  |  |  |         ERR_print_errors(bio_err); | 
					
						
							|  |  |  |         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: | 
					
						
							| 
									
										
										
										
											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) { | 
					
						
							|  |  |  |         BIO_printf(bio_err, "file name too long\n"); | 
					
						
							|  |  |  |         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, | 
					
						
							|  |  |  |                    "unable to rename %s to %s\n", serialfile, buf[1]); | 
					
						
							|  |  |  |         perror("reason"); | 
					
						
							|  |  |  |         goto err; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     if (rename(buf[0], serialfile) < 0) { | 
					
						
							|  |  |  |         BIO_printf(bio_err, | 
					
						
							|  |  |  |                    "unable to rename %s to %s\n", buf[0], serialfile); | 
					
						
							|  |  |  |         perror("reason"); | 
					
						
							|  |  |  |         rename(buf[1], serialfile); | 
					
						
							|  |  |  |         goto err; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     return 1; | 
					
						
							| 
									
										
										
										
											2003-04-04 23:10:35 +08:00
										 |  |  |  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"); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |     if (in == NULL) { | 
					
						
							|  |  |  |         ERR_print_errors(bio_err); | 
					
						
							|  |  |  |         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
										 |  |  |         ERR_print_errors(bio_err); | 
					
						
							|  |  |  |         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: | 
					
						
							| 
									
										
										
										
											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, | 
					
						
							|  |  |  |                    "error creating serial number index:(%ld,%ld,%ld)\n", | 
					
						
							|  |  |  |                    db->db->error, db->db->arg1, db->db->arg2); | 
					
						
							|  |  |  |         return 0; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     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))) { | 
					
						
							|  |  |  |         BIO_printf(bio_err, "error creating name index:(%ld,%ld,%ld)\n", | 
					
						
							|  |  |  |                    db->db->error, db->db->arg1, db->db->arg2); | 
					
						
							|  |  |  |         return 0; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     return 1; | 
					
						
							|  |  |  | } | 
					
						
							| 
									
										
										
										
											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) { | 
					
						
							|  |  |  |         BIO_printf(bio_err, "file name too long\n"); | 
					
						
							|  |  |  |         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); | 
					
						
							|  |  |  |         BIO_printf(bio_err, "unable to open '%s'\n", dbfile); | 
					
						
							|  |  |  |         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]); | 
					
						
							|  |  |  |         BIO_printf(bio_err, "unable to open '%s'\n", buf[2]); | 
					
						
							|  |  |  |         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: | 
					
						
							| 
									
										
										
										
											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) { | 
					
						
							|  |  |  |         BIO_printf(bio_err, "file name too long\n"); | 
					
						
							|  |  |  |         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
										 |  |  |         ) { | 
					
						
							|  |  |  |         BIO_printf(bio_err, "unable to rename %s to %s\n", dbfile, buf[1]); | 
					
						
							|  |  |  |         perror("reason"); | 
					
						
							|  |  |  |         goto err; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     if (rename(buf[0], dbfile) < 0) { | 
					
						
							|  |  |  |         BIO_printf(bio_err, "unable to rename %s to %s\n", buf[0], dbfile); | 
					
						
							|  |  |  |         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
 | 
					
						
							|  |  |  |         ) { | 
					
						
							|  |  |  |         BIO_printf(bio_err, "unable to rename %s to %s\n", buf[4], buf[3]); | 
					
						
							|  |  |  |         perror("reason"); | 
					
						
							|  |  |  |         rename(dbfile, buf[0]); | 
					
						
							|  |  |  |         rename(buf[1], dbfile); | 
					
						
							|  |  |  |         goto err; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     if (rename(buf[2], buf[4]) < 0) { | 
					
						
							|  |  |  |         BIO_printf(bio_err, "unable to rename %s to %s\n", buf[2], buf[4]); | 
					
						
							|  |  |  |         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: | 
					
						
							| 
									
										
										
										
											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=... | 
					
						
							| 
									
										
										
										
											2003-11-28 22:07:14 +08:00
										 |  |  |  * where characters may be escaped by \ | 
					
						
							|  |  |  |  */ | 
					
						
							| 
									
										
										
										
											2015-04-30 02:50:00 +08:00
										 |  |  | X509_NAME *parse_name(const char *cp, long chtype, int canmulti) | 
					
						
							| 
									
										
										
										
											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, | 
					
						
							|  |  |  |                    "name is expected to be in the format " | 
					
						
							|  |  |  |                    "/type0=value0/type1=value1/type2=... where characters may " | 
					
						
							|  |  |  |                    "be escaped by \\. This name is not in that format: '%s'\n", | 
					
						
							|  |  |  |                    --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(); | 
					
						
							|  |  |  |     if (n == NULL) | 
					
						
							|  |  |  |         return NULL; | 
					
						
							| 
									
										
										
										
											2015-04-30 16:43:11 +08:00
										 |  |  |     work = OPENSSL_strdup(cp); | 
					
						
							| 
									
										
										
										
											2019-03-19 07:35:03 +08:00
										 |  |  |     if (work == NULL) { | 
					
						
							|  |  |  |         BIO_printf(bio_err, "%s: Error copying name input\n", opt_getprog()); | 
					
						
							| 
									
										
										
										
											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
										 |  |  | 
 | 
					
						
							|  |  |  |     while (*cp) { | 
					
						
							|  |  |  |         char *bp = work; | 
					
						
							|  |  |  |         char *typestr = bp; | 
					
						
							|  |  |  |         unsigned char *valstr; | 
					
						
							|  |  |  |         int nid; | 
					
						
							|  |  |  |         int ismulti = nextismulti; | 
					
						
							|  |  |  |         nextismulti = 0; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         /* Collect the type */ | 
					
						
							|  |  |  |         while (*cp && *cp != '=') | 
					
						
							|  |  |  |             *bp++ = *cp++; | 
					
						
							|  |  |  |         if (*cp == '\0') { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |             BIO_printf(bio_err, | 
					
						
							| 
									
										
										
										
											2019-03-19 07:35:03 +08:00
										 |  |  |                     "%s: Hit end of string before finding the '='\n", | 
					
						
							| 
									
										
										
										
											2015-04-30 02:50:00 +08:00
										 |  |  |                     opt_getprog()); | 
					
						
							|  |  |  |             goto err; | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         } | 
					
						
							| 
									
										
										
										
											2015-04-30 02:50:00 +08:00
										 |  |  |         *bp++ = '\0'; | 
					
						
							|  |  |  |         ++cp; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         /* Collect the value. */ | 
					
						
							|  |  |  |         valstr = (unsigned char *)bp; | 
					
						
							|  |  |  |         for (; *cp && *cp != '/'; *bp++ = *cp++) { | 
					
						
							|  |  |  |             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, | 
					
						
							| 
									
										
										
										
											2019-03-19 07:35:03 +08:00
										 |  |  |                            "%s: escape character at end of string\n", | 
					
						
							|  |  |  |                            opt_getprog()); | 
					
						
							| 
									
										
										
										
											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. */ | 
					
						
							|  |  |  |         if (*cp) | 
					
						
							|  |  |  |             ++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) { | 
					
						
							|  |  |  |             BIO_printf(bio_err, "%s: Skipping unknown attribute \"%s\"\n", | 
					
						
							| 
									
										
										
										
											2019-03-19 07:35:03 +08:00
										 |  |  |                        opt_getprog(), typestr); | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |             continue; | 
					
						
							|  |  |  |         } | 
					
						
							| 
									
										
										
										
											2018-10-05 02:49:21 +08:00
										 |  |  |         if (*valstr == '\0') { | 
					
						
							|  |  |  |             BIO_printf(bio_err, | 
					
						
							|  |  |  |                        "%s: No value provided for Subject Attribute %s, skipped\n", | 
					
						
							|  |  |  |                        opt_getprog(), typestr); | 
					
						
							|  |  |  |             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)) { | 
					
						
							|  |  |  |             BIO_printf(bio_err, "%s: Error adding name attribute \"/%s=%s\"\n", | 
					
						
							|  |  |  |                        opt_getprog(), 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
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											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); | 
					
						
							| 
									
										
										
										
											2015-05-07 02:56:14 +08:00
										 |  |  |             if (strncmp(uptr, "http://", 7) == 0) | 
					
						
							| 
									
										
										
										
											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) | 
					
						
							|  |  |  |             return load_crl(urlptr, FORMAT_HTTP); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     return NULL; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /*
 | 
					
						
							|  |  |  |  * Example of downloading CRLs from CRLDP: not usable for real world as it | 
					
						
							|  |  |  |  * always downloads, doesn't support non-blocking I/O and doesn't cache | 
					
						
							|  |  |  |  * anything. | 
					
						
							| 
									
										
										
										
											2012-12-07 02:43:40 +08:00
										 |  |  |  */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static STACK_OF(X509_CRL) *crls_http_cb(X509_STORE_CTX *ctx, 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) | 
					
						
							|  |  |  |             ERR_add_error_data(1, hint); | 
					
						
							|  |  |  |         /*
 | 
					
						
							|  |  |  |          * 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, | 
					
						
							|  |  |  |                               const char *proxy_port, SSL_CTX *ssl_ctx, | 
					
						
							|  |  |  |                               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) { | 
					
						
							|  |  |  |         HTTPerr(0, ERR_R_PASSED_NULL_PARAMETER); | 
					
						
							|  |  |  |         return NULL; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (!OSSL_HTTP_parse_url(url, &server, &port, NULL /* ppath */, &use_ssl)) | 
					
						
							|  |  |  |         return NULL; | 
					
						
							|  |  |  |     if (use_ssl && ssl_ctx == NULL) { | 
					
						
							|  |  |  |         HTTPerr(0, ERR_R_PASSED_NULL_PARAMETER); | 
					
						
							|  |  |  |         ERR_add_error_data(1, "missing SSL_CTX"); | 
					
						
							|  |  |  |         goto end; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     info.server = server; | 
					
						
							|  |  |  |     info.port = port; | 
					
						
							|  |  |  |     info.use_proxy = proxy != NULL; | 
					
						
							|  |  |  |     info.timeout = timeout; | 
					
						
							|  |  |  |     info.ssl_ctx = ssl_ctx; | 
					
						
							|  |  |  |     resp = OSSL_HTTP_get_asn1(url, proxy, proxy_port, | 
					
						
							|  |  |  |                               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, | 
					
						
							|  |  |  |                                const char *proxy_port, SSL_CTX *ssl_ctx, | 
					
						
							|  |  |  |                                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, | 
					
						
							|  |  |  |                                proxy, proxy_port, | 
					
						
							|  |  |  |                                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(OPENSSL_SYSTEM_VMS)
 | 
					
						
							|  |  |  | # include <time.h>
 | 
					
						
							|  |  |  | # include <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) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     static clock_t tmstart; | 
					
						
							|  |  |  |     double ret = 0; | 
					
						
							|  |  |  |     clock_t now; | 
					
						
							|  |  |  | # ifdef __TMS
 | 
					
						
							|  |  |  |     struct tms rus; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     now = times(&rus); | 
					
						
							|  |  |  |     if (usertime) | 
					
						
							|  |  |  |         now = rus.tms_utime; | 
					
						
							|  |  |  | # else
 | 
					
						
							|  |  |  |     if (usertime) | 
					
						
							|  |  |  |         now = clock();          /* sum of user and kernel times */ | 
					
						
							|  |  |  |     else { | 
					
						
							|  |  |  |         struct timeval tv; | 
					
						
							|  |  |  |         gettimeofday(&tv, NULL); | 
					
						
							|  |  |  |         now = (clock_t)((unsigned long long)tv.tv_sec * CLK_TCK + | 
					
						
							|  |  |  |                         (unsigned long long)tv.tv_usec * (1000000 / CLK_TCK) | 
					
						
							|  |  |  |             ); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | # endif
 | 
					
						
							|  |  |  |     if (stop == TM_START) | 
					
						
							|  |  |  |         tmstart = now; | 
					
						
							|  |  |  |     else | 
					
						
							|  |  |  |         ret = (now - tmstart) / (double)(CLK_TCK); | 
					
						
							| 
									
										
										
										
											2005-11-06 19:40:59 +08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											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; | 
					
						
							|  |  |  |     struct tms rus; | 
					
						
							|  |  |  |     clock_t now = times(&rus); | 
					
						
							|  |  |  |     static clock_t tmstart; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     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 { | 
					
						
							| 
									
										
										
										
											2015-01-22 11:40:55 +08:00
										 |  |  |         long int tck = sysconf(_SC_CLK_TCK); | 
					
						
							|  |  |  |         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
 | 
					
						
							| 
									
										
										
										
											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
										 |  |  | } | 
					
						
							| 
									
										
										
										
											2005-11-04 17:30:55 +08:00
										 |  |  | #else
 | 
					
						
							| 
									
										
										
										
											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
										 |  |  | 
 | 
					
						
							|  |  |  | 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; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     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, | 
					
						
							|  |  |  |                                            stmp, vtmp, strlen(vtmp))) | 
					
						
							|  |  |  |             goto err; | 
					
						
							|  |  |  |         OPENSSL_free(stmp); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     params[params_n] = OSSL_PARAM_construct_end(); | 
					
						
							|  |  |  |     return params; | 
					
						
							|  |  |  | err: | 
					
						
							|  |  |  |     OPENSSL_free(stmp); | 
					
						
							|  |  |  |     BIO_printf(bio_err, "Parameter error '%s'\n", opt); | 
					
						
							|  |  |  |     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); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | } |