1998-12-21 18:56:39 +08:00
|
|
|
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
1998-12-21 18:52:47 +08:00
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* This package is an SSL implementation written
|
|
|
|
* by Eric Young (eay@cryptsoft.com).
|
|
|
|
* The implementation was written so as to conform with Netscapes SSL.
|
2015-01-22 11:40:55 +08:00
|
|
|
*
|
1998-12-21 18:52:47 +08:00
|
|
|
* This library is free for commercial and non-commercial use as long as
|
|
|
|
* the following conditions are aheared to. The following conditions
|
|
|
|
* apply to all code found in this distribution, be it the RC4, RSA,
|
|
|
|
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
|
|
|
* included with this distribution is covered by the same copyright terms
|
|
|
|
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
2015-01-22 11:40:55 +08:00
|
|
|
*
|
1998-12-21 18:52:47 +08:00
|
|
|
* Copyright remains Eric Young's, and as such any Copyright notices in
|
|
|
|
* the code are not to be removed.
|
|
|
|
* If this package is used in a product, Eric Young should be given attribution
|
|
|
|
* as the author of the parts of the library used.
|
|
|
|
* This can be in the form of a textual message at program startup or
|
|
|
|
* in documentation (online or textual) provided with the package.
|
2015-01-22 11:40:55 +08:00
|
|
|
*
|
1998-12-21 18:52:47 +08:00
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
|
|
* must display the following acknowledgement:
|
|
|
|
* "This product includes cryptographic software written by
|
|
|
|
* Eric Young (eay@cryptsoft.com)"
|
|
|
|
* The word 'cryptographic' can be left out if the rouines from the library
|
|
|
|
* being used are not cryptographic related :-).
|
2015-01-22 11:40:55 +08:00
|
|
|
* 4. If you include any Windows specific code (or a derivative thereof) from
|
1998-12-21 18:52:47 +08:00
|
|
|
* the apps directory (application code) you must include an acknowledgement:
|
|
|
|
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
2015-01-22 11:40:55 +08:00
|
|
|
*
|
1998-12-21 18:52:47 +08:00
|
|
|
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
2015-01-22 11:40:55 +08:00
|
|
|
*
|
1998-12-21 18:52:47 +08:00
|
|
|
* The licence and distribution terms for any publically available version or
|
|
|
|
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
|
|
|
* copied and put under another distribution licence
|
|
|
|
* [including the GNU Public Licence.]
|
|
|
|
*/
|
2001-10-21 01:56:36 +08:00
|
|
|
/* ====================================================================
|
|
|
|
* Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
*
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
2015-01-22 11:40:55 +08:00
|
|
|
* notice, this list of conditions and the following disclaimer.
|
2001-10-21 01:56:36 +08:00
|
|
|
*
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in
|
|
|
|
* the documentation and/or other materials provided with the
|
|
|
|
* distribution.
|
|
|
|
*
|
|
|
|
* 3. All advertising materials mentioning features or use of this
|
|
|
|
* software must display the following acknowledgment:
|
|
|
|
* "This product includes software developed by the OpenSSL Project
|
|
|
|
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
|
|
|
|
*
|
|
|
|
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
|
|
|
* endorse or promote products derived from this software without
|
|
|
|
* prior written permission. For written permission, please contact
|
|
|
|
* openssl-core@openssl.org.
|
|
|
|
*
|
|
|
|
* 5. Products derived from this software may not be called "OpenSSL"
|
|
|
|
* nor may "OpenSSL" appear in their names without prior written
|
|
|
|
* permission of the OpenSSL Project.
|
|
|
|
*
|
|
|
|
* 6. Redistributions of any form whatsoever must retain the following
|
|
|
|
* acknowledgment:
|
|
|
|
* "This product includes software developed by the OpenSSL Project
|
|
|
|
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
|
|
|
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
|
|
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
|
|
|
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
|
|
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
|
|
|
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
* ====================================================================
|
|
|
|
*
|
|
|
|
* This product includes cryptographic software written by Eric Young
|
|
|
|
* (eay@cryptsoft.com). This product includes software written by Tim
|
|
|
|
* Hudson (tjh@cryptsoft.com).
|
|
|
|
*
|
|
|
|
*/
|
1998-12-21 18:52:47 +08:00
|
|
|
|
|
|
|
#ifndef HEADER_APPS_H
|
2015-01-22 11:40:55 +08:00
|
|
|
# define HEADER_APPS_H
|
|
|
|
|
|
|
|
# include "e_os.h"
|
2015-05-02 22:01:33 +08:00
|
|
|
# include <assert.h>
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2015-09-17 10:17:55 +08:00
|
|
|
# include <openssl/e_os2.h>
|
2016-01-13 10:13:34 +08:00
|
|
|
# include <openssl/ossl_typ.h>
|
2015-01-22 11:40:55 +08:00
|
|
|
# include <openssl/bio.h>
|
|
|
|
# include <openssl/x509.h>
|
|
|
|
# include <openssl/lhash.h>
|
|
|
|
# include <openssl/conf.h>
|
|
|
|
# include <openssl/txt_db.h>
|
|
|
|
# ifndef OPENSSL_NO_ENGINE
|
|
|
|
# include <openssl/engine.h>
|
|
|
|
# endif
|
|
|
|
# ifndef OPENSSL_NO_OCSP
|
|
|
|
# include <openssl/ocsp.h>
|
|
|
|
# endif
|
|
|
|
# include <openssl/ossl_typ.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
|
|
|
# ifndef OPENSSL_SYS_NETWARE
|
|
|
|
# include <signal.h>
|
|
|
|
# endif
|
1998-12-21 18:52:47 +08:00
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
# if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINCE)
|
|
|
|
# define openssl_fdset(a,b) FD_SET((unsigned int)a, b)
|
|
|
|
# else
|
|
|
|
# define openssl_fdset(a,b) FD_SET(a, b)
|
|
|
|
# endif
|
|
|
|
|
2016-02-14 20:02:15 +08:00
|
|
|
/*
|
|
|
|
* quick macro when you need to pass an unsigned char instead of a char.
|
|
|
|
* this is true for some implementations of the is*() functions, for
|
|
|
|
* example.
|
|
|
|
*/
|
|
|
|
#define _UC(c) ((unsigned char)(c))
|
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is 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_RAND_load_file(const char *file, int dont_warn);
|
|
|
|
int app_RAND_write_file(const char *file);
|
2015-01-22 11:40:55 +08:00
|
|
|
/*
|
|
|
|
* When `file' is NULL, use defaults. `bio_e' is for error messages.
|
|
|
|
*/
|
1999-10-26 09:56:29 +08:00
|
|
|
void app_RAND_allow_write_file(void);
|
|
|
|
long app_RAND_load_files(char *file); /* `file' is a list of files to read,
|
|
|
|
* separated by LIST_SEPARATOR_CHAR
|
|
|
|
* (see e_os.h). The string is
|
|
|
|
* destroyed! */
|
|
|
|
|
1998-12-21 18:52:47 +08:00
|
|
|
extern char *default_config_file;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
extern BIO *bio_in;
|
|
|
|
extern BIO *bio_out;
|
1998-12-21 18:52:47 +08:00
|
|
|
extern BIO *bio_err;
|
2015-09-06 18:20:12 +08:00
|
|
|
BIO *dup_bio_in(int format);
|
|
|
|
BIO *dup_bio_out(int format);
|
2015-09-04 18:49:06 +08:00
|
|
|
BIO *bio_open_owner(const char *filename, int format, int private);
|
|
|
|
BIO *bio_open_default(const char *filename, char mode, int format);
|
|
|
|
BIO *bio_open_default_quiet(const char *filename, char mode, int format);
|
2015-05-29 14:07:10 +08:00
|
|
|
CONF *app_load_config(const char *filename);
|
|
|
|
CONF *app_load_config_quiet(const char *filename);
|
|
|
|
int app_load_modules(const CONF *config);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is 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 unbuffer(FILE *fp);
|
2015-10-06 21:04:11 +08:00
|
|
|
void wait_for_async(SSL *s);
|
1998-12-21 18:52:47 +08:00
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
/*
|
|
|
|
* Common verification options.
|
|
|
|
*/
|
|
|
|
# define OPT_V_ENUM \
|
|
|
|
OPT_V__FIRST=2000, \
|
|
|
|
OPT_V_POLICY, OPT_V_PURPOSE, OPT_V_VERIFY_NAME, OPT_V_VERIFY_DEPTH, \
|
|
|
|
OPT_V_ATTIME, OPT_V_VERIFY_HOSTNAME, OPT_V_VERIFY_EMAIL, \
|
|
|
|
OPT_V_VERIFY_IP, OPT_V_IGNORE_CRITICAL, OPT_V_ISSUER_CHECKS, \
|
|
|
|
OPT_V_CRL_CHECK, OPT_V_CRL_CHECK_ALL, OPT_V_POLICY_CHECK, \
|
|
|
|
OPT_V_EXPLICIT_POLICY, OPT_V_INHIBIT_ANY, OPT_V_INHIBIT_MAP, \
|
|
|
|
OPT_V_X509_STRICT, OPT_V_EXTENDED_CRL, OPT_V_USE_DELTAS, \
|
|
|
|
OPT_V_POLICY_PRINT, OPT_V_CHECK_SS_SIG, OPT_V_TRUSTED_FIRST, \
|
|
|
|
OPT_V_SUITEB_128_ONLY, OPT_V_SUITEB_128, OPT_V_SUITEB_192, \
|
2015-07-31 15:49:50 +08:00
|
|
|
OPT_V_PARTIAL_CHAIN, OPT_V_NO_ALT_CHAINS, OPT_V_NO_CHECK_TIME, \
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
OPT_V__LAST
|
|
|
|
|
|
|
|
# define OPT_V_OPTIONS \
|
2016-02-09 23:55:42 +08:00
|
|
|
{ "policy", OPT_V_POLICY, 's', "adds policy to the acceptable policy set"}, \
|
|
|
|
{ "purpose", OPT_V_PURPOSE, 's', \
|
2016-02-10 03:18:15 +08:00
|
|
|
"certificate chain purpose"}, \
|
|
|
|
{ "verify_name", OPT_V_VERIFY_NAME, 's', "verification policy name"}, \
|
2016-02-09 23:55:42 +08:00
|
|
|
{ "verify_depth", OPT_V_VERIFY_DEPTH, 'p', \
|
2016-02-10 03:18:15 +08:00
|
|
|
"chain depth limit"}, \
|
|
|
|
{ "attime", OPT_V_ATTIME, 'M', "verification epoch time" }, \
|
2016-02-09 23:55:42 +08:00
|
|
|
{ "verify_hostname", OPT_V_VERIFY_HOSTNAME, 's', \
|
2016-02-10 03:18:15 +08:00
|
|
|
"expected peer hostname" }, \
|
2016-02-09 23:55:42 +08:00
|
|
|
{ "verify_email", OPT_V_VERIFY_EMAIL, 's', \
|
2016-02-10 03:18:15 +08:00
|
|
|
"expected peer email" }, \
|
2016-02-09 23:55:42 +08:00
|
|
|
{ "verify_ip", OPT_V_VERIFY_IP, 's', \
|
2016-02-10 03:18:15 +08:00
|
|
|
"expected peer IP address" }, \
|
2016-02-09 23:55:42 +08:00
|
|
|
{ "ignore_critical", OPT_V_IGNORE_CRITICAL, '-', \
|
2016-02-10 03:18:15 +08:00
|
|
|
"permit unhandled critical extensions"}, \
|
2016-02-10 03:17:13 +08:00
|
|
|
{ "issuer_checks", OPT_V_ISSUER_CHECKS, '-', "(deprecated)"}, \
|
2016-02-10 03:18:15 +08:00
|
|
|
{ "crl_check", OPT_V_CRL_CHECK, '-', "check leaf certificate revocation" }, \
|
|
|
|
{ "crl_check_all", OPT_V_CRL_CHECK_ALL, '-', "check full chain revocation" }, \
|
|
|
|
{ "policy_check", OPT_V_POLICY_CHECK, '-', "perform rfc5280 policy checks"}, \
|
|
|
|
{ "explicit_policy", OPT_V_EXPLICIT_POLICY, '-', \
|
|
|
|
"set policy variable require-explicit-policy"}, \
|
|
|
|
{ "inhibit_any", OPT_V_INHIBIT_ANY, '-', \
|
|
|
|
"set policy variable inihibit-any-policy"}, \
|
|
|
|
{ "inhibit_map", OPT_V_INHIBIT_MAP, '-', \
|
|
|
|
"set policy variable inihibit-policy-mapping"}, \
|
2016-02-09 23:55:42 +08:00
|
|
|
{ "x509_strict", OPT_V_X509_STRICT, '-', \
|
2016-02-10 03:18:15 +08:00
|
|
|
"disable certificate compatibility work-arounds"}, \
|
2016-02-09 23:55:42 +08:00
|
|
|
{ "extended_crl", OPT_V_EXTENDED_CRL, '-', \
|
2016-02-10 03:18:15 +08:00
|
|
|
"enable extended CRL features"}, \
|
2016-02-09 23:55:42 +08:00
|
|
|
{ "use_deltas", OPT_V_USE_DELTAS, '-', \
|
2016-02-10 03:18:15 +08:00
|
|
|
"use delta CRLs"}, \
|
|
|
|
{ "policy_print", OPT_V_POLICY_PRINT, '-', \
|
|
|
|
"print policy processing diagnostics"}, \
|
2016-02-09 23:55:42 +08:00
|
|
|
{ "check_ss_sig", OPT_V_CHECK_SS_SIG, '-', \
|
2016-02-10 03:18:15 +08:00
|
|
|
"check root CA self-signatures"}, \
|
2016-02-09 23:55:42 +08:00
|
|
|
{ "trusted_first", OPT_V_TRUSTED_FIRST, '-', \
|
2016-02-10 03:18:15 +08:00
|
|
|
"search trust store first (default)" }, \
|
|
|
|
{ "suiteB_128_only", OPT_V_SUITEB_128_ONLY, '-', "Suite B 128-bit-only mode"}, \
|
2016-02-09 23:55:42 +08:00
|
|
|
{ "suiteB_128", OPT_V_SUITEB_128, '-', \
|
2016-02-10 03:18:15 +08:00
|
|
|
"Suite B 128-bit mode allowing 192-bit algorithms"}, \
|
|
|
|
{ "suiteB_192", OPT_V_SUITEB_192, '-', "Suite B 192-bit-only mode" }, \
|
2016-02-09 23:55:42 +08:00
|
|
|
{ "partial_chain", OPT_V_PARTIAL_CHAIN, '-', \
|
2016-02-10 03:18:15 +08:00
|
|
|
"accept chains anchored by intermediate trust-store CAs"}, \
|
|
|
|
{ "no_alt_chains", OPT_V_NO_ALT_CHAINS, '-', "(deprecated)" }, \
|
|
|
|
{ "no_check_time", OPT_V_NO_CHECK_TIME, '-', "ignore certificate validity time" }
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
|
|
|
|
# define OPT_V_CASES \
|
|
|
|
OPT_V__FIRST: case OPT_V__LAST: break; \
|
|
|
|
case OPT_V_POLICY: \
|
|
|
|
case OPT_V_PURPOSE: \
|
|
|
|
case OPT_V_VERIFY_NAME: \
|
|
|
|
case OPT_V_VERIFY_DEPTH: \
|
|
|
|
case OPT_V_ATTIME: \
|
|
|
|
case OPT_V_VERIFY_HOSTNAME: \
|
|
|
|
case OPT_V_VERIFY_EMAIL: \
|
|
|
|
case OPT_V_VERIFY_IP: \
|
|
|
|
case OPT_V_IGNORE_CRITICAL: \
|
|
|
|
case OPT_V_ISSUER_CHECKS: \
|
|
|
|
case OPT_V_CRL_CHECK: \
|
|
|
|
case OPT_V_CRL_CHECK_ALL: \
|
|
|
|
case OPT_V_POLICY_CHECK: \
|
|
|
|
case OPT_V_EXPLICIT_POLICY: \
|
|
|
|
case OPT_V_INHIBIT_ANY: \
|
|
|
|
case OPT_V_INHIBIT_MAP: \
|
|
|
|
case OPT_V_X509_STRICT: \
|
|
|
|
case OPT_V_EXTENDED_CRL: \
|
|
|
|
case OPT_V_USE_DELTAS: \
|
|
|
|
case OPT_V_POLICY_PRINT: \
|
|
|
|
case OPT_V_CHECK_SS_SIG: \
|
|
|
|
case OPT_V_TRUSTED_FIRST: \
|
|
|
|
case OPT_V_SUITEB_128_ONLY: \
|
|
|
|
case OPT_V_SUITEB_128: \
|
|
|
|
case OPT_V_SUITEB_192: \
|
|
|
|
case OPT_V_PARTIAL_CHAIN: \
|
2015-07-31 15:49:50 +08:00
|
|
|
case OPT_V_NO_ALT_CHAINS: \
|
|
|
|
case OPT_V_NO_CHECK_TIME
|
1998-12-21 18:52:47 +08:00
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
/*
|
|
|
|
* Common "extended"? options.
|
|
|
|
*/
|
|
|
|
# define OPT_X_ENUM \
|
|
|
|
OPT_X__FIRST=1000, \
|
|
|
|
OPT_X_KEY, OPT_X_CERT, OPT_X_CHAIN, OPT_X_CHAIN_BUILD, \
|
|
|
|
OPT_X_CERTFORM, OPT_X_KEYFORM, \
|
|
|
|
OPT_X__LAST
|
|
|
|
|
|
|
|
# define OPT_X_OPTIONS \
|
2016-02-09 23:55:42 +08:00
|
|
|
{ "xkey", OPT_X_KEY, '<', "key for Extended certificates"}, \
|
|
|
|
{ "xcert", OPT_X_CERT, '<', "cert for Extended certificates"}, \
|
|
|
|
{ "xchain", OPT_X_CHAIN, '<', "chain for Extended certificates"}, \
|
|
|
|
{ "xchain_build", OPT_X_CHAIN_BUILD, '-', \
|
|
|
|
"build certificate chain for the extended certificates"}, \
|
|
|
|
{ "xcertform", OPT_X_CERTFORM, 'F', \
|
|
|
|
"format of Extended certificate (PEM or DER) PEM default " }, \
|
|
|
|
{ "xkeyform", OPT_X_KEYFORM, 'F', \
|
|
|
|
"format of Exnteded certificate's key (PEM or DER) PEM default"}
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
|
|
|
|
# define OPT_X_CASES \
|
|
|
|
OPT_X__FIRST: case OPT_X__LAST: break; \
|
|
|
|
case OPT_X_KEY: \
|
|
|
|
case OPT_X_CERT: \
|
|
|
|
case OPT_X_CHAIN: \
|
|
|
|
case OPT_X_CHAIN_BUILD: \
|
|
|
|
case OPT_X_CERTFORM: \
|
|
|
|
case OPT_X_KEYFORM
|
2009-08-05 23:29:58 +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
|
|
|
/*
|
|
|
|
* Common SSL options.
|
|
|
|
* Any changes here must be coordinated with ../ssl/ssl_conf.c
|
|
|
|
*/
|
|
|
|
# define OPT_S_ENUM \
|
|
|
|
OPT_S__FIRST=3000, \
|
|
|
|
OPT_S_NOSSL3, OPT_S_NOTLS1, OPT_S_NOTLS1_1, OPT_S_NOTLS1_2, \
|
2016-02-09 23:55:42 +08:00
|
|
|
OPT_S_BUGS, OPT_S_NO_COMP, OPT_S_NOTICKET, \
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
OPT_S_SERVERPREF, OPT_S_LEGACYRENEG, OPT_S_LEGACYCONN, \
|
|
|
|
OPT_S_ONRESUMP, OPT_S_NOLEGACYCONN, OPT_S_STRICT, OPT_S_SIGALGS, \
|
|
|
|
OPT_S_CLIENTSIGALGS, OPT_S_CURVES, OPT_S_NAMEDCURVE, OPT_S_CIPHER, \
|
2016-02-04 05:45:39 +08:00
|
|
|
OPT_S_DHPARAM, OPT_S_DEBUGBROKE, OPT_S_COMP, \
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
OPT_S__LAST
|
|
|
|
|
|
|
|
# define OPT_S_OPTIONS \
|
2016-02-09 23:55:42 +08:00
|
|
|
{"no_ssl3", OPT_S_NOSSL3, '-',"Just disable SSLv3" }, \
|
|
|
|
{"no_tls1", OPT_S_NOTLS1, '-', "Just disable TLSv1"}, \
|
|
|
|
{"no_tls1_1", OPT_S_NOTLS1_1, '-', "Just disable TLSv1.1" }, \
|
|
|
|
{"no_tls1_2", OPT_S_NOTLS1_2, '-', "Just disable TLSv1.2"}, \
|
|
|
|
{"bugs", OPT_S_BUGS, '-', "Turn on SSL bug compatibility"}, \
|
2016-02-04 05:45:39 +08:00
|
|
|
{"no_comp", OPT_S_NO_COMP, '-', "Disable SSL/TLS compression (default)" }, \
|
2016-02-02 23:26:38 +08:00
|
|
|
{"comp", OPT_S_COMP, '-', "Use SSL/TLS-level compression" }, \
|
2016-02-09 23:55:42 +08:00
|
|
|
{"no_ticket", OPT_S_NOTICKET, '-', \
|
|
|
|
"Disable use of TLS session tickets"}, \
|
|
|
|
{"serverpref", OPT_S_SERVERPREF, '-', "Use server's cipher preferences"}, \
|
|
|
|
{"legacy_renegotiation", OPT_S_LEGACYRENEG, '-', \
|
|
|
|
"Enable use of legacy renegotiation (dangerous)"}, \
|
|
|
|
{"legacy_server_connect", OPT_S_LEGACYCONN, '-', \
|
|
|
|
"Allow initial connection to servers that don't support RI"}, \
|
|
|
|
{"no_resumption_on_reneg", OPT_S_ONRESUMP, '-', \
|
|
|
|
"Disallow session resumption on renegotiation"}, \
|
|
|
|
{"no_legacy_server_connect", OPT_S_NOLEGACYCONN, '-', \
|
|
|
|
"Disallow initial connection to servers that don't support RI"}, \
|
|
|
|
{"strict", OPT_S_STRICT, '-', \
|
|
|
|
"Enforce strict certificate checks as per TLS standard"}, \
|
2015-08-01 00:32:39 +08:00
|
|
|
{"sigalgs", OPT_S_SIGALGS, 's', \
|
|
|
|
"Signature algorithms to support (colon-separated list)" }, \
|
|
|
|
{"client_sigalgs", OPT_S_CLIENTSIGALGS, 's', \
|
|
|
|
"Signature algorithms to support for client certificate" \
|
|
|
|
" authentication (colon-separated list)" }, \
|
|
|
|
{"curves", OPT_S_CURVES, 's', \
|
|
|
|
"Elliptic curves to advertise (colon-separated list)" }, \
|
|
|
|
{"named_curve", OPT_S_NAMEDCURVE, 's', \
|
|
|
|
"Elliptic curve used for ECDHE (server-side only)" }, \
|
2016-02-09 23:55:42 +08:00
|
|
|
{"cipher", OPT_S_CIPHER, 's', "Specify cipher list to be used"}, \
|
|
|
|
{"dhparam", OPT_S_DHPARAM, '<', \
|
|
|
|
"DH parameter file to use, in cert file if not specified"}, \
|
|
|
|
{"debug_broken_protocol", OPT_S_DEBUGBROKE, '-', \
|
|
|
|
"Perform all sorts of protocol violations for testing purposes"}
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
|
|
|
|
# define OPT_S_CASES \
|
|
|
|
OPT_S__FIRST: case OPT_S__LAST: break; \
|
|
|
|
case OPT_S_NOSSL3: \
|
|
|
|
case OPT_S_NOTLS1: \
|
|
|
|
case OPT_S_NOTLS1_1: \
|
|
|
|
case OPT_S_NOTLS1_2: \
|
|
|
|
case OPT_S_BUGS: \
|
2016-02-04 05:45:39 +08:00
|
|
|
case OPT_S_NO_COMP: \
|
2016-02-02 23:26:38 +08:00
|
|
|
case OPT_S_COMP: \
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
case OPT_S_NOTICKET: \
|
|
|
|
case OPT_S_SERVERPREF: \
|
|
|
|
case OPT_S_LEGACYRENEG: \
|
|
|
|
case OPT_S_LEGACYCONN: \
|
|
|
|
case OPT_S_ONRESUMP: \
|
|
|
|
case OPT_S_NOLEGACYCONN: \
|
|
|
|
case OPT_S_STRICT: \
|
|
|
|
case OPT_S_SIGALGS: \
|
|
|
|
case OPT_S_CLIENTSIGALGS: \
|
|
|
|
case OPT_S_CURVES: \
|
|
|
|
case OPT_S_NAMEDCURVE: \
|
|
|
|
case OPT_S_CIPHER: \
|
|
|
|
case OPT_S_DHPARAM: \
|
|
|
|
case OPT_S_DEBUGBROKE
|
1998-12-21 18:52:47 +08:00
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
/*
|
|
|
|
* Option parsing.
|
|
|
|
*/
|
|
|
|
extern const char OPT_HELP_STR[];
|
|
|
|
extern const char OPT_MORE_STR[];
|
|
|
|
typedef struct options_st {
|
|
|
|
const char *name;
|
|
|
|
int retval;
|
|
|
|
/*
|
|
|
|
* value type: - no value (also the value zero), n number, p positive
|
2016-02-07 01:42:35 +08:00
|
|
|
* number, u unsigned, l long, s string, < input file, > output file,
|
|
|
|
* f any format, F der/pem format , E der/pem/engine format identifier.
|
|
|
|
* l, n and u include zero; p does not.
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
*/
|
|
|
|
int valtype;
|
|
|
|
const char *helpstr;
|
|
|
|
} OPTIONS;
|
|
|
|
|
2015-05-16 04:32:49 +08:00
|
|
|
/*
|
|
|
|
* A string/int pairing; widely use for option value lookup, hence the
|
|
|
|
* name OPT_PAIR. But that name is misleading in s_cb.c, so we also use
|
|
|
|
* the "generic" name STRINT_PAIR.
|
|
|
|
*/
|
|
|
|
typedef struct string_int_pair_st {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
const char *name;
|
|
|
|
int retval;
|
2015-05-16 04:32:49 +08:00
|
|
|
} OPT_PAIR, STRINT_PAIR;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
|
|
|
|
/* Flags to pass into opt_format; see FORMAT_xxx, below. */
|
|
|
|
# define OPT_FMT_PEMDER (1L << 1)
|
|
|
|
# define OPT_FMT_PKCS12 (1L << 2)
|
|
|
|
# define OPT_FMT_SMIME (1L << 3)
|
|
|
|
# define OPT_FMT_ENGINE (1L << 4)
|
|
|
|
# define OPT_FMT_MSBLOB (1L << 5)
|
|
|
|
# define OPT_FMT_NETSCAPE (1L << 6)
|
|
|
|
# define OPT_FMT_NSS (1L << 7)
|
|
|
|
# define OPT_FMT_TEXT (1L << 8)
|
|
|
|
# define OPT_FMT_HTTP (1L << 9)
|
|
|
|
# define OPT_FMT_PVK (1L << 10)
|
2016-02-02 13:37:41 +08:00
|
|
|
# define OPT_FMT_PDE (OPT_FMT_PEMDER | OPT_FMT_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
|
|
|
# define OPT_FMT_ANY ( \
|
|
|
|
OPT_FMT_PEMDER | OPT_FMT_PKCS12 | OPT_FMT_SMIME | \
|
|
|
|
OPT_FMT_ENGINE | OPT_FMT_MSBLOB | OPT_FMT_NETSCAPE | \
|
|
|
|
OPT_FMT_NSS | OPT_FMT_TEXT | OPT_FMT_HTTP | OPT_FMT_PVK)
|
|
|
|
|
|
|
|
char *opt_progname(const char *argv0);
|
|
|
|
char *opt_getprog(void);
|
|
|
|
char *opt_init(int ac, char **av, const OPTIONS * o);
|
2016-02-17 03:30:27 +08:00
|
|
|
int opt_next(void);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is 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 opt_format(const char *s, unsigned long flags, int *result);
|
|
|
|
int opt_int(const char *arg, int *result);
|
|
|
|
int opt_ulong(const char *arg, unsigned long *result);
|
|
|
|
int opt_long(const char *arg, long *result);
|
2016-01-14 04:42:06 +08:00
|
|
|
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \
|
|
|
|
defined(INTMAX_MAX) && defined(UINTMAX_MAX)
|
2016-01-13 10:13:34 +08:00
|
|
|
int opt_imax(const char *arg, intmax_t *result);
|
|
|
|
int opt_umax(const char *arg, uintmax_t *result);
|
2016-02-17 03:30:27 +08:00
|
|
|
#else
|
|
|
|
# define opt_imax opt_long
|
|
|
|
# define opt_umax opt_ulong
|
|
|
|
# define intmax_t long
|
|
|
|
# define uintmax_t unsigned long
|
2016-01-13 10:13:34 +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
|
|
|
int opt_pair(const char *arg, const OPT_PAIR * pairs, int *result);
|
|
|
|
int opt_cipher(const char *name, const EVP_CIPHER **cipherp);
|
|
|
|
int opt_md(const char *name, const EVP_MD **mdp);
|
|
|
|
char *opt_arg(void);
|
|
|
|
char *opt_flag(void);
|
|
|
|
char *opt_unknown(void);
|
|
|
|
char *opt_reset(void);
|
|
|
|
char **opt_rest(void);
|
|
|
|
int opt_num_rest(void);
|
|
|
|
int opt_verify(int i, X509_VERIFY_PARAM *vpm);
|
|
|
|
void opt_help(const OPTIONS * list);
|
|
|
|
int opt_format_error(const char *s, unsigned long flags);
|
2006-04-17 20:22:13 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
typedef struct args_st {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is 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 size;
|
|
|
|
int argc;
|
|
|
|
char **argv;
|
2015-01-22 11:40:55 +08:00
|
|
|
} ARGS;
|
2006-04-17 20:22:13 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
# define PW_MIN_LENGTH 4
|
|
|
|
typedef struct pw_cb_data {
|
|
|
|
const void *password;
|
|
|
|
const char *prompt_info;
|
|
|
|
} PW_CB_DATA;
|
1998-12-21 18:52:47 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_data);
|
2001-05-30 23:29:28 +08:00
|
|
|
|
2002-06-14 01:40:27 +08:00
|
|
|
int setup_ui_method(void);
|
|
|
|
void destroy_ui_method(void);
|
2001-06-20 00:26:30 +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
|
|
|
# ifdef HEADER_X509_H
|
1999-11-12 09:42:25 +08:00
|
|
|
int dump_cert_text(BIO *out, X509 *x);
|
2015-01-22 11:40:55 +08:00
|
|
|
void print_name(BIO *out, const char *title, X509_NAME *nm,
|
|
|
|
unsigned long lflags);
|
|
|
|
# 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
|
|
|
void print_bignum_var(BIO *, BIGNUM *, const char*, int, unsigned char *);
|
|
|
|
void print_array(BIO *, const char *, int, const unsigned char *);
|
2000-10-06 19:51:47 +08:00
|
|
|
int set_cert_ex(unsigned long *flags, const char *arg);
|
2000-07-28 09:58:15 +08:00
|
|
|
int set_name_ex(unsigned long *flags, const char *arg);
|
2001-03-16 10:04:17 +08:00
|
|
|
int set_ext_copy(int *copy_type, const char *arg);
|
|
|
|
int copy_extensions(X509 *x, X509_REQ *req, int copy_type);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is 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_passwd(char *arg1, char *arg2, char **pass1, char **pass2);
|
|
|
|
int add_oid_section(CONF *conf);
|
2016-02-14 11:33:56 +08:00
|
|
|
X509 *load_cert(const char *file, int format, const char *cert_descrip);
|
2012-12-07 02:43:40 +08:00
|
|
|
X509_CRL *load_crl(const char *infile, int 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
|
|
|
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);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is 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);
|
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 *cert_descrip);
|
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 *cert_descrip);
|
2015-09-22 23:00:52 +08:00
|
|
|
X509_STORE *setup_verify(char *CAfile, char *CApath,
|
|
|
|
int noCAfile, int noCApath);
|
|
|
|
int ctx_set_verify_locations(SSL_CTX *ctx, const char *CAfile,
|
|
|
|
const char *CApath, int noCAfile, int noCApath);
|
2016-03-02 21:34:05 +08:00
|
|
|
int ctx_set_ctlog_list_file(SSL_CTX *ctx, const char *path);
|
|
|
|
|
2015-04-26 03:41:29 +08:00
|
|
|
# ifdef OPENSSL_NO_ENGINE
|
|
|
|
# define setup_engine(engine, debug) NULL
|
|
|
|
# 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
|
|
|
ENGINE *setup_engine(const char *engine, int debug);
|
2015-01-22 11:40:55 +08:00
|
|
|
# endif
|
|
|
|
# ifndef OPENSSL_NO_OCSP
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
OCSP_RESPONSE *process_responder(OCSP_REQUEST *req,
|
2015-01-22 11:40:55 +08:00
|
|
|
const char *host, const char *path,
|
|
|
|
const char *port, int use_ssl,
|
2015-08-10 23:37:48 +08:00
|
|
|
STACK_OF(CONF_VALUE) *headers,
|
2015-01-22 11:40:55 +08:00
|
|
|
int req_timeout);
|
|
|
|
# endif
|
2007-09-27 05:56:59 +08:00
|
|
|
|
2001-07-13 04:41:51 +08:00
|
|
|
/* Functions defined in ca.c and also used in ocsp.c */
|
|
|
|
int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
|
2015-01-22 11:40:55 +08:00
|
|
|
ASN1_GENERALIZEDTIME **pinvtm, const char *str);
|
|
|
|
|
|
|
|
# define DB_type 0
|
|
|
|
# define DB_exp_date 1
|
|
|
|
# define DB_rev_date 2
|
|
|
|
# define DB_serial 3 /* index - unique */
|
|
|
|
# define DB_file 4
|
|
|
|
# define DB_name 5 /* index - unique when active and not
|
|
|
|
* disabled */
|
|
|
|
# define DB_NUMBER 6
|
|
|
|
|
|
|
|
# define DB_TYPE_REV 'R'
|
|
|
|
# define DB_TYPE_EXP 'E'
|
|
|
|
# define DB_TYPE_VAL 'V'
|
|
|
|
|
|
|
|
typedef struct db_attr_st {
|
|
|
|
int unique_subject;
|
|
|
|
} DB_ATTR;
|
|
|
|
typedef struct ca_db_st {
|
|
|
|
DB_ATTR attributes;
|
|
|
|
TXT_DB *db;
|
|
|
|
} CA_DB;
|
2003-04-04 00:33:03 +08:00
|
|
|
|
2015-05-01 05:48:31 +08:00
|
|
|
void* app_malloc(int sz, const char *what);
|
2003-04-04 00:33:03 +08:00
|
|
|
BIGNUM *load_serial(char *serialfile, int create, ASN1_INTEGER **retai);
|
2015-01-22 11:40:55 +08:00
|
|
|
int save_serial(char *serialfile, char *suffix, BIGNUM *serial,
|
|
|
|
ASN1_INTEGER **retai);
|
2003-04-04 23:10:35 +08:00
|
|
|
int rotate_serial(char *serialfile, char *new_suffix, char *old_suffix);
|
2004-04-20 20:05:26 +08:00
|
|
|
int rand_serial(BIGNUM *b, ASN1_INTEGER *ai);
|
2003-04-04 00:33:03 +08:00
|
|
|
CA_DB *load_index(char *dbfile, DB_ATTR *dbattr);
|
|
|
|
int index_index(CA_DB *db);
|
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
|
|
|
int rotate_index(const char *dbfile, const char *new_suffix,
|
|
|
|
const char *old_suffix);
|
2003-04-04 00:33:03 +08:00
|
|
|
void free_index(CA_DB *db);
|
2015-01-22 11:40:55 +08:00
|
|
|
# define index_name_cmp_noconst(a, b) \
|
|
|
|
index_name_cmp((const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, a), \
|
|
|
|
(const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, b))
|
2009-07-28 05:10:00 +08:00
|
|
|
int index_name_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b);
|
2005-04-16 02:29:33 +08:00
|
|
|
int parse_yesno(const char *str, int def);
|
2001-07-13 04:41:51 +08:00
|
|
|
|
2015-04-30 02:50:00 +08:00
|
|
|
X509_NAME *parse_name(const char *str, long chtype, int multirdn);
|
2004-09-08 02:38:46 +08:00
|
|
|
int args_verify(char ***pargs, int *pargc,
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is 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 *badarg, X509_VERIFY_PARAM **pm);
|
2015-04-29 23:27:08 +08:00
|
|
|
void policies_print(X509_STORE_CTX *ctx);
|
2006-04-09 06:25:47 +08:00
|
|
|
int bio_to_mem(unsigned char **out, int maxlen, BIO *in);
|
2016-02-02 13:37:41 +08:00
|
|
|
int pkey_ctrl_string(EVP_PKEY_CTX *ctx, const char *value);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is 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 init_gen_str(EVP_PKEY_CTX **pctx,
|
2015-01-22 11:40:55 +08:00
|
|
|
const char *algname, ENGINE *e, int do_param);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
int do_X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md,
|
2015-01-22 11:40:55 +08:00
|
|
|
STACK_OF(OPENSSL_STRING) *sigopts);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
int do_X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md,
|
2015-01-22 11:40:55 +08:00
|
|
|
STACK_OF(OPENSSL_STRING) *sigopts);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
int do_X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md,
|
2015-01-22 11:40:55 +08:00
|
|
|
STACK_OF(OPENSSL_STRING) *sigopts);
|
|
|
|
# ifndef OPENSSL_NO_PSK
|
2008-11-16 20:47:12 +08:00
|
|
|
extern char *psk_key;
|
2015-01-22 11:40:55 +08:00
|
|
|
# endif
|
2002-05-20 00:31:10 +08:00
|
|
|
|
2016-03-05 21:47:55 +08:00
|
|
|
unsigned char *next_protos_parse(size_t *outlen, const char *in);
|
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);
|
2012-10-08 23:10:07 +08:00
|
|
|
|
2012-12-07 02:43:40 +08:00
|
|
|
void store_setup_crl_download(X509_STORE *st);
|
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
/* See OPT_FMT_xxx, above. */
|
2015-09-04 18:49:06 +08:00
|
|
|
/* On some platforms, it's important to distinguish between text and binary
|
|
|
|
* files. On some, there might even be specific file formats for different
|
|
|
|
* contents. The FORMAT_xxx macros are meant to express an intent with the
|
|
|
|
* file being read or created.
|
|
|
|
*/
|
2015-09-04 08:46:47 +08:00
|
|
|
# define B_FORMAT_TEXT 0x8000
|
2015-01-22 11:40:55 +08:00
|
|
|
# define FORMAT_UNDEF 0
|
2015-09-04 18:49:06 +08:00
|
|
|
# define FORMAT_TEXT (1 | B_FORMAT_TEXT) /* Generic text */
|
|
|
|
# define FORMAT_BINARY 2 /* Generic binary */
|
|
|
|
# define FORMAT_BASE64 (3 | B_FORMAT_TEXT) /* Base64 */
|
|
|
|
# define FORMAT_ASN1 4 /* ASN.1/DER */
|
|
|
|
# define FORMAT_PEM (5 | B_FORMAT_TEXT)
|
|
|
|
# define FORMAT_PKCS12 6
|
|
|
|
# define FORMAT_SMIME (7 | B_FORMAT_TEXT)
|
|
|
|
# define FORMAT_ENGINE 8 /* Not really a file format */
|
2015-09-04 08:46:47 +08:00
|
|
|
# define FORMAT_PEMRSA (9 | B_FORMAT_TEXT) /* PEM RSAPubicKey format */
|
|
|
|
# define FORMAT_ASN1RSA 10 /* DER RSAPubicKey format */
|
|
|
|
# define FORMAT_MSBLOB 11 /* MS Key blob format */
|
|
|
|
# define FORMAT_PVK 12 /* MS PVK file format */
|
|
|
|
# define FORMAT_HTTP 13 /* Download using HTTP */
|
|
|
|
# define FORMAT_NSS 14 /* NSS keylog format */
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
# define EXT_COPY_NONE 0
|
|
|
|
# define EXT_COPY_ADD 1
|
|
|
|
# define EXT_COPY_ALL 2
|
|
|
|
|
|
|
|
# define NETSCAPE_CERT_HDR "certificate"
|
|
|
|
|
|
|
|
# define APP_PASS_LEN 1024
|
|
|
|
|
|
|
|
# define SERIAL_RAND_BITS 64
|
2004-04-20 20:05:26 +08:00
|
|
|
|
2015-04-30 02:15:50 +08:00
|
|
|
int app_hex(char);
|
2005-11-04 17:30:55 +08:00
|
|
|
int app_isdir(const char *);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is 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 *, int flag);
|
2015-01-22 11:40:55 +08:00
|
|
|
int raw_read_stdin(void *, int);
|
|
|
|
int raw_write_stdout(const void *, int);
|
2005-11-06 19:40:59 +08:00
|
|
|
|
2015-01-22 11:40:55 +08:00
|
|
|
# define TM_START 0
|
|
|
|
# define TM_STOP 1
|
|
|
|
double app_tminterval(int stop, int usertime);
|
2010-07-28 18:06:55 +08:00
|
|
|
|
2015-09-05 20:32:58 +08:00
|
|
|
/* this is an accident waiting to happen (-Wshadow is your friend) */
|
|
|
|
extern int verify_depth;
|
|
|
|
extern int verify_quiet;
|
|
|
|
extern int verify_error;
|
|
|
|
extern int verify_return_error;
|
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
# include "progs.h"
|
|
|
|
|
2010-07-28 18:06:55 +08:00
|
|
|
#endif
|