1998-12-21 10:56:39 +00:00
|
|
|
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
1998-12-21 10:52:47 +00: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 03:40:55 +00:00
|
|
|
*
|
1998-12-21 10:52:47 +00: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 03:40:55 +00:00
|
|
|
*
|
1998-12-21 10:52:47 +00: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 03:40:55 +00:00
|
|
|
*
|
1998-12-21 10:52:47 +00: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 03:40:55 +00:00
|
|
|
* 4. If you include any Windows specific code (or a derivative thereof) from
|
1998-12-21 10:52:47 +00: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 03:40:55 +00:00
|
|
|
*
|
1998-12-21 10:52:47 +00: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 03:40:55 +00:00
|
|
|
*
|
1998-12-21 10:52:47 +00: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-20 17:56:36 +00: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 03:40:55 +00:00
|
|
|
* notice, this list of conditions and the following disclaimer.
|
2001-10-20 17:56:36 +00: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 10:52:47 +00:00
|
|
|
|
2012-02-11 23:41:19 +00:00
|
|
|
#if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
|
2015-01-22 03:40:55 +00:00
|
|
|
/*
|
|
|
|
* On VMS, you need to define this to get the declaration of fileno(). The
|
|
|
|
* value 2 is to make sure no function defined in POSIX-2 is left undefined.
|
2015-01-21 19:18:47 +00:00
|
|
|
*/
|
2015-01-22 03:40:55 +00:00
|
|
|
# define _POSIX_C_SOURCE 2
|
2009-05-13 11:32:46 +00:00
|
|
|
#endif
|
1998-12-21 10:52:47 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2015-09-06 08:51:04 +00:00
|
|
|
#ifndef NO_SYS_TYPES_H
|
|
|
|
# include <sys/types.h>
|
|
|
|
#endif
|
|
|
|
#ifndef OPENSSL_NO_POSIX_IO
|
|
|
|
# include <sys/stat.h>
|
|
|
|
# include <fcntl.h>
|
|
|
|
#endif
|
2002-10-25 09:51:45 +00:00
|
|
|
#include <ctype.h>
|
2005-11-04 16:12:05 +00:00
|
|
|
#include <errno.h>
|
2000-06-22 17:42:50 +00:00
|
|
|
#include <openssl/err.h>
|
|
|
|
#include <openssl/x509.h>
|
2001-03-15 19:13:40 +00:00
|
|
|
#include <openssl/x509v3.h>
|
2000-06-22 17:42:50 +00:00
|
|
|
#include <openssl/pem.h>
|
|
|
|
#include <openssl/pkcs12.h>
|
2001-06-19 16:26:30 +00:00
|
|
|
#include <openssl/ui.h>
|
2000-06-22 17:42:50 +00:00
|
|
|
#include <openssl/safestack.h>
|
2003-01-30 17:39:26 +00:00
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
2015-01-22 03:40:55 +00:00
|
|
|
# include <openssl/engine.h>
|
2003-01-30 17:39:26 +00:00
|
|
|
#endif
|
2005-07-16 12:37:36 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
2015-01-22 03:40:55 +00:00
|
|
|
# include <openssl/rsa.h>
|
2005-07-16 12:37:36 +00:00
|
|
|
#endif
|
2004-05-17 19:05:32 +00:00
|
|
|
#include <openssl/bn.h>
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
#include <openssl/ssl.h>
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2002-10-24 10:03:55 +00:00
|
|
|
#include "apps.h"
|
|
|
|
|
2005-11-04 16:12:05 +00:00
|
|
|
#ifdef _WIN32
|
|
|
|
static int WIN32_rename(const char *from, const char *to);
|
2015-01-22 03:40:55 +00:00
|
|
|
# define rename(from,to) WIN32_rename((from),(to))
|
2005-11-04 16:12:05 +00:00
|
|
|
#endif
|
|
|
|
|
2000-10-06 11:51:47 +00:00
|
|
|
typedef struct {
|
2015-01-22 03:40:55 +00:00
|
|
|
const char *name;
|
|
|
|
unsigned long flag;
|
|
|
|
unsigned long mask;
|
2000-10-06 11:51:47 +00:00
|
|
|
} NAME_EX_TBL;
|
|
|
|
|
2001-06-19 16:26:30 +00:00
|
|
|
static UI_METHOD *ui_method = NULL;
|
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
static int set_table_opts(unsigned long *flags, const char *arg,
|
|
|
|
const NAME_EX_TBL * in_tbl);
|
|
|
|
static int set_multi_opts(unsigned long *flags, const char *arg,
|
|
|
|
const NAME_EX_TBL * in_tbl);
|
2000-10-06 11:51:47 +00:00
|
|
|
|
1998-12-21 10:52:47 +00:00
|
|
|
int app_init(long mesgwin);
|
2015-01-22 03:40:55 +00: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-24 19:26:15 +00:00
|
|
|
int chopup_args(ARGS *arg, char *buf)
|
2015-01-22 03:40:55 +00: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-24 19:26:15 +00:00
|
|
|
int quoted;
|
2015-05-06 09:16:55 +00:00
|
|
|
char c = '\0', *p = NULL;
|
2015-01-22 03:40:55 +00: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-24 19:26:15 +00:00
|
|
|
arg->argc = 0;
|
|
|
|
if (arg->size == 0) {
|
|
|
|
arg->size = 20;
|
2015-05-02 03:10:31 +00:00
|
|
|
arg->argv = app_malloc(sizeof(*arg->argv) * arg->size, "argv space");
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
if (arg->argv == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
for (p = buf;;) {
|
|
|
|
/* Skip whitespace. */
|
2016-02-14 12:02:15 +00:00
|
|
|
while (*p && isspace(_UC(*p)))
|
2015-01-22 03:40:55 +00:00
|
|
|
p++;
|
|
|
|
if (!*p)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* The start of something good :-) */
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
if (arg->argc >= arg->size) {
|
|
|
|
arg->size += 20;
|
2015-05-02 03:10:31 +00:00
|
|
|
arg->argv = OPENSSL_realloc(arg->argv,
|
|
|
|
sizeof(*arg->argv) * arg->size);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
if (arg->argv == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
return 0;
|
|
|
|
}
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
quoted = *p == '\'' || *p == '"';
|
|
|
|
if (quoted)
|
|
|
|
c = *p++;
|
|
|
|
arg->argv[arg->argc++] = p;
|
2015-01-22 03:40:55 +00:00
|
|
|
|
|
|
|
/* now look for the end of this */
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
if (quoted) {
|
|
|
|
while (*p && *p != c)
|
2015-01-22 03:40:55 +00:00
|
|
|
p++;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
*p++ = '\0';
|
2015-01-22 03:40:55 +00:00
|
|
|
} else {
|
2016-02-14 12:02:15 +00:00
|
|
|
while (*p && !isspace(_UC(*p)))
|
2015-01-22 03:40:55 +00:00
|
|
|
p++;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
if (*p)
|
|
|
|
*p++ = '\0';
|
2015-01-22 03:40:55 +00: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-24 19:26:15 +00:00
|
|
|
arg->argv[arg->argc] = NULL;
|
2015-01-22 03:40:55 +00:00
|
|
|
return (1);
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
#ifndef APP_INIT
|
1999-04-19 21:31:43 +00:00
|
|
|
int app_init(long mesgwin)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
return (1);
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
#endif
|
1999-11-11 13:58:41 +00:00
|
|
|
|
2015-09-22 15:00:52 +00:00
|
|
|
int ctx_set_verify_locations(SSL_CTX *ctx, const char *CAfile,
|
|
|
|
const char *CApath, int noCAfile, int noCApath)
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
{
|
2015-09-22 15:00:52 +00:00
|
|
|
if (CAfile == NULL && CApath == NULL) {
|
|
|
|
if (!noCAfile && SSL_CTX_set_default_verify_file(ctx) <= 0)
|
|
|
|
return 0;
|
|
|
|
if (!noCApath && SSL_CTX_set_default_verify_dir(ctx) <= 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
return SSL_CTX_load_verify_locations(ctx, CAfile, CApath);
|
|
|
|
}
|
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
int dump_cert_text(BIO *out, X509 *x)
|
1999-11-12 01:42:25 +00:00
|
|
|
{
|
2015-01-22 03:40:55 +00:00
|
|
|
char *p;
|
2002-11-13 15:43:43 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
p = X509_NAME_oneline(X509_get_subject_name(x), NULL, 0);
|
|
|
|
BIO_puts(out, "subject=");
|
|
|
|
BIO_puts(out, p);
|
|
|
|
OPENSSL_free(p);
|
1999-11-12 01:42:25 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
p = X509_NAME_oneline(X509_get_issuer_name(x), NULL, 0);
|
|
|
|
BIO_puts(out, "\nissuer=");
|
|
|
|
BIO_puts(out, p);
|
|
|
|
BIO_puts(out, "\n");
|
|
|
|
OPENSSL_free(p);
|
2002-11-13 15:43:43 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
return 0;
|
1999-11-12 01:42:25 +00:00
|
|
|
}
|
2000-02-16 23:16:01 +00:00
|
|
|
|
2001-06-19 16:26:30 +00:00
|
|
|
static int ui_open(UI *ui)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
return UI_method_get_opener(UI_OpenSSL())(ui);
|
|
|
|
}
|
|
|
|
|
2001-06-19 16:26:30 +00:00
|
|
|
static int ui_read(UI *ui, UI_STRING *uis)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
if (UI_get_input_flags(uis) & UI_INPUT_FLAG_DEFAULT_PWD
|
|
|
|
&& UI_get0_user_data(ui)) {
|
|
|
|
switch (UI_get_string_type(uis)) {
|
|
|
|
case UIT_PROMPT:
|
|
|
|
case UIT_VERIFY:
|
|
|
|
{
|
|
|
|
const char *password =
|
|
|
|
((PW_CB_DATA *)UI_get0_user_data(ui))->password;
|
|
|
|
if (password && password[0] != '\0') {
|
|
|
|
UI_set_result(ui, uis, password);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return UI_method_get_reader(UI_OpenSSL())(ui, uis);
|
|
|
|
}
|
|
|
|
|
2001-06-19 16:26:30 +00:00
|
|
|
static int ui_write(UI *ui, UI_STRING *uis)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
if (UI_get_input_flags(uis) & UI_INPUT_FLAG_DEFAULT_PWD
|
|
|
|
&& UI_get0_user_data(ui)) {
|
|
|
|
switch (UI_get_string_type(uis)) {
|
|
|
|
case UIT_PROMPT:
|
|
|
|
case UIT_VERIFY:
|
|
|
|
{
|
|
|
|
const char *password =
|
|
|
|
((PW_CB_DATA *)UI_get0_user_data(ui))->password;
|
|
|
|
if (password && password[0] != '\0')
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return UI_method_get_writer(UI_OpenSSL())(ui, uis);
|
|
|
|
}
|
|
|
|
|
2001-06-19 16:26:30 +00:00
|
|
|
static int ui_close(UI *ui)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
return UI_method_get_closer(UI_OpenSSL())(ui);
|
|
|
|
}
|
|
|
|
|
2002-06-13 17:40:27 +00:00
|
|
|
int setup_ui_method(void)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
ui_method = UI_create_method("OpenSSL application user interface");
|
|
|
|
UI_method_set_opener(ui_method, ui_open);
|
|
|
|
UI_method_set_reader(ui_method, ui_read);
|
|
|
|
UI_method_set_writer(ui_method, ui_write);
|
|
|
|
UI_method_set_closer(ui_method, ui_close);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2002-06-13 17:40:27 +00:00
|
|
|
void destroy_ui_method(void)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
if (ui_method) {
|
|
|
|
UI_destroy_method(ui_method);
|
|
|
|
ui_method = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_tmp)
|
|
|
|
{
|
|
|
|
UI *ui = NULL;
|
|
|
|
int res = 0;
|
|
|
|
const char *prompt_info = NULL;
|
|
|
|
const char *password = NULL;
|
|
|
|
PW_CB_DATA *cb_data = (PW_CB_DATA *)cb_tmp;
|
|
|
|
|
|
|
|
if (cb_data) {
|
|
|
|
if (cb_data->password)
|
|
|
|
password = cb_data->password;
|
|
|
|
if (cb_data->prompt_info)
|
|
|
|
prompt_info = cb_data->prompt_info;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (password) {
|
|
|
|
res = strlen(password);
|
|
|
|
if (res > bufsiz)
|
|
|
|
res = bufsiz;
|
|
|
|
memcpy(buf, password, res);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
ui = UI_new_method(ui_method);
|
|
|
|
if (ui) {
|
|
|
|
int ok = 0;
|
|
|
|
char *buff = NULL;
|
|
|
|
int ui_flags = 0;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
char *prompt;
|
2015-01-22 03:40:55 +00:00
|
|
|
|
|
|
|
prompt = UI_construct_prompt(ui, "pass phrase", prompt_info);
|
2015-04-16 05:50:03 +00:00
|
|
|
if (!prompt) {
|
2015-03-04 17:49:51 +00:00
|
|
|
BIO_printf(bio_err, "Out of memory\n");
|
|
|
|
UI_free(ui);
|
|
|
|
return 0;
|
|
|
|
}
|
2015-01-22 03:40:55 +00:00
|
|
|
|
|
|
|
ui_flags |= UI_INPUT_FLAG_DEFAULT_PWD;
|
|
|
|
UI_ctrl(ui, UI_CTRL_PRINT_ERRORS, 1, 0, 0);
|
|
|
|
|
|
|
|
if (ok >= 0)
|
|
|
|
ok = UI_add_input_string(ui, prompt, ui_flags, buf,
|
|
|
|
PW_MIN_LENGTH, bufsiz - 1);
|
|
|
|
if (ok >= 0 && verify) {
|
2015-04-30 21:48:31 +00:00
|
|
|
buff = app_malloc(bufsiz, "password buffer");
|
2015-01-22 03:40:55 +00:00
|
|
|
ok = UI_add_verify_string(ui, prompt, ui_flags, buff,
|
|
|
|
PW_MIN_LENGTH, bufsiz - 1, buf);
|
|
|
|
}
|
|
|
|
if (ok >= 0)
|
|
|
|
do {
|
|
|
|
ok = UI_process(ui);
|
|
|
|
}
|
|
|
|
while (ok < 0 && UI_ctrl(ui, UI_CTRL_IS_REDOABLE, 0, 0, 0));
|
|
|
|
|
2015-04-30 21:57:32 +00:00
|
|
|
OPENSSL_clear_free(buff, (unsigned int)bufsiz);
|
2015-01-22 03:40:55 +00:00
|
|
|
|
|
|
|
if (ok >= 0)
|
|
|
|
res = strlen(buf);
|
|
|
|
if (ok == -1) {
|
|
|
|
BIO_printf(bio_err, "User interface error\n");
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
OPENSSL_cleanse(buf, (unsigned int)bufsiz);
|
|
|
|
res = 0;
|
|
|
|
}
|
|
|
|
if (ok == -2) {
|
|
|
|
BIO_printf(bio_err, "aborted!\n");
|
|
|
|
OPENSSL_cleanse(buf, (unsigned int)bufsiz);
|
|
|
|
res = 0;
|
|
|
|
}
|
|
|
|
UI_free(ui);
|
|
|
|
OPENSSL_free(prompt);
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
2001-05-30 15:29:28 +00: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-24 19:26:15 +00:00
|
|
|
static char *app_get_pass(char *arg, int keepbio);
|
2000-02-16 23:16:01 +00: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-24 19:26:15 +00:00
|
|
|
int app_passwd(char *arg1, char *arg2, char **pass1, char **pass2)
|
2000-02-16 23:16:01 +00:00
|
|
|
{
|
2015-01-22 03:40:55 +00:00
|
|
|
int same;
|
|
|
|
if (!arg2 || !arg1 || strcmp(arg1, arg2))
|
|
|
|
same = 0;
|
|
|
|
else
|
|
|
|
same = 1;
|
|
|
|
if (arg1) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
*pass1 = app_get_pass(arg1, same);
|
2015-01-22 03:40:55 +00:00
|
|
|
if (!*pass1)
|
|
|
|
return 0;
|
|
|
|
} else if (pass1)
|
|
|
|
*pass1 = NULL;
|
|
|
|
if (arg2) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
*pass2 = app_get_pass(arg2, same ? 2 : 0);
|
2015-01-22 03:40:55 +00:00
|
|
|
if (!*pass2)
|
|
|
|
return 0;
|
|
|
|
} else if (pass2)
|
|
|
|
*pass2 = NULL;
|
|
|
|
return 1;
|
2000-02-16 23:16:01 +00: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-24 19:26:15 +00:00
|
|
|
static char *app_get_pass(char *arg, int keepbio)
|
2000-02-16 23:16:01 +00:00
|
|
|
{
|
2015-01-22 03:40:55 +00:00
|
|
|
char *tmp, tpass[APP_PASS_LEN];
|
|
|
|
static BIO *pwdbio = NULL;
|
|
|
|
int i;
|
2015-05-06 18:56:14 +00:00
|
|
|
|
|
|
|
if (strncmp(arg, "pass:", 5) == 0)
|
Rename some BUF_xxx to OPENSSL_xxx
Rename BUF_{strdup,strlcat,strlcpy,memdup,strndup,strnlen}
to OPENSSL_{strdup,strlcat,strlcpy,memdup,strndup,strnlen}
Add #define's for the old names.
Add CRYPTO_{memdup,strndup}, called by OPENSSL_{memdup,strndup} macros.
Reviewed-by: Tim Hudson <tjh@openssl.org>
2015-12-16 21:12:24 +00:00
|
|
|
return OPENSSL_strdup(arg + 5);
|
2015-05-06 18:56:14 +00:00
|
|
|
if (strncmp(arg, "env:", 4) == 0) {
|
2015-01-22 03:40:55 +00:00
|
|
|
tmp = getenv(arg + 4);
|
|
|
|
if (!tmp) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "Can't read environment variable %s\n", arg + 4);
|
2015-01-22 03:40:55 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
Rename some BUF_xxx to OPENSSL_xxx
Rename BUF_{strdup,strlcat,strlcpy,memdup,strndup,strnlen}
to OPENSSL_{strdup,strlcat,strlcpy,memdup,strndup,strnlen}
Add #define's for the old names.
Add CRYPTO_{memdup,strndup}, called by OPENSSL_{memdup,strndup} macros.
Reviewed-by: Tim Hudson <tjh@openssl.org>
2015-12-16 21:12:24 +00:00
|
|
|
return OPENSSL_strdup(tmp);
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
if (!keepbio || !pwdbio) {
|
2015-05-06 18:56:14 +00:00
|
|
|
if (strncmp(arg, "file:", 5) == 0) {
|
2015-01-22 03:40:55 +00:00
|
|
|
pwdbio = BIO_new_file(arg + 5, "r");
|
|
|
|
if (!pwdbio) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "Can't open file %s\n", arg + 5);
|
2015-01-22 03:40:55 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2005-11-03 15:31:28 +00:00
|
|
|
#if !defined(_WIN32)
|
2015-01-22 03:40:55 +00:00
|
|
|
/*
|
|
|
|
* Under _WIN32, which covers even Win64 and CE, file
|
|
|
|
* descriptors referenced by BIO_s_fd are not inherited
|
|
|
|
* by child process and therefore below is not an option.
|
|
|
|
* It could have been an option if bss_fd.c was operating
|
|
|
|
* on real Windows descriptors, such as those obtained
|
|
|
|
* with CreateFile.
|
|
|
|
*/
|
2015-05-06 18:56:14 +00:00
|
|
|
} else if (strncmp(arg, "fd:", 3) == 0) {
|
2015-01-22 03:40:55 +00:00
|
|
|
BIO *btmp;
|
|
|
|
i = atoi(arg + 3);
|
|
|
|
if (i >= 0)
|
|
|
|
pwdbio = BIO_new_fd(i, BIO_NOCLOSE);
|
|
|
|
if ((i < 0) || !pwdbio) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "Can't access file descriptor %s\n", arg + 3);
|
2015-01-22 03:40:55 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Can't do BIO_gets on an fd BIO so add a buffering BIO
|
|
|
|
*/
|
|
|
|
btmp = BIO_new(BIO_f_buffer());
|
|
|
|
pwdbio = BIO_push(btmp, pwdbio);
|
|
|
|
#endif
|
2015-05-06 18:56:14 +00:00
|
|
|
} else if (strcmp(arg, "stdin") == 0) {
|
2015-09-06 10:20:12 +00:00
|
|
|
pwdbio = dup_bio_in(FORMAT_TEXT);
|
2015-01-22 03:40:55 +00:00
|
|
|
if (!pwdbio) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "Can't open BIO for stdin\n");
|
2015-01-22 03:40:55 +00:00
|
|
|
return 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-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "Invalid password argument \"%s\"\n", arg);
|
2015-01-22 03:40:55 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
i = BIO_gets(pwdbio, tpass, APP_PASS_LEN);
|
|
|
|
if (keepbio != 1) {
|
|
|
|
BIO_free_all(pwdbio);
|
|
|
|
pwdbio = NULL;
|
|
|
|
}
|
|
|
|
if (i <= 0) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "Error reading password from BIO\n");
|
2015-01-22 03:40:55 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
tmp = strchr(tpass, '\n');
|
|
|
|
if (tmp)
|
|
|
|
*tmp = 0;
|
Rename some BUF_xxx to OPENSSL_xxx
Rename BUF_{strdup,strlcat,strlcpy,memdup,strndup,strnlen}
to OPENSSL_{strdup,strlcat,strlcpy,memdup,strndup,strnlen}
Add #define's for the old names.
Add CRYPTO_{memdup,strndup}, called by OPENSSL_{memdup,strndup} macros.
Reviewed-by: Tim Hudson <tjh@openssl.org>
2015-12-16 21:12:24 +00:00
|
|
|
return OPENSSL_strdup(tpass);
|
2000-02-16 23:16:01 +00:00
|
|
|
}
|
2000-06-22 17:42:50 +00:00
|
|
|
|
2015-05-29 06:07:10 +00:00
|
|
|
static CONF *app_load_config_(BIO *in, const char *filename)
|
2015-05-28 17:52:55 +00:00
|
|
|
{
|
|
|
|
long errorline = -1;
|
|
|
|
CONF *conf;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
conf = NCONF_new(NULL);
|
|
|
|
i = NCONF_load_bio(conf, in, &errorline);
|
|
|
|
if (i > 0)
|
|
|
|
return conf;
|
|
|
|
|
|
|
|
if (errorline <= 0)
|
|
|
|
BIO_printf(bio_err, "%s: Can't load config file \"%s\"\n",
|
|
|
|
opt_getprog(), filename);
|
|
|
|
else
|
|
|
|
BIO_printf(bio_err, "%s: Error on line %ld of config file \"%s\"\n",
|
|
|
|
opt_getprog(), errorline, filename);
|
|
|
|
NCONF_free(conf);
|
|
|
|
return NULL;
|
|
|
|
}
|
2015-05-29 06:07:10 +00:00
|
|
|
CONF *app_load_config(const char *filename)
|
|
|
|
{
|
|
|
|
BIO *in;
|
|
|
|
CONF *conf;
|
|
|
|
|
2015-09-04 10:49:06 +00:00
|
|
|
in = bio_open_default(filename, 'r', FORMAT_TEXT);
|
2015-05-29 06:07:10 +00:00
|
|
|
if (in == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
conf = app_load_config_(in, filename);
|
|
|
|
BIO_free(in);
|
|
|
|
return conf;
|
|
|
|
}
|
|
|
|
CONF *app_load_config_quiet(const char *filename)
|
|
|
|
{
|
|
|
|
BIO *in;
|
|
|
|
CONF *conf;
|
|
|
|
|
2015-09-04 10:49:06 +00:00
|
|
|
in = bio_open_default_quiet(filename, 'r', FORMAT_TEXT);
|
2015-05-29 06:07:10 +00:00
|
|
|
if (in == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
conf = app_load_config_(in, filename);
|
|
|
|
BIO_free(in);
|
|
|
|
return conf;
|
|
|
|
}
|
|
|
|
|
|
|
|
int app_load_modules(const CONF *config)
|
|
|
|
{
|
|
|
|
CONF *to_free = NULL;
|
|
|
|
|
|
|
|
if (config == NULL)
|
|
|
|
config = to_free = app_load_config_quiet(default_config_file);
|
|
|
|
if (config == NULL)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
if (CONF_modules_load(config, NULL, 0) <= 0) {
|
|
|
|
BIO_printf(bio_err, "Error configuring OpenSSL modules\n");
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
NCONF_free(to_free);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
NCONF_free(to_free);
|
|
|
|
return 1;
|
|
|
|
}
|
2015-05-28 17:52:55 +00: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-24 19:26:15 +00:00
|
|
|
int add_oid_section(CONF *conf)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
char *p;
|
|
|
|
STACK_OF(CONF_VALUE) *sktmp;
|
|
|
|
CONF_VALUE *cnf;
|
|
|
|
int i;
|
2015-05-06 17:43:59 +00:00
|
|
|
|
|
|
|
if ((p = NCONF_get_string(conf, NULL, "oid_section")) == NULL) {
|
2015-01-22 03:40:55 +00:00
|
|
|
ERR_clear_error();
|
|
|
|
return 1;
|
|
|
|
}
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((sktmp = NCONF_get_section(conf, p)) == NULL) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "problem loading oid section %s\n", p);
|
2015-01-22 03:40:55 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
for (i = 0; i < sk_CONF_VALUE_num(sktmp); i++) {
|
|
|
|
cnf = sk_CONF_VALUE_value(sktmp, i);
|
|
|
|
if (OBJ_create(cnf->value, cnf->name, cnf->name) == NID_undef) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "problem creating object %s=%s\n",
|
2015-01-22 03:40:55 +00:00
|
|
|
cnf->name, cnf->value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 1;
|
2000-06-22 22:07:27 +00: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-24 19:26:15 +00:00
|
|
|
static int load_pkcs12(BIO *in, const char *desc,
|
2015-01-22 03:40:55 +00:00
|
|
|
pem_password_cb *pem_cb, void *cb_data,
|
|
|
|
EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca)
|
|
|
|
{
|
|
|
|
const char *pass;
|
|
|
|
char tpass[PEM_BUFSIZE];
|
|
|
|
int len, ret = 0;
|
|
|
|
PKCS12 *p12;
|
|
|
|
p12 = d2i_PKCS12_bio(in, NULL);
|
|
|
|
if (p12 == NULL) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "Error loading PKCS12 file for %s\n", desc);
|
2015-01-22 03:40:55 +00:00
|
|
|
goto die;
|
|
|
|
}
|
|
|
|
/* See if an empty password will do */
|
|
|
|
if (PKCS12_verify_mac(p12, "", 0) || PKCS12_verify_mac(p12, NULL, 0))
|
|
|
|
pass = "";
|
|
|
|
else {
|
|
|
|
if (!pem_cb)
|
|
|
|
pem_cb = (pem_password_cb *)password_callback;
|
|
|
|
len = pem_cb(tpass, PEM_BUFSIZE, 0, cb_data);
|
|
|
|
if (len < 0) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "Passphrase callback error for %s\n", desc);
|
2015-01-22 03:40:55 +00:00
|
|
|
goto die;
|
|
|
|
}
|
|
|
|
if (len < PEM_BUFSIZE)
|
|
|
|
tpass[len] = 0;
|
|
|
|
if (!PKCS12_verify_mac(p12, tpass, len)) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err,
|
2015-01-22 03:40:55 +00:00
|
|
|
"Mac verify error (wrong password?) in PKCS12 file for %s\n",
|
|
|
|
desc);
|
|
|
|
goto die;
|
|
|
|
}
|
|
|
|
pass = tpass;
|
|
|
|
}
|
|
|
|
ret = PKCS12_parse(p12, pass, pkey, cert, ca);
|
|
|
|
die:
|
2015-04-11 20:32:54 +00:00
|
|
|
PKCS12_free(p12);
|
2015-01-22 03:40:55 +00:00
|
|
|
return ret;
|
|
|
|
}
|
2004-12-29 01:07:14 +00:00
|
|
|
|
2016-02-25 05:56:35 +00:00
|
|
|
#ifndef OPENSSL_NO_OCSP
|
|
|
|
static int load_cert_crl_http(const char *url, X509 **pcert, X509_CRL **pcrl)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
char *host = NULL, *port = NULL, *path = NULL;
|
|
|
|
BIO *bio = NULL;
|
|
|
|
OCSP_REQ_CTX *rctx = NULL;
|
|
|
|
int use_ssl, rv = 0;
|
|
|
|
if (!OCSP_parse_url(url, &host, &port, &path, &use_ssl))
|
|
|
|
goto err;
|
|
|
|
if (use_ssl) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_puts(bio_err, "https not supported\n");
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
bio = BIO_new_connect(host);
|
|
|
|
if (!bio || !BIO_set_conn_port(bio, port))
|
|
|
|
goto err;
|
|
|
|
rctx = OCSP_REQ_CTX_new(bio, 1024);
|
2015-10-30 11:18:04 +00:00
|
|
|
if (rctx == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
if (!OCSP_REQ_CTX_http(rctx, "GET", path))
|
|
|
|
goto err;
|
|
|
|
if (!OCSP_REQ_CTX_add1_header(rctx, "Host", host))
|
|
|
|
goto err;
|
|
|
|
if (pcert) {
|
|
|
|
do {
|
|
|
|
rv = X509_http_nbio(rctx, pcert);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
} while (rv == -1);
|
2015-01-22 03:40:55 +00:00
|
|
|
} else {
|
|
|
|
do {
|
|
|
|
rv = X509_CRL_http_nbio(rctx, pcrl);
|
|
|
|
} while (rv == -1);
|
|
|
|
}
|
|
|
|
|
|
|
|
err:
|
2015-05-01 18:37:16 +00:00
|
|
|
OPENSSL_free(host);
|
|
|
|
OPENSSL_free(path);
|
|
|
|
OPENSSL_free(port);
|
2015-01-22 03:40:55 +00:00
|
|
|
if (bio)
|
|
|
|
BIO_free_all(bio);
|
2015-04-30 22:10:52 +00:00
|
|
|
OCSP_REQ_CTX_free(rctx);
|
2015-01-22 03:40:55 +00:00
|
|
|
if (rv != 1) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "Error loading %s from %s\n",
|
|
|
|
pcert ? "certificate" : "CRL", url);
|
2015-01-22 03:40:55 +00:00
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
}
|
|
|
|
return rv;
|
|
|
|
}
|
2016-02-25 05:56:35 +00:00
|
|
|
#endif
|
2012-12-02 14:00:22 +00:00
|
|
|
|
2016-02-14 03:33:56 +00:00
|
|
|
X509 *load_cert(const char *file, int format, const char *cert_descrip)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
X509 *x = NULL;
|
|
|
|
BIO *cert;
|
|
|
|
|
|
|
|
if (format == FORMAT_HTTP) {
|
2016-02-25 05:56:35 +00:00
|
|
|
#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-24 19:26:15 +00:00
|
|
|
load_cert_crl_http(file, &x, NULL);
|
2016-02-25 05:56:35 +00:00
|
|
|
#endif
|
2015-01-22 03:40:55 +00:00
|
|
|
return x;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (file == NULL) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
unbuffer(stdin);
|
2015-09-06 10:20:12 +00:00
|
|
|
cert = dup_bio_in(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-24 19:26:15 +00:00
|
|
|
} else
|
2015-09-04 10:49:06 +00:00
|
|
|
cert = bio_open_default(file, 'r', format);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
if (cert == NULL)
|
|
|
|
goto end;
|
2015-01-22 03:40:55 +00:00
|
|
|
|
|
|
|
if (format == FORMAT_ASN1)
|
|
|
|
x = d2i_X509_bio(cert, NULL);
|
2015-07-02 12:49:54 +00:00
|
|
|
else if (format == FORMAT_PEM)
|
2015-01-22 03:40:55 +00:00
|
|
|
x = PEM_read_bio_X509_AUX(cert, NULL,
|
|
|
|
(pem_password_cb *)password_callback, NULL);
|
|
|
|
else if (format == FORMAT_PKCS12) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
if (!load_pkcs12(cert, cert_descrip, NULL, NULL, NULL, &x, NULL))
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
} else {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "bad input format specified for %s\n", cert_descrip);
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
end:
|
|
|
|
if (x == NULL) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "unable to load certificate\n");
|
|
|
|
ERR_print_errors(bio_err);
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
2015-05-01 18:37:16 +00:00
|
|
|
BIO_free(cert);
|
2015-01-22 03:40:55 +00:00
|
|
|
return (x);
|
|
|
|
}
|
2000-06-22 17:42:50 +00:00
|
|
|
|
2012-12-06 18:43:40 +00:00
|
|
|
X509_CRL *load_crl(const char *infile, int format)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
X509_CRL *x = NULL;
|
|
|
|
BIO *in = NULL;
|
|
|
|
|
|
|
|
if (format == FORMAT_HTTP) {
|
2016-02-25 05:56:35 +00:00
|
|
|
#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-24 19:26:15 +00:00
|
|
|
load_cert_crl_http(infile, NULL, &x);
|
2016-02-25 05:56:35 +00:00
|
|
|
#endif
|
2015-01-22 03:40:55 +00:00
|
|
|
return x;
|
|
|
|
}
|
|
|
|
|
2015-09-04 10:49:06 +00:00
|
|
|
in = bio_open_default(infile, 'r', format);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
if (in == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
if (format == FORMAT_ASN1)
|
|
|
|
x = d2i_X509_CRL_bio(in, NULL);
|
|
|
|
else if (format == FORMAT_PEM)
|
|
|
|
x = PEM_read_bio_X509_CRL(in, NULL, NULL, NULL);
|
|
|
|
else {
|
|
|
|
BIO_printf(bio_err, "bad input format specified for input crl\n");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if (x == NULL) {
|
|
|
|
BIO_printf(bio_err, "unable to load CRL\n");
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
goto end;
|
|
|
|
}
|
2012-12-02 16:16:28 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
end:
|
|
|
|
BIO_free(in);
|
|
|
|
return (x);
|
|
|
|
}
|
2012-12-02 16:16:28 +00: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-24 19:26:15 +00:00
|
|
|
EVP_PKEY *load_key(const char *file, int format, int maybe_stdin,
|
2015-01-22 03:40:55 +00:00
|
|
|
const char *pass, ENGINE *e, const char *key_descrip)
|
|
|
|
{
|
|
|
|
BIO *key = NULL;
|
|
|
|
EVP_PKEY *pkey = NULL;
|
|
|
|
PW_CB_DATA cb_data;
|
|
|
|
|
|
|
|
cb_data.password = pass;
|
|
|
|
cb_data.prompt_info = file;
|
|
|
|
|
|
|
|
if (file == NULL && (!maybe_stdin || format == FORMAT_ENGINE)) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "no keyfile specified\n");
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if (format == FORMAT_ENGINE) {
|
2016-02-02 05:37:41 +00:00
|
|
|
if (e == NULL)
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "no engine specified\n");
|
2015-01-22 03:40:55 +00:00
|
|
|
else {
|
2016-02-02 05:37:41 +00:00
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
2015-01-22 03:40:55 +00:00
|
|
|
pkey = ENGINE_load_private_key(e, file, ui_method, &cb_data);
|
2016-02-02 05:37:41 +00:00
|
|
|
if (pkey == NULL) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "cannot load %s from engine\n", key_descrip);
|
|
|
|
ERR_print_errors(bio_err);
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
2016-02-02 05:37:41 +00:00
|
|
|
#else
|
|
|
|
BIO_printf(bio_err, "engines not supported\n");
|
|
|
|
#endif
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if (file == NULL && maybe_stdin) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
unbuffer(stdin);
|
2015-09-06 10:20:12 +00:00
|
|
|
key = dup_bio_in(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-24 19:26:15 +00:00
|
|
|
} else
|
2015-09-04 10:49:06 +00:00
|
|
|
key = bio_open_default(file, 'r', format);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
if (key == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
if (format == FORMAT_ASN1) {
|
|
|
|
pkey = d2i_PrivateKey_bio(key, NULL);
|
|
|
|
} else if (format == FORMAT_PEM) {
|
|
|
|
pkey = PEM_read_bio_PrivateKey(key, NULL,
|
|
|
|
(pem_password_cb *)password_callback,
|
|
|
|
&cb_data);
|
|
|
|
}
|
|
|
|
else if (format == FORMAT_PKCS12) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
if (!load_pkcs12(key, key_descrip,
|
2015-01-22 03:40:55 +00:00
|
|
|
(pem_password_cb *)password_callback, &cb_data,
|
|
|
|
&pkey, NULL, NULL))
|
|
|
|
goto end;
|
|
|
|
}
|
2010-04-06 11:18:59 +00:00
|
|
|
#if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_DSA) && !defined (OPENSSL_NO_RC4)
|
2015-01-22 03:40:55 +00:00
|
|
|
else if (format == FORMAT_MSBLOB)
|
|
|
|
pkey = b2i_PrivateKey_bio(key);
|
|
|
|
else if (format == FORMAT_PVK)
|
|
|
|
pkey = b2i_PVK_bio(key, (pem_password_cb *)password_callback,
|
|
|
|
&cb_data);
|
|
|
|
#endif
|
|
|
|
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-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "bad input format specified for key file\n");
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
}
|
2000-06-22 17:42:50 +00:00
|
|
|
end:
|
2015-05-01 18:37:16 +00:00
|
|
|
BIO_free(key);
|
2015-01-22 03:40:55 +00:00
|
|
|
if (pkey == NULL) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "unable to load %s\n", key_descrip);
|
|
|
|
ERR_print_errors(bio_err);
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
return (pkey);
|
|
|
|
}
|
2000-06-22 17:42:50 +00: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-24 19:26:15 +00:00
|
|
|
EVP_PKEY *load_pubkey(const char *file, int format, int maybe_stdin,
|
2015-01-22 03:40:55 +00:00
|
|
|
const char *pass, ENGINE *e, const char *key_descrip)
|
|
|
|
{
|
|
|
|
BIO *key = NULL;
|
|
|
|
EVP_PKEY *pkey = NULL;
|
|
|
|
PW_CB_DATA cb_data;
|
|
|
|
|
|
|
|
cb_data.password = pass;
|
|
|
|
cb_data.prompt_info = file;
|
|
|
|
|
|
|
|
if (file == NULL && (!maybe_stdin || format == FORMAT_ENGINE)) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "no keyfile specified\n");
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if (format == FORMAT_ENGINE) {
|
2016-02-02 05:37:41 +00:00
|
|
|
if (e == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
BIO_printf(bio_err, "no engine specified\n");
|
2016-02-02 05:37:41 +00:00
|
|
|
else {
|
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
2015-01-22 03:40:55 +00:00
|
|
|
pkey = ENGINE_load_public_key(e, file, ui_method, &cb_data);
|
2016-02-02 05:37:41 +00:00
|
|
|
if (pkey == NULL) {
|
|
|
|
BIO_printf(bio_err, "cannot load %s from engine\n", key_descrip);
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
BIO_printf(bio_err, "engines not supported\n");
|
|
|
|
#endif
|
|
|
|
}
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if (file == NULL && maybe_stdin) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
unbuffer(stdin);
|
2015-09-06 10:20:12 +00:00
|
|
|
key = dup_bio_in(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-24 19:26:15 +00:00
|
|
|
} else
|
2015-09-04 10:49:06 +00:00
|
|
|
key = bio_open_default(file, 'r', format);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
if (key == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
if (format == FORMAT_ASN1) {
|
|
|
|
pkey = d2i_PUBKEY_bio(key, NULL);
|
|
|
|
}
|
|
|
|
else if (format == FORMAT_ASN1RSA) {
|
2016-02-02 05:37:41 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
2015-01-22 03:40:55 +00:00
|
|
|
RSA *rsa;
|
|
|
|
rsa = d2i_RSAPublicKey_bio(key, NULL);
|
|
|
|
if (rsa) {
|
|
|
|
pkey = EVP_PKEY_new();
|
2015-10-30 11:18:04 +00:00
|
|
|
if (pkey != NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
EVP_PKEY_set1_RSA(pkey, rsa);
|
|
|
|
RSA_free(rsa);
|
|
|
|
} else
|
2016-02-02 05:37:41 +00:00
|
|
|
#else
|
|
|
|
BIO_printf(bio_err, "RSA keys not supported\n");
|
|
|
|
#endif
|
2015-01-22 03:40:55 +00:00
|
|
|
pkey = NULL;
|
|
|
|
} else if (format == FORMAT_PEMRSA) {
|
2016-02-02 05:37:41 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
2015-01-22 03:40:55 +00:00
|
|
|
RSA *rsa;
|
|
|
|
rsa = PEM_read_bio_RSAPublicKey(key, NULL,
|
|
|
|
(pem_password_cb *)password_callback,
|
|
|
|
&cb_data);
|
2015-10-30 11:18:04 +00:00
|
|
|
if (rsa != NULL) {
|
2015-01-22 03:40:55 +00:00
|
|
|
pkey = EVP_PKEY_new();
|
2015-10-30 11:18:04 +00:00
|
|
|
if (pkey != NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
EVP_PKEY_set1_RSA(pkey, rsa);
|
|
|
|
RSA_free(rsa);
|
|
|
|
} else
|
2016-02-02 05:37:41 +00:00
|
|
|
#else
|
|
|
|
BIO_printf(bio_err, "RSA keys not supported\n");
|
|
|
|
#endif
|
2015-01-22 03:40:55 +00:00
|
|
|
pkey = NULL;
|
|
|
|
}
|
|
|
|
else if (format == FORMAT_PEM) {
|
|
|
|
pkey = PEM_read_bio_PUBKEY(key, NULL,
|
|
|
|
(pem_password_cb *)password_callback,
|
|
|
|
&cb_data);
|
|
|
|
}
|
2009-04-26 22:18:22 +00:00
|
|
|
#if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_DSA)
|
2015-01-22 03:40:55 +00:00
|
|
|
else if (format == FORMAT_MSBLOB)
|
|
|
|
pkey = b2i_PublicKey_bio(key);
|
2009-04-26 22:18:22 +00:00
|
|
|
#endif
|
2000-09-03 23:13:48 +00:00
|
|
|
end:
|
2015-05-01 18:37:16 +00:00
|
|
|
BIO_free(key);
|
2015-01-22 03:40:55 +00:00
|
|
|
if (pkey == NULL)
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "unable to load %s\n", key_descrip);
|
2015-01-22 03:40:55 +00:00
|
|
|
return (pkey);
|
|
|
|
}
|
2000-09-03 23:13:48 +00: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-24 19:26:15 +00:00
|
|
|
static int load_certs_crls(const char *file, int format,
|
2016-02-14 03:33:56 +00:00
|
|
|
const char *pass, const char *desc,
|
2015-01-22 03:40:55 +00:00
|
|
|
STACK_OF(X509) **pcerts,
|
|
|
|
STACK_OF(X509_CRL) **pcrls)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
BIO *bio;
|
|
|
|
STACK_OF(X509_INFO) *xis = NULL;
|
|
|
|
X509_INFO *xi;
|
|
|
|
PW_CB_DATA cb_data;
|
|
|
|
int rv = 0;
|
|
|
|
|
|
|
|
cb_data.password = pass;
|
|
|
|
cb_data.prompt_info = file;
|
|
|
|
|
|
|
|
if (format != FORMAT_PEM) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "bad input format specified for %s\n", desc);
|
2015-01-22 03:40:55 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-09-04 10:49:06 +00:00
|
|
|
bio = bio_open_default(file, 'r', FORMAT_PEM);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
if (bio == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
xis = PEM_X509_INFO_read_bio(bio, NULL,
|
|
|
|
(pem_password_cb *)password_callback,
|
|
|
|
&cb_data);
|
|
|
|
|
|
|
|
BIO_free(bio);
|
|
|
|
|
2016-01-16 05:08:38 +00:00
|
|
|
if (pcerts && *pcerts == NULL) {
|
2015-01-22 03:40:55 +00:00
|
|
|
*pcerts = sk_X509_new_null();
|
|
|
|
if (!*pcerts)
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
2016-01-16 05:08:38 +00:00
|
|
|
if (pcrls && *pcrls == NULL) {
|
2015-01-22 03:40:55 +00:00
|
|
|
*pcrls = sk_X509_CRL_new_null();
|
|
|
|
if (!*pcrls)
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < sk_X509_INFO_num(xis); i++) {
|
|
|
|
xi = sk_X509_INFO_value(xis, i);
|
|
|
|
if (xi->x509 && pcerts) {
|
|
|
|
if (!sk_X509_push(*pcerts, xi->x509))
|
|
|
|
goto end;
|
|
|
|
xi->x509 = NULL;
|
|
|
|
}
|
|
|
|
if (xi->crl && pcrls) {
|
|
|
|
if (!sk_X509_CRL_push(*pcrls, xi->crl))
|
|
|
|
goto end;
|
|
|
|
xi->crl = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pcerts && sk_X509_num(*pcerts) > 0)
|
|
|
|
rv = 1;
|
|
|
|
|
|
|
|
if (pcrls && sk_X509_CRL_num(*pcrls) > 0)
|
|
|
|
rv = 1;
|
|
|
|
|
|
|
|
end:
|
|
|
|
|
2015-04-30 21:33:59 +00:00
|
|
|
sk_X509_INFO_pop_free(xis, X509_INFO_free);
|
2015-01-22 03:40:55 +00:00
|
|
|
|
|
|
|
if (rv == 0) {
|
|
|
|
if (pcerts) {
|
|
|
|
sk_X509_pop_free(*pcerts, X509_free);
|
|
|
|
*pcerts = NULL;
|
|
|
|
}
|
|
|
|
if (pcrls) {
|
|
|
|
sk_X509_CRL_pop_free(*pcrls, X509_CRL_free);
|
|
|
|
*pcrls = NULL;
|
|
|
|
}
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "unable to load %s\n",
|
2015-01-22 03:40:55 +00:00
|
|
|
pcerts ? "certificates" : "CRLs");
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
ERR_print_errors(bio_err);
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
return rv;
|
|
|
|
}
|
2000-06-22 17:42:50 +00:00
|
|
|
|
2015-04-30 21:48:31 +00:00
|
|
|
void* app_malloc(int sz, const char *what)
|
|
|
|
{
|
|
|
|
void *vp = OPENSSL_malloc(sz);
|
|
|
|
|
|
|
|
if (vp == NULL) {
|
|
|
|
BIO_printf(bio_err, "%s: Could not allocate %d bytes for %s\n",
|
|
|
|
opt_getprog(), sz, what);
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
return vp;
|
|
|
|
}
|
|
|
|
|
2016-01-16 05:08:38 +00:00
|
|
|
/*
|
|
|
|
* Initialize or extend, if *certs != NULL, a certificate stack.
|
|
|
|
*/
|
|
|
|
int load_certs(const char *file, STACK_OF(X509) **certs, int format,
|
2016-02-14 03:33:56 +00:00
|
|
|
const char *pass, const char *desc)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
2016-02-14 03:33:56 +00:00
|
|
|
return load_certs_crls(file, format, pass, desc, certs, NULL);
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
2009-10-31 13:33:57 +00:00
|
|
|
|
2016-01-16 05:08:38 +00:00
|
|
|
/*
|
|
|
|
* Initialize or extend, if *crls != NULL, a certificate stack.
|
|
|
|
*/
|
|
|
|
int load_crls(const char *file, STACK_OF(X509_CRL) **crls, int format,
|
2016-02-14 03:33:56 +00:00
|
|
|
const char *pass, const char *desc)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
2016-02-14 03:33:56 +00:00
|
|
|
return load_certs_crls(file, format, pass, desc, NULL, crls);
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#define X509V3_EXT_UNKNOWN_MASK (0xfL << 16)
|
2000-10-06 11:51:47 +00:00
|
|
|
/* Return error for unknown extensions */
|
2015-01-22 03:40:55 +00:00
|
|
|
#define X509V3_EXT_DEFAULT 0
|
2000-10-06 11:51:47 +00:00
|
|
|
/* Print error for unknown extensions */
|
2015-01-22 03:40:55 +00:00
|
|
|
#define X509V3_EXT_ERROR_UNKNOWN (1L << 16)
|
2000-10-06 11:51:47 +00:00
|
|
|
/* ASN1 parse unknown extensions */
|
2015-01-22 03:40:55 +00:00
|
|
|
#define X509V3_EXT_PARSE_UNKNOWN (2L << 16)
|
2000-10-06 11:51:47 +00:00
|
|
|
/* BIO_dump unknown extensions */
|
2015-01-22 03:40:55 +00:00
|
|
|
#define X509V3_EXT_DUMP_UNKNOWN (3L << 16)
|
2000-10-06 11:51:47 +00:00
|
|
|
|
2001-03-15 19:13:40 +00:00
|
|
|
#define X509_FLAG_CA (X509_FLAG_NO_ISSUER | X509_FLAG_NO_PUBKEY | \
|
2015-01-22 03:40:55 +00:00
|
|
|
X509_FLAG_NO_HEADER | X509_FLAG_NO_VERSION)
|
2001-03-15 19:13:40 +00:00
|
|
|
|
2000-10-06 11:51:47 +00:00
|
|
|
int set_cert_ex(unsigned long *flags, const char *arg)
|
|
|
|
{
|
2015-01-22 03:40:55 +00:00
|
|
|
static const NAME_EX_TBL cert_tbl[] = {
|
|
|
|
{"compatible", X509_FLAG_COMPAT, 0xffffffffl},
|
|
|
|
{"ca_default", X509_FLAG_CA, 0xffffffffl},
|
|
|
|
{"no_header", X509_FLAG_NO_HEADER, 0},
|
|
|
|
{"no_version", X509_FLAG_NO_VERSION, 0},
|
|
|
|
{"no_serial", X509_FLAG_NO_SERIAL, 0},
|
|
|
|
{"no_signame", X509_FLAG_NO_SIGNAME, 0},
|
|
|
|
{"no_validity", X509_FLAG_NO_VALIDITY, 0},
|
|
|
|
{"no_subject", X509_FLAG_NO_SUBJECT, 0},
|
|
|
|
{"no_issuer", X509_FLAG_NO_ISSUER, 0},
|
|
|
|
{"no_pubkey", X509_FLAG_NO_PUBKEY, 0},
|
|
|
|
{"no_extensions", X509_FLAG_NO_EXTENSIONS, 0},
|
|
|
|
{"no_sigdump", X509_FLAG_NO_SIGDUMP, 0},
|
|
|
|
{"no_aux", X509_FLAG_NO_AUX, 0},
|
|
|
|
{"no_attributes", X509_FLAG_NO_ATTRIBUTES, 0},
|
|
|
|
{"ext_default", X509V3_EXT_DEFAULT, X509V3_EXT_UNKNOWN_MASK},
|
|
|
|
{"ext_error", X509V3_EXT_ERROR_UNKNOWN, X509V3_EXT_UNKNOWN_MASK},
|
|
|
|
{"ext_parse", X509V3_EXT_PARSE_UNKNOWN, X509V3_EXT_UNKNOWN_MASK},
|
|
|
|
{"ext_dump", X509V3_EXT_DUMP_UNKNOWN, X509V3_EXT_UNKNOWN_MASK},
|
|
|
|
{NULL, 0, 0}
|
|
|
|
};
|
|
|
|
return set_multi_opts(flags, arg, cert_tbl);
|
2000-10-06 11:51:47 +00:00
|
|
|
}
|
2000-07-28 01:58:15 +00:00
|
|
|
|
|
|
|
int set_name_ex(unsigned long *flags, const char *arg)
|
|
|
|
{
|
2015-01-22 03:40:55 +00:00
|
|
|
static const NAME_EX_TBL ex_tbl[] = {
|
|
|
|
{"esc_2253", ASN1_STRFLGS_ESC_2253, 0},
|
|
|
|
{"esc_ctrl", ASN1_STRFLGS_ESC_CTRL, 0},
|
|
|
|
{"esc_msb", ASN1_STRFLGS_ESC_MSB, 0},
|
|
|
|
{"use_quote", ASN1_STRFLGS_ESC_QUOTE, 0},
|
|
|
|
{"utf8", ASN1_STRFLGS_UTF8_CONVERT, 0},
|
|
|
|
{"ignore_type", ASN1_STRFLGS_IGNORE_TYPE, 0},
|
|
|
|
{"show_type", ASN1_STRFLGS_SHOW_TYPE, 0},
|
|
|
|
{"dump_all", ASN1_STRFLGS_DUMP_ALL, 0},
|
|
|
|
{"dump_nostr", ASN1_STRFLGS_DUMP_UNKNOWN, 0},
|
|
|
|
{"dump_der", ASN1_STRFLGS_DUMP_DER, 0},
|
|
|
|
{"compat", XN_FLAG_COMPAT, 0xffffffffL},
|
|
|
|
{"sep_comma_plus", XN_FLAG_SEP_COMMA_PLUS, XN_FLAG_SEP_MASK},
|
|
|
|
{"sep_comma_plus_space", XN_FLAG_SEP_CPLUS_SPC, XN_FLAG_SEP_MASK},
|
|
|
|
{"sep_semi_plus_space", XN_FLAG_SEP_SPLUS_SPC, XN_FLAG_SEP_MASK},
|
|
|
|
{"sep_multiline", XN_FLAG_SEP_MULTILINE, XN_FLAG_SEP_MASK},
|
|
|
|
{"dn_rev", XN_FLAG_DN_REV, 0},
|
|
|
|
{"nofname", XN_FLAG_FN_NONE, XN_FLAG_FN_MASK},
|
|
|
|
{"sname", XN_FLAG_FN_SN, XN_FLAG_FN_MASK},
|
|
|
|
{"lname", XN_FLAG_FN_LN, XN_FLAG_FN_MASK},
|
|
|
|
{"align", XN_FLAG_FN_ALIGN, 0},
|
|
|
|
{"oid", XN_FLAG_FN_OID, XN_FLAG_FN_MASK},
|
|
|
|
{"space_eq", XN_FLAG_SPC_EQ, 0},
|
|
|
|
{"dump_unknown", XN_FLAG_DUMP_UNKNOWN_FIELDS, 0},
|
|
|
|
{"RFC2253", XN_FLAG_RFC2253, 0xffffffffL},
|
|
|
|
{"oneline", XN_FLAG_ONELINE, 0xffffffffL},
|
|
|
|
{"multiline", XN_FLAG_MULTILINE, 0xffffffffL},
|
|
|
|
{"ca_default", XN_FLAG_MULTILINE, 0xffffffffL},
|
|
|
|
{NULL, 0, 0}
|
|
|
|
};
|
2015-09-11 15:13:52 +00:00
|
|
|
if (set_multi_opts(flags, arg, ex_tbl) == 0)
|
|
|
|
return 0;
|
|
|
|
if ((*flags & XN_FLAG_SEP_MASK) == 0)
|
|
|
|
*flags |= XN_FLAG_SEP_CPLUS_SPC;
|
|
|
|
return 1;
|
2001-03-15 19:13:40 +00:00
|
|
|
}
|
|
|
|
|
2001-03-16 02:04:17 +00:00
|
|
|
int set_ext_copy(int *copy_type, const char *arg)
|
|
|
|
{
|
2015-05-06 18:56:14 +00:00
|
|
|
if (strcasecmp(arg, "none") == 0)
|
2015-01-22 03:40:55 +00:00
|
|
|
*copy_type = EXT_COPY_NONE;
|
2015-05-06 18:56:14 +00:00
|
|
|
else if (strcasecmp(arg, "copy") == 0)
|
2015-01-22 03:40:55 +00:00
|
|
|
*copy_type = EXT_COPY_ADD;
|
2015-05-06 18:56:14 +00:00
|
|
|
else if (strcasecmp(arg, "copyall") == 0)
|
2015-01-22 03:40:55 +00:00
|
|
|
*copy_type = EXT_COPY_ALL;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
return 1;
|
2001-03-16 02:04:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int copy_extensions(X509 *x, X509_REQ *req, int copy_type)
|
|
|
|
{
|
2015-01-22 03:40:55 +00:00
|
|
|
STACK_OF(X509_EXTENSION) *exts = NULL;
|
|
|
|
X509_EXTENSION *ext, *tmpext;
|
|
|
|
ASN1_OBJECT *obj;
|
|
|
|
int i, idx, ret = 0;
|
|
|
|
if (!x || !req || (copy_type == EXT_COPY_NONE))
|
|
|
|
return 1;
|
|
|
|
exts = X509_REQ_get_extensions(req);
|
|
|
|
|
|
|
|
for (i = 0; i < sk_X509_EXTENSION_num(exts); i++) {
|
|
|
|
ext = sk_X509_EXTENSION_value(exts, i);
|
|
|
|
obj = X509_EXTENSION_get_object(ext);
|
|
|
|
idx = X509_get_ext_by_OBJ(x, obj, -1);
|
|
|
|
/* Does extension exist? */
|
|
|
|
if (idx != -1) {
|
|
|
|
/* If normal copy don't override existing extension */
|
|
|
|
if (copy_type == EXT_COPY_ADD)
|
|
|
|
continue;
|
|
|
|
/* Delete all extensions of same type */
|
|
|
|
do {
|
|
|
|
tmpext = X509_get_ext(x, idx);
|
|
|
|
X509_delete_ext(x, idx);
|
|
|
|
X509_EXTENSION_free(tmpext);
|
|
|
|
idx = X509_get_ext_by_OBJ(x, obj, -1);
|
|
|
|
} while (idx != -1);
|
|
|
|
}
|
|
|
|
if (!X509_add_ext(x, ext, -1))
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = 1;
|
|
|
|
|
|
|
|
end:
|
|
|
|
|
|
|
|
sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int set_multi_opts(unsigned long *flags, const char *arg,
|
|
|
|
const NAME_EX_TBL * in_tbl)
|
|
|
|
{
|
|
|
|
STACK_OF(CONF_VALUE) *vals;
|
|
|
|
CONF_VALUE *val;
|
|
|
|
int i, ret = 1;
|
|
|
|
if (!arg)
|
|
|
|
return 0;
|
|
|
|
vals = X509V3_parse_list(arg);
|
|
|
|
for (i = 0; i < sk_CONF_VALUE_num(vals); i++) {
|
|
|
|
val = sk_CONF_VALUE_value(vals, i);
|
|
|
|
if (!set_table_opts(flags, val->name, in_tbl))
|
|
|
|
ret = 0;
|
|
|
|
}
|
|
|
|
sk_CONF_VALUE_pop_free(vals, X509V3_conf_free);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int set_table_opts(unsigned long *flags, const char *arg,
|
|
|
|
const NAME_EX_TBL * in_tbl)
|
|
|
|
{
|
|
|
|
char c;
|
|
|
|
const NAME_EX_TBL *ptbl;
|
|
|
|
c = arg[0];
|
|
|
|
|
|
|
|
if (c == '-') {
|
|
|
|
c = 0;
|
|
|
|
arg++;
|
|
|
|
} else if (c == '+') {
|
|
|
|
c = 1;
|
|
|
|
arg++;
|
|
|
|
} else
|
|
|
|
c = 1;
|
|
|
|
|
|
|
|
for (ptbl = in_tbl; ptbl->name; ptbl++) {
|
2015-05-06 18:56:14 +00:00
|
|
|
if (strcasecmp(arg, ptbl->name) == 0) {
|
2015-01-22 03:40:55 +00:00
|
|
|
*flags &= ~ptbl->mask;
|
|
|
|
if (c)
|
|
|
|
*flags |= ptbl->flag;
|
|
|
|
else
|
|
|
|
*flags &= ~ptbl->flag;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void print_name(BIO *out, const char *title, X509_NAME *nm,
|
|
|
|
unsigned long lflags)
|
|
|
|
{
|
|
|
|
char *buf;
|
|
|
|
char mline = 0;
|
|
|
|
int indent = 0;
|
|
|
|
|
|
|
|
if (title)
|
|
|
|
BIO_puts(out, title);
|
|
|
|
if ((lflags & XN_FLAG_SEP_MASK) == XN_FLAG_SEP_MULTILINE) {
|
|
|
|
mline = 1;
|
|
|
|
indent = 4;
|
|
|
|
}
|
|
|
|
if (lflags == XN_FLAG_COMPAT) {
|
|
|
|
buf = X509_NAME_oneline(nm, 0, 0);
|
|
|
|
BIO_puts(out, buf);
|
|
|
|
BIO_puts(out, "\n");
|
|
|
|
OPENSSL_free(buf);
|
|
|
|
} else {
|
|
|
|
if (mline)
|
|
|
|
BIO_puts(out, "\n");
|
|
|
|
X509_NAME_print_ex(out, nm, indent, lflags);
|
|
|
|
BIO_puts(out, "\n");
|
|
|
|
}
|
2000-07-28 01:58:15 +00: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-24 19:26:15 +00:00
|
|
|
void print_bignum_var(BIO *out, BIGNUM *in, const char *var,
|
|
|
|
int len, unsigned char *buffer)
|
2001-01-17 01:31:34 +00: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-24 19:26:15 +00:00
|
|
|
BIO_printf(out, " static unsigned char %s_%d[] = {", var, len);
|
|
|
|
if (BN_is_zero(in))
|
|
|
|
BIO_printf(out, "\n\t0x00");
|
|
|
|
else {
|
|
|
|
int i, l;
|
|
|
|
|
|
|
|
l = BN_bn2bin(in, buffer);
|
|
|
|
for (i = 0; i < l; i++) {
|
|
|
|
if ((i % 10) == 0)
|
|
|
|
BIO_printf(out, "\n\t");
|
|
|
|
if (i < l - 1)
|
|
|
|
BIO_printf(out, "0x%02X, ", buffer[i]);
|
|
|
|
else
|
|
|
|
BIO_printf(out, "0x%02X", buffer[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
BIO_printf(out, "\n };\n");
|
|
|
|
}
|
|
|
|
void print_array(BIO *out, const char* title, int len, const unsigned char* d)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
BIO_printf(out, "unsigned char %s[%d] = {", title, len);
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
if ((i % 10) == 0)
|
|
|
|
BIO_printf(out, "\n ");
|
|
|
|
if (i < len - 1)
|
|
|
|
BIO_printf(out, "0x%02X, ", d[i]);
|
|
|
|
else
|
|
|
|
BIO_printf(out, "0x%02X", d[i]);
|
|
|
|
}
|
|
|
|
BIO_printf(out, "\n};\n");
|
|
|
|
}
|
|
|
|
|
2015-09-22 15:00:52 +00:00
|
|
|
X509_STORE *setup_verify(char *CAfile, char *CApath, int noCAfile, int noCApath)
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
{
|
|
|
|
X509_STORE *store = X509_STORE_new();
|
2015-01-22 03:40:55 +00:00
|
|
|
X509_LOOKUP *lookup;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
|
2015-10-30 11:18:04 +00:00
|
|
|
if (store == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
2015-09-22 15:00:52 +00:00
|
|
|
|
|
|
|
if(CAfile != NULL || !noCAfile) {
|
|
|
|
lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
|
|
|
|
if (lookup == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
2015-09-22 15:00:52 +00:00
|
|
|
if (CAfile) {
|
|
|
|
if (!X509_LOOKUP_load_file(lookup, CAfile, X509_FILETYPE_PEM)) {
|
|
|
|
BIO_printf(bio_err, "Error loading file %s\n", CAfile);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
X509_LOOKUP_load_file(lookup, NULL, X509_FILETYPE_DEFAULT);
|
|
|
|
}
|
2015-01-22 03:40:55 +00:00
|
|
|
|
2015-09-22 15:00:52 +00:00
|
|
|
if(CApath != NULL || !noCApath) {
|
|
|
|
lookup = X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir());
|
|
|
|
if (lookup == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
2015-09-22 15:00:52 +00:00
|
|
|
if (CApath) {
|
|
|
|
if (!X509_LOOKUP_add_dir(lookup, CApath, X509_FILETYPE_PEM)) {
|
|
|
|
BIO_printf(bio_err, "Error loading directory %s\n", CApath);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
X509_LOOKUP_add_dir(lookup, NULL, X509_FILETYPE_DEFAULT);
|
|
|
|
}
|
2015-01-22 03:40:55 +00:00
|
|
|
|
|
|
|
ERR_clear_error();
|
|
|
|
return store;
|
|
|
|
end:
|
|
|
|
X509_STORE_free(store);
|
|
|
|
return NULL;
|
2001-01-17 01:31:34 +00:00
|
|
|
}
|
2001-06-18 06:22:33 +00:00
|
|
|
|
2003-01-30 17:39:26 +00:00
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
2001-11-15 18:48:42 +00:00
|
|
|
/* Try to load an engine in a shareable library */
|
2016-02-14 03:33:56 +00:00
|
|
|
static ENGINE *try_load_engine(const char *engine)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
ENGINE *e = ENGINE_by_id("dynamic");
|
|
|
|
if (e) {
|
|
|
|
if (!ENGINE_ctrl_cmd_string(e, "SO_PATH", engine, 0)
|
|
|
|
|| !ENGINE_ctrl_cmd_string(e, "LOAD", NULL, 0)) {
|
|
|
|
ENGINE_free(e);
|
|
|
|
e = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return e;
|
|
|
|
}
|
2001-11-15 18:48:42 +00: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-24 19:26:15 +00:00
|
|
|
ENGINE *setup_engine(const char *engine, int debug)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
ENGINE *e = NULL;
|
|
|
|
|
|
|
|
if (engine) {
|
|
|
|
if (strcmp(engine, "auto") == 0) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "enabling auto ENGINE support\n");
|
2015-01-22 03:40:55 +00:00
|
|
|
ENGINE_register_all_complete();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if ((e = ENGINE_by_id(engine)) == NULL
|
2016-02-14 03:33:56 +00:00
|
|
|
&& (e = try_load_engine(engine)) == NULL) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "invalid engine \"%s\"\n", engine);
|
|
|
|
ERR_print_errors(bio_err);
|
2015-01-22 03:40:55 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (debug) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
ENGINE_ctrl(e, ENGINE_CTRL_SET_LOGSTREAM, 0, bio_err, 0);
|
2001-06-18 06:22:33 +00:00
|
|
|
}
|
2015-01-22 03:40:55 +00:00
|
|
|
ENGINE_ctrl_cmd(e, "SET_USER_INTERFACE", 0, ui_method, 0, 1);
|
|
|
|
if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "can't use that engine\n");
|
|
|
|
ERR_print_errors(bio_err);
|
2015-01-22 03:40:55 +00:00
|
|
|
ENGINE_free(e);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "engine \"%s\" set.\n", ENGINE_get_id(e));
|
2015-01-22 03:40:55 +00:00
|
|
|
|
|
|
|
/* Free our "structural" reference. */
|
|
|
|
ENGINE_free(e);
|
|
|
|
}
|
|
|
|
return e;
|
|
|
|
}
|
2003-01-30 17:39:26 +00:00
|
|
|
#endif
|
2002-02-22 14:01:21 +00:00
|
|
|
|
2009-07-27 21:10:00 +00:00
|
|
|
static unsigned long index_serial_hash(const OPENSSL_CSTRING *a)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
const char *n;
|
2003-04-03 16:33:03 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
n = a[DB_serial];
|
|
|
|
while (*n == '0')
|
|
|
|
n++;
|
|
|
|
return (lh_strhash(n));
|
|
|
|
}
|
2003-04-03 16:33:03 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
static int index_serial_cmp(const OPENSSL_CSTRING *a,
|
|
|
|
const OPENSSL_CSTRING *b)
|
|
|
|
{
|
|
|
|
const char *aa, *bb;
|
2003-04-03 16:33:03 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
for (aa = a[DB_serial]; *aa == '0'; aa++) ;
|
|
|
|
for (bb = b[DB_serial]; *bb == '0'; bb++) ;
|
|
|
|
return (strcmp(aa, bb));
|
|
|
|
}
|
2003-04-03 16:33:03 +00:00
|
|
|
|
|
|
|
static int index_name_qual(char **a)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
return (a[0][0] == 'V');
|
|
|
|
}
|
2003-04-03 16:33:03 +00:00
|
|
|
|
2009-07-27 21:10:00 +00:00
|
|
|
static unsigned long index_name_hash(const OPENSSL_CSTRING *a)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
return (lh_strhash(a[DB_name]));
|
|
|
|
}
|
2003-04-03 16:33:03 +00:00
|
|
|
|
2009-07-27 21:10:00 +00:00
|
|
|
int index_name_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
return (strcmp(a[DB_name], b[DB_name]));
|
|
|
|
}
|
2003-04-03 16:33:03 +00:00
|
|
|
|
2009-07-27 21:10:00 +00:00
|
|
|
static IMPLEMENT_LHASH_HASH_FN(index_serial, OPENSSL_CSTRING)
|
|
|
|
static IMPLEMENT_LHASH_COMP_FN(index_serial, OPENSSL_CSTRING)
|
|
|
|
static IMPLEMENT_LHASH_HASH_FN(index_name, OPENSSL_CSTRING)
|
|
|
|
static IMPLEMENT_LHASH_COMP_FN(index_name, OPENSSL_CSTRING)
|
2003-04-03 16:33:03 +00:00
|
|
|
#undef BSIZE
|
|
|
|
#define BSIZE 256
|
|
|
|
BIGNUM *load_serial(char *serialfile, int create, ASN1_INTEGER **retai)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
BIO *in = NULL;
|
|
|
|
BIGNUM *ret = NULL;
|
2015-01-23 16:58:26 +00:00
|
|
|
char buf[1024];
|
2015-01-22 03:40:55 +00:00
|
|
|
ASN1_INTEGER *ai = NULL;
|
|
|
|
|
|
|
|
ai = ASN1_INTEGER_new();
|
|
|
|
if (ai == NULL)
|
|
|
|
goto err;
|
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
in = BIO_new_file(serialfile, "r");
|
|
|
|
if (in == NULL) {
|
2015-01-22 03:40:55 +00:00
|
|
|
if (!create) {
|
|
|
|
perror(serialfile);
|
|
|
|
goto err;
|
|
|
|
}
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
ERR_clear_error();
|
|
|
|
ret = BN_new();
|
|
|
|
if (ret == NULL || !rand_serial(ret, ai))
|
|
|
|
BIO_printf(bio_err, "Out of memory\n");
|
2015-01-22 03:40:55 +00:00
|
|
|
} else {
|
|
|
|
if (!a2i_ASN1_INTEGER(in, ai, buf, 1024)) {
|
|
|
|
BIO_printf(bio_err, "unable to load number from %s\n",
|
|
|
|
serialfile);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
ret = ASN1_INTEGER_to_BN(ai, NULL);
|
|
|
|
if (ret == NULL) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"error converting number from bin to BIGNUM\n");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ret && retai) {
|
|
|
|
*retai = ai;
|
|
|
|
ai = NULL;
|
|
|
|
}
|
2003-04-03 16:33:03 +00:00
|
|
|
err:
|
2015-03-25 15:31:18 +00:00
|
|
|
BIO_free(in);
|
2015-04-30 15:30:03 +00:00
|
|
|
ASN1_INTEGER_free(ai);
|
2015-01-22 03:40:55 +00:00
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
int save_serial(char *serialfile, char *suffix, BIGNUM *serial,
|
|
|
|
ASN1_INTEGER **retai)
|
|
|
|
{
|
|
|
|
char buf[1][BSIZE];
|
|
|
|
BIO *out = NULL;
|
|
|
|
int ret = 0;
|
|
|
|
ASN1_INTEGER *ai = NULL;
|
|
|
|
int j;
|
|
|
|
|
|
|
|
if (suffix == NULL)
|
|
|
|
j = strlen(serialfile);
|
|
|
|
else
|
|
|
|
j = strlen(serialfile) + strlen(suffix) + 1;
|
|
|
|
if (j >= BSIZE) {
|
|
|
|
BIO_printf(bio_err, "file name too long\n");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (suffix == NULL)
|
Rename some BUF_xxx to OPENSSL_xxx
Rename BUF_{strdup,strlcat,strlcpy,memdup,strndup,strnlen}
to OPENSSL_{strdup,strlcat,strlcpy,memdup,strndup,strnlen}
Add #define's for the old names.
Add CRYPTO_{memdup,strndup}, called by OPENSSL_{memdup,strndup} macros.
Reviewed-by: Tim Hudson <tjh@openssl.org>
2015-12-16 21:12:24 +00:00
|
|
|
OPENSSL_strlcpy(buf[0], serialfile, BSIZE);
|
2015-01-22 03:40:55 +00:00
|
|
|
else {
|
2003-04-04 15:10:35 +00:00
|
|
|
#ifndef OPENSSL_SYS_VMS
|
2015-01-22 03:40:55 +00:00
|
|
|
j = BIO_snprintf(buf[0], sizeof buf[0], "%s.%s", serialfile, suffix);
|
2003-04-04 15:10:35 +00:00
|
|
|
#else
|
2015-01-22 03:40:55 +00:00
|
|
|
j = BIO_snprintf(buf[0], sizeof buf[0], "%s-%s", serialfile, suffix);
|
2003-04-04 15:10:35 +00:00
|
|
|
#endif
|
2015-01-22 03:40:55 +00: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-24 19:26:15 +00:00
|
|
|
out = BIO_new_file(buf[0], "w");
|
2015-01-22 03:40:55 +00:00
|
|
|
if (out == NULL) {
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((ai = BN_to_ASN1_INTEGER(serial, NULL)) == NULL) {
|
|
|
|
BIO_printf(bio_err, "error converting serial to ASN.1 format\n");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
i2a_ASN1_INTEGER(out, ai);
|
|
|
|
BIO_puts(out, "\n");
|
|
|
|
ret = 1;
|
|
|
|
if (retai) {
|
|
|
|
*retai = ai;
|
|
|
|
ai = NULL;
|
|
|
|
}
|
|
|
|
err:
|
2015-03-25 15:31:18 +00:00
|
|
|
BIO_free_all(out);
|
2015-04-30 15:30:03 +00:00
|
|
|
ASN1_INTEGER_free(ai);
|
2015-01-22 03:40:55 +00:00
|
|
|
return (ret);
|
|
|
|
}
|
2003-04-03 16:33:03 +00:00
|
|
|
|
2003-04-04 15:10:35 +00:00
|
|
|
int rotate_serial(char *serialfile, char *new_suffix, char *old_suffix)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
char buf[5][BSIZE];
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
i = strlen(serialfile) + strlen(old_suffix);
|
|
|
|
j = strlen(serialfile) + strlen(new_suffix);
|
|
|
|
if (i > j)
|
|
|
|
j = i;
|
|
|
|
if (j + 1 >= BSIZE) {
|
|
|
|
BIO_printf(bio_err, "file name too long\n");
|
|
|
|
goto err;
|
|
|
|
}
|
2003-04-04 15:10:35 +00:00
|
|
|
#ifndef OPENSSL_SYS_VMS
|
2015-01-22 03:40:55 +00:00
|
|
|
j = BIO_snprintf(buf[0], sizeof buf[0], "%s.%s", serialfile, new_suffix);
|
|
|
|
j = BIO_snprintf(buf[1], sizeof buf[1], "%s.%s", serialfile, old_suffix);
|
2003-04-04 15:10:35 +00:00
|
|
|
#else
|
Remove outdated DEBUG flags.
Add -DBIO_DEBUG to --strict-warnings.
Remove comments about outdated debugging ifdef guards.
Remove md_rand ifdef guarding an assert; it doesn't seem used.
Remove the conf guards in conf_api since we use OPENSSL_assert, not assert.
For pkcs12 stuff put OPENSSL_ in front of the macro name.
Merge TLS_DEBUG into SSL_DEBUG.
Various things just turned on/off asserts, mainly for checking non-NULL
arguments, which is now removed: camellia, bn_ctx, crypto/modes.
Remove some old debug code, that basically just printed things to stderr:
DEBUG_PRINT_UNKNOWN_CIPHERSUITES, DEBUG_ZLIB, OPENSSL_RI_DEBUG,
RL_DEBUG, RSA_DEBUG, SCRYPT_DEBUG.
Remove OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL.
Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-02-18 16:33:21 +00:00
|
|
|
j = BIO_snprintf(buf[0], sizeof buf[0], "%s-%s", serialfile, new_suffix);
|
2015-01-22 03:40:55 +00:00
|
|
|
j = BIO_snprintf(buf[1], sizeof buf[1], "%s-%s", serialfile, old_suffix);
|
2005-11-04 16:12:05 +00:00
|
|
|
#endif
|
2015-01-22 03:40:55 +00:00
|
|
|
if (rename(serialfile, buf[1]) < 0 && errno != ENOENT
|
2003-04-04 15:10:35 +00:00
|
|
|
#ifdef ENOTDIR
|
2015-01-22 03:40:55 +00:00
|
|
|
&& errno != ENOTDIR
|
|
|
|
#endif
|
|
|
|
) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"unable to rename %s to %s\n", serialfile, buf[1]);
|
|
|
|
perror("reason");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (rename(buf[0], serialfile) < 0) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"unable to rename %s to %s\n", buf[0], serialfile);
|
|
|
|
perror("reason");
|
|
|
|
rename(buf[1], serialfile);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
return 1;
|
2003-04-04 15:10:35 +00:00
|
|
|
err:
|
2015-01-22 03:40:55 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2003-04-04 15:10:35 +00:00
|
|
|
|
2004-04-20 12:05:26 +00:00
|
|
|
int rand_serial(BIGNUM *b, ASN1_INTEGER *ai)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
BIGNUM *btmp;
|
|
|
|
int ret = 0;
|
2015-05-01 01:37:06 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
if (b)
|
|
|
|
btmp = b;
|
|
|
|
else
|
|
|
|
btmp = BN_new();
|
|
|
|
|
2015-10-30 11:18:04 +00:00
|
|
|
if (btmp == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (!BN_pseudo_rand(btmp, SERIAL_RAND_BITS, 0, 0))
|
|
|
|
goto error;
|
|
|
|
if (ai && !BN_to_ASN1_INTEGER(btmp, ai))
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
ret = 1;
|
|
|
|
|
|
|
|
error:
|
|
|
|
|
2015-05-01 01:37:06 +00:00
|
|
|
if (btmp != b)
|
2015-01-22 03:40:55 +00:00
|
|
|
BN_free(btmp);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2004-04-20 12:05:26 +00:00
|
|
|
|
2003-04-03 16:33:03 +00:00
|
|
|
CA_DB *load_index(char *dbfile, DB_ATTR *db_attr)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
CA_DB *retdb = NULL;
|
|
|
|
TXT_DB *tmpdb = NULL;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO *in;
|
2015-01-22 03:40:55 +00:00
|
|
|
CONF *dbattr_conf = NULL;
|
2015-05-28 17:52:55 +00:00
|
|
|
char buf[BSIZE];
|
2015-01-22 03:40:55 +00: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-24 19:26:15 +00:00
|
|
|
in = BIO_new_file(dbfile, "r");
|
2015-01-22 03:40:55 +00:00
|
|
|
if (in == NULL) {
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if ((tmpdb = TXT_DB_read(in, DB_NUMBER)) == NULL)
|
|
|
|
goto err;
|
2003-04-03 16:33:03 +00:00
|
|
|
|
|
|
|
#ifndef OPENSSL_SYS_VMS
|
2015-05-28 17:52:55 +00:00
|
|
|
BIO_snprintf(buf, sizeof buf, "%s.attr", dbfile);
|
2003-04-03 16:33:03 +00:00
|
|
|
#else
|
2015-05-28 17:52:55 +00:00
|
|
|
BIO_snprintf(buf, sizeof buf, "%s-attr", dbfile);
|
2015-01-22 03:40:55 +00:00
|
|
|
#endif
|
2015-05-28 17:52:55 +00:00
|
|
|
dbattr_conf = app_load_config(buf);
|
2015-01-22 03:40:55 +00:00
|
|
|
|
2015-05-02 03:10:31 +00:00
|
|
|
retdb = app_malloc(sizeof(*retdb), "new DB");
|
2015-01-22 03:40:55 +00:00
|
|
|
retdb->db = tmpdb;
|
|
|
|
tmpdb = NULL;
|
|
|
|
if (db_attr)
|
|
|
|
retdb->attributes = *db_attr;
|
|
|
|
else {
|
|
|
|
retdb->attributes.unique_subject = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dbattr_conf) {
|
|
|
|
char *p = NCONF_get_string(dbattr_conf, NULL, "unique_subject");
|
|
|
|
if (p) {
|
|
|
|
retdb->attributes.unique_subject = parse_yesno(p, 1);
|
|
|
|
}
|
|
|
|
}
|
2003-04-03 16:33:03 +00:00
|
|
|
|
|
|
|
err:
|
2015-05-01 14:15:18 +00:00
|
|
|
NCONF_free(dbattr_conf);
|
2015-04-30 22:10:52 +00:00
|
|
|
TXT_DB_free(tmpdb);
|
2015-03-25 15:31:18 +00:00
|
|
|
BIO_free_all(in);
|
2015-01-22 03:40:55 +00:00
|
|
|
return retdb;
|
|
|
|
}
|
2003-04-03 16:33:03 +00:00
|
|
|
|
|
|
|
int index_index(CA_DB *db)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
if (!TXT_DB_create_index(db->db, DB_serial, NULL,
|
|
|
|
LHASH_HASH_FN(index_serial),
|
|
|
|
LHASH_COMP_FN(index_serial))) {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"error creating serial number index:(%ld,%ld,%ld)\n",
|
|
|
|
db->db->error, db->db->arg1, db->db->arg2);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (db->attributes.unique_subject
|
|
|
|
&& !TXT_DB_create_index(db->db, DB_name, index_name_qual,
|
|
|
|
LHASH_HASH_FN(index_name),
|
|
|
|
LHASH_COMP_FN(index_name))) {
|
|
|
|
BIO_printf(bio_err, "error creating name index:(%ld,%ld,%ld)\n",
|
|
|
|
db->db->error, db->db->arg1, db->db->arg2);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
2003-04-03 16:33:03 +00:00
|
|
|
|
2005-04-05 19:11:19 +00:00
|
|
|
int save_index(const char *dbfile, const char *suffix, CA_DB *db)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
char buf[3][BSIZE];
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO *out;
|
2015-01-22 03:40:55 +00:00
|
|
|
int j;
|
|
|
|
|
|
|
|
j = strlen(dbfile) + strlen(suffix);
|
|
|
|
if (j + 6 >= BSIZE) {
|
|
|
|
BIO_printf(bio_err, "file name too long\n");
|
|
|
|
goto err;
|
|
|
|
}
|
2003-04-03 16:33:03 +00:00
|
|
|
#ifndef OPENSSL_SYS_VMS
|
2015-01-22 03:40:55 +00:00
|
|
|
j = BIO_snprintf(buf[2], sizeof buf[2], "%s.attr", dbfile);
|
|
|
|
j = BIO_snprintf(buf[1], sizeof buf[1], "%s.attr.%s", dbfile, suffix);
|
|
|
|
j = BIO_snprintf(buf[0], sizeof buf[0], "%s.%s", dbfile, suffix);
|
2003-04-03 16:33:03 +00:00
|
|
|
#else
|
Remove outdated DEBUG flags.
Add -DBIO_DEBUG to --strict-warnings.
Remove comments about outdated debugging ifdef guards.
Remove md_rand ifdef guarding an assert; it doesn't seem used.
Remove the conf guards in conf_api since we use OPENSSL_assert, not assert.
For pkcs12 stuff put OPENSSL_ in front of the macro name.
Merge TLS_DEBUG into SSL_DEBUG.
Various things just turned on/off asserts, mainly for checking non-NULL
arguments, which is now removed: camellia, bn_ctx, crypto/modes.
Remove some old debug code, that basically just printed things to stderr:
DEBUG_PRINT_UNKNOWN_CIPHERSUITES, DEBUG_ZLIB, OPENSSL_RI_DEBUG,
RL_DEBUG, RSA_DEBUG, SCRYPT_DEBUG.
Remove OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL.
Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-02-18 16:33:21 +00:00
|
|
|
j = BIO_snprintf(buf[2], sizeof buf[2], "%s-attr", dbfile);
|
|
|
|
j = BIO_snprintf(buf[1], sizeof buf[1], "%s-attr-%s", dbfile, suffix);
|
2015-01-22 03:40:55 +00:00
|
|
|
j = BIO_snprintf(buf[0], sizeof buf[0], "%s-%s", dbfile, suffix);
|
2003-04-03 18:07:39 +00: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-24 19:26:15 +00:00
|
|
|
out = BIO_new_file(buf[0], "w");
|
|
|
|
if (out == NULL) {
|
2015-01-22 03:40:55 +00:00
|
|
|
perror(dbfile);
|
|
|
|
BIO_printf(bio_err, "unable to open '%s'\n", dbfile);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
j = TXT_DB_write(out, db->db);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_free(out);
|
2015-01-22 03:40:55 +00:00
|
|
|
if (j <= 0)
|
|
|
|
goto err;
|
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
out = BIO_new_file(buf[1], "w");
|
|
|
|
if (out == NULL) {
|
2015-01-22 03:40:55 +00:00
|
|
|
perror(buf[2]);
|
|
|
|
BIO_printf(bio_err, "unable to open '%s'\n", buf[2]);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
BIO_printf(out, "unique_subject = %s\n",
|
|
|
|
db->attributes.unique_subject ? "yes" : "no");
|
|
|
|
BIO_free(out);
|
|
|
|
|
|
|
|
return 1;
|
2003-04-03 16:33:03 +00:00
|
|
|
err:
|
2015-01-22 03:40:55 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2003-04-03 16:33:03 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
int rotate_index(const char *dbfile, const char *new_suffix,
|
|
|
|
const char *old_suffix)
|
|
|
|
{
|
|
|
|
char buf[5][BSIZE];
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
i = strlen(dbfile) + strlen(old_suffix);
|
|
|
|
j = strlen(dbfile) + strlen(new_suffix);
|
|
|
|
if (i > j)
|
|
|
|
j = i;
|
|
|
|
if (j + 6 >= BSIZE) {
|
|
|
|
BIO_printf(bio_err, "file name too long\n");
|
|
|
|
goto err;
|
|
|
|
}
|
2003-04-03 16:33:03 +00:00
|
|
|
#ifndef OPENSSL_SYS_VMS
|
2015-01-22 03:40:55 +00:00
|
|
|
j = BIO_snprintf(buf[4], sizeof buf[4], "%s.attr", dbfile);
|
Remove outdated DEBUG flags.
Add -DBIO_DEBUG to --strict-warnings.
Remove comments about outdated debugging ifdef guards.
Remove md_rand ifdef guarding an assert; it doesn't seem used.
Remove the conf guards in conf_api since we use OPENSSL_assert, not assert.
For pkcs12 stuff put OPENSSL_ in front of the macro name.
Merge TLS_DEBUG into SSL_DEBUG.
Various things just turned on/off asserts, mainly for checking non-NULL
arguments, which is now removed: camellia, bn_ctx, crypto/modes.
Remove some old debug code, that basically just printed things to stderr:
DEBUG_PRINT_UNKNOWN_CIPHERSUITES, DEBUG_ZLIB, OPENSSL_RI_DEBUG,
RL_DEBUG, RSA_DEBUG, SCRYPT_DEBUG.
Remove OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL.
Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-02-18 16:33:21 +00:00
|
|
|
j = BIO_snprintf(buf[3], sizeof buf[3], "%s.attr.%s", dbfile, old_suffix);
|
2015-01-22 03:40:55 +00:00
|
|
|
j = BIO_snprintf(buf[2], sizeof buf[2], "%s.attr.%s", dbfile, new_suffix);
|
|
|
|
j = BIO_snprintf(buf[1], sizeof buf[1], "%s.%s", dbfile, old_suffix);
|
Remove outdated DEBUG flags.
Add -DBIO_DEBUG to --strict-warnings.
Remove comments about outdated debugging ifdef guards.
Remove md_rand ifdef guarding an assert; it doesn't seem used.
Remove the conf guards in conf_api since we use OPENSSL_assert, not assert.
For pkcs12 stuff put OPENSSL_ in front of the macro name.
Merge TLS_DEBUG into SSL_DEBUG.
Various things just turned on/off asserts, mainly for checking non-NULL
arguments, which is now removed: camellia, bn_ctx, crypto/modes.
Remove some old debug code, that basically just printed things to stderr:
DEBUG_PRINT_UNKNOWN_CIPHERSUITES, DEBUG_ZLIB, OPENSSL_RI_DEBUG,
RL_DEBUG, RSA_DEBUG, SCRYPT_DEBUG.
Remove OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL.
Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-02-18 16:33:21 +00:00
|
|
|
j = BIO_snprintf(buf[0], sizeof buf[0], "%s.%s", dbfile, new_suffix);
|
2003-04-03 16:33:03 +00:00
|
|
|
#else
|
Remove outdated DEBUG flags.
Add -DBIO_DEBUG to --strict-warnings.
Remove comments about outdated debugging ifdef guards.
Remove md_rand ifdef guarding an assert; it doesn't seem used.
Remove the conf guards in conf_api since we use OPENSSL_assert, not assert.
For pkcs12 stuff put OPENSSL_ in front of the macro name.
Merge TLS_DEBUG into SSL_DEBUG.
Various things just turned on/off asserts, mainly for checking non-NULL
arguments, which is now removed: camellia, bn_ctx, crypto/modes.
Remove some old debug code, that basically just printed things to stderr:
DEBUG_PRINT_UNKNOWN_CIPHERSUITES, DEBUG_ZLIB, OPENSSL_RI_DEBUG,
RL_DEBUG, RSA_DEBUG, SCRYPT_DEBUG.
Remove OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL.
Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-02-18 16:33:21 +00:00
|
|
|
j = BIO_snprintf(buf[4], sizeof buf[4], "%s-attr", dbfile);
|
2015-01-22 03:40:55 +00:00
|
|
|
j = BIO_snprintf(buf[3], sizeof buf[3], "%s-attr-%s", dbfile, old_suffix);
|
Remove outdated DEBUG flags.
Add -DBIO_DEBUG to --strict-warnings.
Remove comments about outdated debugging ifdef guards.
Remove md_rand ifdef guarding an assert; it doesn't seem used.
Remove the conf guards in conf_api since we use OPENSSL_assert, not assert.
For pkcs12 stuff put OPENSSL_ in front of the macro name.
Merge TLS_DEBUG into SSL_DEBUG.
Various things just turned on/off asserts, mainly for checking non-NULL
arguments, which is now removed: camellia, bn_ctx, crypto/modes.
Remove some old debug code, that basically just printed things to stderr:
DEBUG_PRINT_UNKNOWN_CIPHERSUITES, DEBUG_ZLIB, OPENSSL_RI_DEBUG,
RL_DEBUG, RSA_DEBUG, SCRYPT_DEBUG.
Remove OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL.
Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-02-18 16:33:21 +00:00
|
|
|
j = BIO_snprintf(buf[2], sizeof buf[2], "%s-attr-%s", dbfile, new_suffix);
|
|
|
|
j = BIO_snprintf(buf[1], sizeof buf[1], "%s-%s", dbfile, old_suffix);
|
|
|
|
j = BIO_snprintf(buf[0], sizeof buf[0], "%s-%s", dbfile, new_suffix);
|
2003-04-03 18:07:39 +00:00
|
|
|
#endif
|
2015-01-22 03:40:55 +00:00
|
|
|
if (rename(dbfile, buf[1]) < 0 && errno != ENOENT
|
2005-11-04 16:12:05 +00:00
|
|
|
#ifdef ENOTDIR
|
2015-01-22 03:40:55 +00:00
|
|
|
&& errno != ENOTDIR
|
2005-11-04 16:12:05 +00:00
|
|
|
#endif
|
2015-01-22 03:40:55 +00:00
|
|
|
) {
|
|
|
|
BIO_printf(bio_err, "unable to rename %s to %s\n", dbfile, buf[1]);
|
|
|
|
perror("reason");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (rename(buf[0], dbfile) < 0) {
|
|
|
|
BIO_printf(bio_err, "unable to rename %s to %s\n", buf[0], dbfile);
|
|
|
|
perror("reason");
|
|
|
|
rename(buf[1], dbfile);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (rename(buf[4], buf[3]) < 0 && errno != ENOENT
|
2005-11-04 16:12:05 +00:00
|
|
|
#ifdef ENOTDIR
|
2015-01-22 03:40:55 +00:00
|
|
|
&& errno != ENOTDIR
|
|
|
|
#endif
|
|
|
|
) {
|
|
|
|
BIO_printf(bio_err, "unable to rename %s to %s\n", buf[4], buf[3]);
|
|
|
|
perror("reason");
|
|
|
|
rename(dbfile, buf[0]);
|
|
|
|
rename(buf[1], dbfile);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (rename(buf[2], buf[4]) < 0) {
|
|
|
|
BIO_printf(bio_err, "unable to rename %s to %s\n", buf[2], buf[4]);
|
|
|
|
perror("reason");
|
|
|
|
rename(buf[3], buf[4]);
|
|
|
|
rename(dbfile, buf[0]);
|
|
|
|
rename(buf[1], dbfile);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
return 1;
|
2003-04-03 16:33:03 +00:00
|
|
|
err:
|
2015-01-22 03:40:55 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2003-04-03 16:33:03 +00:00
|
|
|
|
|
|
|
void free_index(CA_DB *db)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
if (db) {
|
2015-04-30 22:10:52 +00:00
|
|
|
TXT_DB_free(db->db);
|
2015-01-22 03:40:55 +00:00
|
|
|
OPENSSL_free(db);
|
|
|
|
}
|
|
|
|
}
|
2003-11-28 14:07:14 +00:00
|
|
|
|
2005-04-15 18:29:33 +00:00
|
|
|
int parse_yesno(const char *str, int def)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
if (str) {
|
|
|
|
switch (*str) {
|
|
|
|
case 'f': /* false */
|
|
|
|
case 'F': /* FALSE */
|
|
|
|
case 'n': /* no */
|
|
|
|
case 'N': /* NO */
|
|
|
|
case '0': /* 0 */
|
2015-04-27 01:28:38 +00:00
|
|
|
return 0;
|
2015-01-22 03:40:55 +00:00
|
|
|
case 't': /* true */
|
|
|
|
case 'T': /* TRUE */
|
|
|
|
case 'y': /* yes */
|
|
|
|
case 'Y': /* YES */
|
|
|
|
case '1': /* 1 */
|
2015-04-27 01:28:38 +00:00
|
|
|
return 1;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
}
|
2015-04-27 01:28:38 +00:00
|
|
|
return def;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
2003-11-28 14:45:09 +00:00
|
|
|
|
2003-11-28 14:07:14 +00:00
|
|
|
/*
|
2015-04-29 18:50:00 +00:00
|
|
|
* name is expected to be in the format /type0=value0/type1=value1/type2=...
|
2003-11-28 14:07:14 +00:00
|
|
|
* where characters may be escaped by \
|
|
|
|
*/
|
2015-04-29 18:50:00 +00:00
|
|
|
X509_NAME *parse_name(const char *cp, long chtype, int canmulti)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
2015-04-29 18:50:00 +00:00
|
|
|
int nextismulti = 0;
|
|
|
|
char *work;
|
|
|
|
X509_NAME *n;
|
2015-01-22 03:40:55 +00:00
|
|
|
|
2015-04-29 18:50:00 +00:00
|
|
|
if (*cp++ != '/')
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
n = X509_NAME_new();
|
|
|
|
if (n == NULL)
|
|
|
|
return NULL;
|
2015-04-30 08:43:11 +00:00
|
|
|
work = OPENSSL_strdup(cp);
|
2015-04-29 18:50:00 +00:00
|
|
|
if (work == NULL)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
while (*cp) {
|
|
|
|
char *bp = work;
|
|
|
|
char *typestr = bp;
|
|
|
|
unsigned char *valstr;
|
|
|
|
int nid;
|
|
|
|
int ismulti = nextismulti;
|
|
|
|
nextismulti = 0;
|
|
|
|
|
|
|
|
/* Collect the type */
|
|
|
|
while (*cp && *cp != '=')
|
|
|
|
*bp++ = *cp++;
|
|
|
|
if (*cp == '\0') {
|
2015-01-22 03:40:55 +00:00
|
|
|
BIO_printf(bio_err,
|
2015-04-29 18:50:00 +00:00
|
|
|
"%s: Hit end of string before finding the equals.\n",
|
|
|
|
opt_getprog());
|
|
|
|
goto err;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
2015-04-29 18:50:00 +00:00
|
|
|
*bp++ = '\0';
|
|
|
|
++cp;
|
|
|
|
|
|
|
|
/* Collect the value. */
|
|
|
|
valstr = (unsigned char *)bp;
|
|
|
|
for (; *cp && *cp != '/'; *bp++ = *cp++) {
|
|
|
|
if (canmulti && *cp == '+') {
|
|
|
|
nextismulti = 1;
|
2015-01-22 03:40:55 +00:00
|
|
|
break;
|
2015-04-29 18:50:00 +00:00
|
|
|
}
|
|
|
|
if (*cp == '\\' && *++cp == '\0') {
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"%s: escape character at end of string\n",
|
|
|
|
opt_getprog());
|
|
|
|
goto err;
|
|
|
|
}
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
*bp++ = '\0';
|
|
|
|
|
2015-04-29 18:50:00 +00:00
|
|
|
/* If not at EOS (must be + or /), move forward. */
|
|
|
|
if (*cp)
|
|
|
|
++cp;
|
2015-01-22 03:40:55 +00:00
|
|
|
|
2015-04-29 18:50:00 +00:00
|
|
|
/* Parse */
|
|
|
|
nid = OBJ_txt2nid(typestr);
|
|
|
|
if (nid == NID_undef) {
|
|
|
|
BIO_printf(bio_err, "%s: Skipping unknown attribute \"%s\"\n",
|
|
|
|
opt_getprog(), typestr);
|
2015-01-22 03:40:55 +00:00
|
|
|
continue;
|
|
|
|
}
|
2015-04-29 18:50:00 +00:00
|
|
|
if (!X509_NAME_add_entry_by_NID(n, nid, chtype,
|
|
|
|
valstr, strlen((char *)valstr),
|
|
|
|
-1, ismulti ? -1 : 0))
|
|
|
|
goto err;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
|
2015-04-30 08:43:11 +00:00
|
|
|
OPENSSL_free(work);
|
2015-01-22 03:40:55 +00:00
|
|
|
return n;
|
|
|
|
|
2015-04-29 18:50:00 +00:00
|
|
|
err:
|
2015-01-22 03:40:55 +00:00
|
|
|
X509_NAME_free(n);
|
2015-04-30 08:43:11 +00:00
|
|
|
OPENSSL_free(work);
|
2015-01-22 03:40:55 +00:00
|
|
|
return NULL;
|
2003-11-28 14:07:14 +00:00
|
|
|
}
|
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/*
|
|
|
|
* Read whole contents of a BIO into an allocated memory buffer and return
|
|
|
|
* it.
|
2006-04-08 22:25:47 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
int bio_to_mem(unsigned char **out, int maxlen, BIO *in)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
BIO *mem;
|
|
|
|
int len, ret;
|
|
|
|
unsigned char tbuf[1024];
|
|
|
|
mem = BIO_new(BIO_s_mem());
|
2015-10-30 11:18:04 +00:00
|
|
|
if (mem == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
return -1;
|
|
|
|
for (;;) {
|
|
|
|
if ((maxlen != -1) && maxlen < 1024)
|
|
|
|
len = maxlen;
|
|
|
|
else
|
|
|
|
len = 1024;
|
|
|
|
len = BIO_read(in, tbuf, len);
|
2016-02-02 05:37:41 +00:00
|
|
|
if (len < 0) {
|
|
|
|
BIO_free(mem);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (len == 0)
|
2015-01-22 03:40:55 +00:00
|
|
|
break;
|
|
|
|
if (BIO_write(mem, tbuf, len) != len) {
|
|
|
|
BIO_free(mem);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
maxlen -= len;
|
|
|
|
|
|
|
|
if (maxlen == 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
ret = BIO_get_mem_data(mem, (char **)out);
|
|
|
|
BIO_set_flags(mem, BIO_FLAGS_MEM_RDONLY);
|
|
|
|
BIO_free(mem);
|
|
|
|
return ret;
|
|
|
|
}
|
2006-04-08 22:25:47 +00:00
|
|
|
|
2016-02-02 05:37:41 +00:00
|
|
|
int pkey_ctrl_string(EVP_PKEY_CTX *ctx, const char *value)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
int rv;
|
|
|
|
char *stmp, *vtmp = NULL;
|
Rename some BUF_xxx to OPENSSL_xxx
Rename BUF_{strdup,strlcat,strlcpy,memdup,strndup,strnlen}
to OPENSSL_{strdup,strlcat,strlcpy,memdup,strndup,strnlen}
Add #define's for the old names.
Add CRYPTO_{memdup,strndup}, called by OPENSSL_{memdup,strndup} macros.
Reviewed-by: Tim Hudson <tjh@openssl.org>
2015-12-16 21:12:24 +00:00
|
|
|
stmp = OPENSSL_strdup(value);
|
2015-01-22 03:40:55 +00:00
|
|
|
if (!stmp)
|
|
|
|
return -1;
|
|
|
|
vtmp = strchr(stmp, ':');
|
|
|
|
if (vtmp) {
|
|
|
|
*vtmp = 0;
|
|
|
|
vtmp++;
|
|
|
|
}
|
|
|
|
rv = EVP_PKEY_CTX_ctrl_str(ctx, stmp, vtmp);
|
|
|
|
OPENSSL_free(stmp);
|
|
|
|
return rv;
|
|
|
|
}
|
2006-04-09 00:34:00 +00:00
|
|
|
|
2015-04-29 15:27:08 +00:00
|
|
|
static void nodes_print(const char *name, STACK_OF(X509_POLICY_NODE) *nodes)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
X509_POLICY_NODE *node;
|
|
|
|
int i;
|
2015-04-29 15:27:08 +00:00
|
|
|
|
|
|
|
BIO_printf(bio_err, "%s Policies:", name);
|
2015-01-22 03:40:55 +00:00
|
|
|
if (nodes) {
|
2015-04-29 15:27:08 +00:00
|
|
|
BIO_puts(bio_err, "\n");
|
2015-01-22 03:40:55 +00:00
|
|
|
for (i = 0; i < sk_X509_POLICY_NODE_num(nodes); i++) {
|
|
|
|
node = sk_X509_POLICY_NODE_value(nodes, i);
|
2015-04-29 15:27:08 +00:00
|
|
|
X509_POLICY_NODE_print(bio_err, node, 2);
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
} else
|
2015-04-29 15:27:08 +00:00
|
|
|
BIO_puts(bio_err, " <empty>\n");
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
2004-09-07 18:38:46 +00:00
|
|
|
|
2015-04-29 15:27:08 +00:00
|
|
|
void policies_print(X509_STORE_CTX *ctx)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
X509_POLICY_TREE *tree;
|
|
|
|
int explicit_policy;
|
|
|
|
tree = X509_STORE_CTX_get0_policy_tree(ctx);
|
|
|
|
explicit_policy = X509_STORE_CTX_get_explicit_policy(ctx);
|
|
|
|
|
2015-04-29 15:27:08 +00:00
|
|
|
BIO_printf(bio_err, "Require explicit Policy: %s\n",
|
2015-01-22 03:40:55 +00:00
|
|
|
explicit_policy ? "True" : "False");
|
|
|
|
|
2015-04-29 15:27:08 +00:00
|
|
|
nodes_print("Authority", X509_policy_tree_get0_policies(tree));
|
|
|
|
nodes_print("User", X509_policy_tree_get0_user_policies(tree));
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
2005-11-04 09:30:55 +00:00
|
|
|
|
2015-01-05 00:34:00 +00:00
|
|
|
/*-
|
|
|
|
* next_protos_parse parses a comma separated list of strings into a string
|
2012-06-03 22:00:21 +00:00
|
|
|
* in a format suitable for passing to SSL_CTX_set_next_protos_advertised.
|
|
|
|
* outlen: (output) set to the length of the resulting buffer on success.
|
|
|
|
* err: (maybe NULL) on failure, an error message line is written to this BIO.
|
|
|
|
* in: a NUL termianted string like "abc,def,ghi"
|
|
|
|
*
|
|
|
|
* returns: a malloced buffer or NULL on failure.
|
|
|
|
*/
|
|
|
|
unsigned char *next_protos_parse(unsigned short *outlen, const char *in)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
size_t len;
|
|
|
|
unsigned char *out;
|
|
|
|
size_t i, start = 0;
|
|
|
|
|
|
|
|
len = strlen(in);
|
|
|
|
if (len >= 65535)
|
|
|
|
return NULL;
|
|
|
|
|
2015-04-30 21:48:31 +00:00
|
|
|
out = app_malloc(strlen(in) + 1, "NPN buffer");
|
2015-01-22 03:40:55 +00:00
|
|
|
for (i = 0; i <= len; ++i) {
|
|
|
|
if (i == len || in[i] == ',') {
|
|
|
|
if (i - start > 255) {
|
|
|
|
OPENSSL_free(out);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
out[start] = i - start;
|
|
|
|
start = i + 1;
|
|
|
|
} else
|
|
|
|
out[i + 1] = in[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
*outlen = len + 1;
|
|
|
|
return out;
|
|
|
|
}
|
2012-06-03 22:00:21 +00:00
|
|
|
|
2012-10-08 15:10:07 +00:00
|
|
|
void print_cert_checks(BIO *bio, X509 *x,
|
2015-01-22 03:40:55 +00:00
|
|
|
const char *checkhost,
|
|
|
|
const char *checkemail, const char *checkip)
|
|
|
|
{
|
|
|
|
if (x == NULL)
|
|
|
|
return;
|
|
|
|
if (checkhost) {
|
|
|
|
BIO_printf(bio, "Hostname %s does%s match certificate\n",
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
checkhost,
|
|
|
|
X509_check_host(x, checkhost, 0, 0, NULL) == 1
|
|
|
|
? "" : " NOT");
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (checkemail) {
|
|
|
|
BIO_printf(bio, "Email %s does%s match certificate\n",
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
checkemail, X509_check_email(x, checkemail, 0, 0)
|
|
|
|
? "" : " NOT");
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (checkip) {
|
|
|
|
BIO_printf(bio, "IP %s does%s match certificate\n",
|
|
|
|
checkip, X509_check_ip_asc(x, checkip, 0) ? "" : " NOT");
|
|
|
|
}
|
|
|
|
}
|
2012-10-08 15:10:07 +00:00
|
|
|
|
2012-12-06 18:43:40 +00:00
|
|
|
/* Get first http URL from a DIST_POINT structure */
|
|
|
|
|
|
|
|
static const char *get_dp_url(DIST_POINT *dp)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
GENERAL_NAMES *gens;
|
|
|
|
GENERAL_NAME *gen;
|
|
|
|
int i, gtype;
|
|
|
|
ASN1_STRING *uri;
|
|
|
|
if (!dp->distpoint || dp->distpoint->type != 0)
|
|
|
|
return NULL;
|
|
|
|
gens = dp->distpoint->name.fullname;
|
|
|
|
for (i = 0; i < sk_GENERAL_NAME_num(gens); i++) {
|
|
|
|
gen = sk_GENERAL_NAME_value(gens, i);
|
|
|
|
uri = GENERAL_NAME_get0_value(gen, >ype);
|
|
|
|
if (gtype == GEN_URI && ASN1_STRING_length(uri) > 6) {
|
|
|
|
char *uptr = (char *)ASN1_STRING_data(uri);
|
2015-05-06 18:56:14 +00:00
|
|
|
if (strncmp(uptr, "http://", 7) == 0)
|
2015-01-22 03:40:55 +00:00
|
|
|
return uptr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Look through a CRLDP structure and attempt to find an http URL to
|
|
|
|
* downloads a CRL from.
|
2012-12-06 18:43:40 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
static X509_CRL *load_crl_crldp(STACK_OF(DIST_POINT) *crldp)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
const char *urlptr = NULL;
|
|
|
|
for (i = 0; i < sk_DIST_POINT_num(crldp); i++) {
|
|
|
|
DIST_POINT *dp = sk_DIST_POINT_value(crldp, i);
|
|
|
|
urlptr = get_dp_url(dp);
|
|
|
|
if (urlptr)
|
|
|
|
return load_crl(urlptr, FORMAT_HTTP);
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Example of downloading CRLs from CRLDP: not usable for real world as it
|
|
|
|
* always downloads, doesn't support non-blocking I/O and doesn't cache
|
|
|
|
* anything.
|
2012-12-06 18:43:40 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
static STACK_OF(X509_CRL) *crls_http_cb(X509_STORE_CTX *ctx, X509_NAME *nm)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
X509 *x;
|
|
|
|
STACK_OF(X509_CRL) *crls = NULL;
|
|
|
|
X509_CRL *crl;
|
|
|
|
STACK_OF(DIST_POINT) *crldp;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
|
|
|
|
crls = sk_X509_CRL_new_null();
|
|
|
|
if (!crls)
|
|
|
|
return NULL;
|
2015-01-22 03:40:55 +00:00
|
|
|
x = X509_STORE_CTX_get_current_cert(ctx);
|
|
|
|
crldp = X509_get_ext_d2i(x, NID_crl_distribution_points, NULL, NULL);
|
|
|
|
crl = load_crl_crldp(crldp);
|
|
|
|
sk_DIST_POINT_pop_free(crldp, DIST_POINT_free);
|
|
|
|
if (!crl)
|
|
|
|
return NULL;
|
|
|
|
sk_X509_CRL_push(crls, crl);
|
|
|
|
/* Try to download delta CRL */
|
|
|
|
crldp = X509_get_ext_d2i(x, NID_freshest_crl, NULL, NULL);
|
|
|
|
crl = load_crl_crldp(crldp);
|
|
|
|
sk_DIST_POINT_pop_free(crldp, DIST_POINT_free);
|
|
|
|
if (crl)
|
|
|
|
sk_X509_CRL_push(crls, crl);
|
|
|
|
return crls;
|
|
|
|
}
|
2012-12-06 18:43:40 +00:00
|
|
|
|
|
|
|
void store_setup_crl_download(X509_STORE *st)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
X509_STORE_set_lookup_crls_cb(st, crls_http_cb);
|
|
|
|
}
|
2012-12-06 18:43:40 +00:00
|
|
|
|
2005-11-06 11:40:59 +00:00
|
|
|
/*
|
|
|
|
* Platform-specific sections
|
|
|
|
*/
|
2005-11-04 09:30:55 +00:00
|
|
|
#if defined(_WIN32)
|
2005-11-04 16:12:05 +00:00
|
|
|
# ifdef fileno
|
|
|
|
# undef fileno
|
|
|
|
# define fileno(a) (int)_fileno(a)
|
|
|
|
# endif
|
|
|
|
|
|
|
|
# include <windows.h>
|
|
|
|
# include <tchar.h>
|
|
|
|
|
|
|
|
static int WIN32_rename(const char *from, const char *to)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
TCHAR *tfrom = NULL, *tto;
|
|
|
|
DWORD err;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (sizeof(TCHAR) == 1) {
|
|
|
|
tfrom = (TCHAR *)from;
|
|
|
|
tto = (TCHAR *)to;
|
|
|
|
} else { /* UNICODE path */
|
|
|
|
|
|
|
|
size_t i, flen = strlen(from) + 1, tlen = strlen(to) + 1;
|
2015-05-05 21:09:01 +00:00
|
|
|
tfrom = malloc(sizeof(*tfrom) * (flen + tlen));
|
2015-01-22 03:40:55 +00:00
|
|
|
if (tfrom == NULL)
|
|
|
|
goto err;
|
|
|
|
tto = tfrom + flen;
|
|
|
|
# if !defined(_WIN32_WCE) || _WIN32_WCE>=101
|
|
|
|
if (!MultiByteToWideChar(CP_ACP, 0, from, flen, (WCHAR *)tfrom, flen))
|
|
|
|
# endif
|
|
|
|
for (i = 0; i < flen; i++)
|
|
|
|
tfrom[i] = (TCHAR)from[i];
|
|
|
|
# if !defined(_WIN32_WCE) || _WIN32_WCE>=101
|
|
|
|
if (!MultiByteToWideChar(CP_ACP, 0, to, tlen, (WCHAR *)tto, tlen))
|
|
|
|
# endif
|
|
|
|
for (i = 0; i < tlen; i++)
|
|
|
|
tto[i] = (TCHAR)to[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
if (MoveFile(tfrom, tto))
|
|
|
|
goto ok;
|
|
|
|
err = GetLastError();
|
|
|
|
if (err == ERROR_ALREADY_EXISTS || err == ERROR_FILE_EXISTS) {
|
|
|
|
if (DeleteFile(tto) && MoveFile(tfrom, tto))
|
|
|
|
goto ok;
|
|
|
|
err = GetLastError();
|
|
|
|
}
|
|
|
|
if (err == ERROR_FILE_NOT_FOUND || err == ERROR_PATH_NOT_FOUND)
|
|
|
|
errno = ENOENT;
|
|
|
|
else if (err == ERROR_ACCESS_DENIED)
|
|
|
|
errno = EACCES;
|
|
|
|
else
|
|
|
|
errno = EINVAL; /* we could map more codes... */
|
|
|
|
err:
|
|
|
|
ret = -1;
|
|
|
|
ok:
|
|
|
|
if (tfrom != NULL && tfrom != (TCHAR *)from)
|
|
|
|
free(tfrom);
|
|
|
|
return ret;
|
|
|
|
}
|
2005-11-06 11:40:59 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/* app_tminterval section */
|
|
|
|
#if defined(_WIN32)
|
2015-01-22 03:40:55 +00:00
|
|
|
double app_tminterval(int stop, int usertime)
|
|
|
|
{
|
|
|
|
FILETIME now;
|
|
|
|
double ret = 0;
|
|
|
|
static ULARGE_INTEGER tmstart;
|
|
|
|
static int warning = 1;
|
|
|
|
# ifdef _WIN32_WINNT
|
|
|
|
static HANDLE proc = NULL;
|
|
|
|
|
|
|
|
if (proc == NULL) {
|
|
|
|
if (check_winnt())
|
|
|
|
proc = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE,
|
|
|
|
GetCurrentProcessId());
|
|
|
|
if (proc == NULL)
|
|
|
|
proc = (HANDLE) - 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (usertime && proc != (HANDLE) - 1) {
|
|
|
|
FILETIME junk;
|
|
|
|
GetProcessTimes(proc, &junk, &junk, &junk, &now);
|
|
|
|
} else
|
|
|
|
# endif
|
|
|
|
{
|
|
|
|
SYSTEMTIME systime;
|
2005-11-06 17:11:04 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
if (usertime && warning) {
|
|
|
|
BIO_printf(bio_err, "To get meaningful results, run "
|
|
|
|
"this program on idle system.\n");
|
|
|
|
warning = 0;
|
|
|
|
}
|
|
|
|
GetSystemTime(&systime);
|
|
|
|
SystemTimeToFileTime(&systime, &now);
|
|
|
|
}
|
2005-11-06 17:11:04 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
if (stop == TM_START) {
|
|
|
|
tmstart.u.LowPart = now.dwLowDateTime;
|
|
|
|
tmstart.u.HighPart = now.dwHighDateTime;
|
|
|
|
} else {
|
|
|
|
ULARGE_INTEGER tmstop;
|
2005-11-06 17:11:04 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
tmstop.u.LowPart = now.dwLowDateTime;
|
|
|
|
tmstop.u.HighPart = now.dwHighDateTime;
|
2005-11-06 17:11:04 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
ret = (__int64)(tmstop.QuadPart - tmstart.QuadPart) * 1e-7;
|
|
|
|
}
|
2005-11-06 17:11:04 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
#elif defined(OPENSSL_SYS_NETWARE)
|
|
|
|
# include <time.h>
|
2005-11-06 16:16:38 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
double app_tminterval(int stop, int usertime)
|
|
|
|
{
|
|
|
|
static clock_t tmstart;
|
|
|
|
static int warning = 1;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
double ret = 0;
|
2015-01-22 03:40:55 +00:00
|
|
|
|
|
|
|
if (usertime && warning) {
|
|
|
|
BIO_printf(bio_err, "To get meaningful results, run "
|
|
|
|
"this program on idle system.\n");
|
|
|
|
warning = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (stop == TM_START)
|
|
|
|
tmstart = clock();
|
|
|
|
else
|
|
|
|
ret = (clock() - tmstart) / (double)CLOCKS_PER_SEC;
|
|
|
|
|
|
|
|
return (ret);
|
|
|
|
}
|
2005-11-06 11:40:59 +00: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-24 19:26:15 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
#elif defined(OPENSSL_SYSTEM_VXWORKS)
|
|
|
|
# include <time.h>
|
2005-11-06 11:40:59 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
double app_tminterval(int stop, int usertime)
|
|
|
|
{
|
|
|
|
double ret = 0;
|
|
|
|
# ifdef CLOCK_REALTIME
|
|
|
|
static struct timespec tmstart;
|
|
|
|
struct timespec now;
|
|
|
|
# else
|
|
|
|
static unsigned long tmstart;
|
|
|
|
unsigned long now;
|
|
|
|
# endif
|
|
|
|
static int warning = 1;
|
|
|
|
|
|
|
|
if (usertime && warning) {
|
|
|
|
BIO_printf(bio_err, "To get meaningful results, run "
|
|
|
|
"this program on idle system.\n");
|
|
|
|
warning = 0;
|
|
|
|
}
|
|
|
|
# ifdef CLOCK_REALTIME
|
|
|
|
clock_gettime(CLOCK_REALTIME, &now);
|
|
|
|
if (stop == TM_START)
|
|
|
|
tmstart = now;
|
|
|
|
else
|
|
|
|
ret = ((now.tv_sec + now.tv_nsec * 1e-9)
|
|
|
|
- (tmstart.tv_sec + tmstart.tv_nsec * 1e-9));
|
|
|
|
# else
|
|
|
|
now = tickGet();
|
|
|
|
if (stop == TM_START)
|
|
|
|
tmstart = now;
|
|
|
|
else
|
|
|
|
ret = (now - tmstart) / (double)sysClkRateGet();
|
|
|
|
# endif
|
|
|
|
return (ret);
|
|
|
|
}
|
2005-11-06 11:40:59 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
#elif defined(OPENSSL_SYSTEM_VMS)
|
|
|
|
# include <time.h>
|
|
|
|
# include <times.h>
|
2005-11-06 11:40:59 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
double app_tminterval(int stop, int usertime)
|
|
|
|
{
|
|
|
|
static clock_t tmstart;
|
|
|
|
double ret = 0;
|
|
|
|
clock_t now;
|
|
|
|
# ifdef __TMS
|
|
|
|
struct tms rus;
|
|
|
|
|
|
|
|
now = times(&rus);
|
|
|
|
if (usertime)
|
|
|
|
now = rus.tms_utime;
|
|
|
|
# else
|
|
|
|
if (usertime)
|
|
|
|
now = clock(); /* sum of user and kernel times */
|
|
|
|
else {
|
|
|
|
struct timeval tv;
|
|
|
|
gettimeofday(&tv, NULL);
|
|
|
|
now = (clock_t)((unsigned long long)tv.tv_sec * CLK_TCK +
|
|
|
|
(unsigned long long)tv.tv_usec * (1000000 / CLK_TCK)
|
|
|
|
);
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
if (stop == TM_START)
|
|
|
|
tmstart = now;
|
|
|
|
else
|
|
|
|
ret = (now - tmstart) / (double)(CLK_TCK);
|
2005-11-06 11:40:59 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
return (ret);
|
|
|
|
}
|
2005-11-06 11:40:59 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
#elif defined(_SC_CLK_TCK) /* by means of unistd.h */
|
|
|
|
# include <sys/times.h>
|
2005-11-06 11:40:59 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
double app_tminterval(int stop, int usertime)
|
|
|
|
{
|
|
|
|
double ret = 0;
|
|
|
|
struct tms rus;
|
|
|
|
clock_t now = times(&rus);
|
|
|
|
static clock_t tmstart;
|
|
|
|
|
|
|
|
if (usertime)
|
|
|
|
now = rus.tms_utime;
|
|
|
|
|
|
|
|
if (stop == TM_START)
|
|
|
|
tmstart = now;
|
|
|
|
else {
|
|
|
|
long int tck = sysconf(_SC_CLK_TCK);
|
|
|
|
ret = (now - tmstart) / (double)tck;
|
|
|
|
}
|
|
|
|
|
|
|
|
return (ret);
|
|
|
|
}
|
2005-11-06 11:40:59 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
#else
|
|
|
|
# include <sys/time.h>
|
|
|
|
# include <sys/resource.h>
|
2005-11-06 11:40:59 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
double app_tminterval(int stop, int usertime)
|
|
|
|
{
|
|
|
|
double ret = 0;
|
|
|
|
struct rusage rus;
|
|
|
|
struct timeval now;
|
|
|
|
static struct timeval tmstart;
|
|
|
|
|
|
|
|
if (usertime)
|
|
|
|
getrusage(RUSAGE_SELF, &rus), now = rus.ru_utime;
|
|
|
|
else
|
|
|
|
gettimeofday(&now, NULL);
|
|
|
|
|
|
|
|
if (stop == TM_START)
|
|
|
|
tmstart = now;
|
|
|
|
else
|
|
|
|
ret = ((now.tv_sec + now.tv_usec * 1e-6)
|
|
|
|
- (tmstart.tv_sec + tmstart.tv_usec * 1e-6));
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2005-11-06 11:40:59 +00:00
|
|
|
#endif
|
2005-11-04 16:12:05 +00: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-24 19:26:15 +00:00
|
|
|
int app_access(const char* name, int flag)
|
|
|
|
{
|
|
|
|
#ifdef _WIN32
|
|
|
|
return _access(name, flag);
|
|
|
|
#else
|
|
|
|
return access(name, flag);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2015-04-29 18:15:50 +00:00
|
|
|
int app_hex(char c)
|
|
|
|
{
|
|
|
|
switch (c) {
|
|
|
|
default:
|
|
|
|
case '0':
|
|
|
|
return 0;
|
|
|
|
case '1':
|
|
|
|
return 1;
|
|
|
|
case '2':
|
|
|
|
return 2;
|
|
|
|
case '3':
|
|
|
|
return 3;
|
|
|
|
case '4':
|
|
|
|
return 4;
|
|
|
|
case '5':
|
|
|
|
return 5;
|
|
|
|
case '6':
|
|
|
|
return 6;
|
|
|
|
case '7':
|
|
|
|
return 7;
|
|
|
|
case '8':
|
|
|
|
return 8;
|
|
|
|
case '9':
|
|
|
|
return 9;
|
|
|
|
case 'a': case 'A':
|
|
|
|
return 0x0A;
|
|
|
|
case 'b': case 'B':
|
|
|
|
return 0x0B;
|
|
|
|
case 'c': case 'C':
|
|
|
|
return 0x0C;
|
|
|
|
case 'd': case 'D':
|
|
|
|
return 0x0D;
|
|
|
|
case 'e': case 'E':
|
|
|
|
return 0x0E;
|
|
|
|
case 'f': case 'F':
|
|
|
|
return 0x0F;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-11-06 11:40:59 +00:00
|
|
|
/* app_isdir section */
|
|
|
|
#ifdef _WIN32
|
2005-11-04 09:30:55 +00:00
|
|
|
int app_isdir(const char *name)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
HANDLE hList;
|
|
|
|
WIN32_FIND_DATA FileData;
|
|
|
|
# if defined(UNICODE) || defined(_UNICODE)
|
|
|
|
size_t i, len_0 = strlen(name) + 1;
|
|
|
|
|
2015-05-03 16:32:05 +00:00
|
|
|
if (len_0 > OSSL_NELEM(FileData.cFileName))
|
2015-01-22 03:40:55 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
# if !defined(_WIN32_WCE) || _WIN32_WCE>=101
|
|
|
|
if (!MultiByteToWideChar
|
|
|
|
(CP_ACP, 0, name, len_0, FileData.cFileName, len_0))
|
|
|
|
# endif
|
|
|
|
for (i = 0; i < len_0; i++)
|
|
|
|
FileData.cFileName[i] = (WCHAR)name[i];
|
|
|
|
|
|
|
|
hList = FindFirstFile(FileData.cFileName, &FileData);
|
|
|
|
# else
|
|
|
|
hList = FindFirstFile(name, &FileData);
|
|
|
|
# endif
|
|
|
|
if (hList == INVALID_HANDLE_VALUE)
|
|
|
|
return -1;
|
|
|
|
FindClose(hList);
|
|
|
|
return ((FileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0);
|
|
|
|
}
|
2005-11-04 09:30:55 +00:00
|
|
|
#else
|
2015-01-22 03:40:55 +00:00
|
|
|
# include <sys/stat.h>
|
|
|
|
# ifndef S_ISDIR
|
|
|
|
# if defined(_S_IFMT) && defined(_S_IFDIR)
|
|
|
|
# define S_ISDIR(a) (((a) & _S_IFMT) == _S_IFDIR)
|
|
|
|
# else
|
|
|
|
# define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
|
|
|
|
# endif
|
|
|
|
# endif
|
2005-11-04 09:30:55 +00:00
|
|
|
|
|
|
|
int app_isdir(const char *name)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
# if defined(S_ISDIR)
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
if (stat(name, &st) == 0)
|
|
|
|
return S_ISDIR(st.st_mode);
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
# else
|
|
|
|
return -1;
|
|
|
|
# endif
|
|
|
|
}
|
2005-11-04 09:30:55 +00:00
|
|
|
#endif
|
|
|
|
|
2005-11-06 11:40:59 +00:00
|
|
|
/* raw_read|write section */
|
2005-11-04 09:30:55 +00:00
|
|
|
#if defined(_WIN32) && defined(STD_INPUT_HANDLE)
|
2015-01-22 03:40:55 +00:00
|
|
|
int raw_read_stdin(void *buf, int siz)
|
|
|
|
{
|
|
|
|
DWORD n;
|
|
|
|
if (ReadFile(GetStdHandle(STD_INPUT_HANDLE), buf, siz, &n, NULL))
|
|
|
|
return (n);
|
|
|
|
else
|
|
|
|
return (-1);
|
|
|
|
}
|
2005-11-04 09:30:55 +00:00
|
|
|
#else
|
2015-01-22 03:40:55 +00:00
|
|
|
int raw_read_stdin(void *buf, int siz)
|
|
|
|
{
|
|
|
|
return read(fileno(stdin), buf, siz);
|
|
|
|
}
|
2005-11-04 09:30:55 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(_WIN32) && defined(STD_OUTPUT_HANDLE)
|
2015-01-22 03:40:55 +00:00
|
|
|
int raw_write_stdout(const void *buf, int siz)
|
|
|
|
{
|
|
|
|
DWORD n;
|
|
|
|
if (WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), buf, siz, &n, NULL))
|
|
|
|
return (n);
|
|
|
|
else
|
|
|
|
return (-1);
|
|
|
|
}
|
2005-11-04 09:30:55 +00:00
|
|
|
#else
|
2015-01-22 03:40:55 +00:00
|
|
|
int raw_write_stdout(const void *buf, int siz)
|
|
|
|
{
|
|
|
|
return write(fileno(stdout), buf, siz);
|
|
|
|
}
|
2005-11-04 09:30:55 +00:00
|
|
|
#endif
|
2015-09-06 08:51:04 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Centralized handling if input and output files with format specification
|
|
|
|
* The format is meant to show what the input and output is supposed to be,
|
|
|
|
* and is therefore a show of intent more than anything else. However, it
|
|
|
|
* does impact behavior on some platform, such as differentiating between
|
|
|
|
* text and binary input/output on non-Unix platforms
|
|
|
|
*/
|
2015-09-06 20:43:25 +00:00
|
|
|
static int istext(int format)
|
2015-09-06 08:51:04 +00:00
|
|
|
{
|
2015-09-06 10:20:12 +00:00
|
|
|
return (format & B_FORMAT_TEXT) == B_FORMAT_TEXT;
|
2015-09-06 08:51:04 +00:00
|
|
|
}
|
|
|
|
|
2015-09-06 10:20:12 +00:00
|
|
|
BIO *dup_bio_in(int format)
|
2015-09-06 08:51:04 +00:00
|
|
|
{
|
2015-09-06 10:20:12 +00:00
|
|
|
return BIO_new_fp(stdin,
|
|
|
|
BIO_NOCLOSE | (istext(format) ? BIO_FP_TEXT : 0));
|
|
|
|
}
|
|
|
|
|
|
|
|
BIO *dup_bio_out(int format)
|
|
|
|
{
|
|
|
|
BIO *b = BIO_new_fp(stdout,
|
|
|
|
BIO_NOCLOSE | (istext(format) ? BIO_FP_TEXT : 0));
|
2015-09-06 08:51:04 +00:00
|
|
|
#ifdef OPENSSL_SYS_VMS
|
2015-09-06 10:20:12 +00:00
|
|
|
if (istext(format))
|
|
|
|
b = BIO_push(BIO_new(BIO_f_linebuffer()), b);
|
2015-09-06 08:51:04 +00:00
|
|
|
#endif
|
|
|
|
return b;
|
|
|
|
}
|
|
|
|
|
|
|
|
void unbuffer(FILE *fp)
|
|
|
|
{
|
|
|
|
setbuf(fp, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *modestr(char mode, int format)
|
|
|
|
{
|
|
|
|
OPENSSL_assert(mode == 'a' || mode == 'r' || mode == 'w');
|
|
|
|
|
|
|
|
switch (mode) {
|
|
|
|
case 'a':
|
2015-09-06 10:20:12 +00:00
|
|
|
return istext(format) ? "a" : "ab";
|
2015-09-06 08:51:04 +00:00
|
|
|
case 'r':
|
2015-09-06 10:20:12 +00:00
|
|
|
return istext(format) ? "r" : "rb";
|
2015-09-06 08:51:04 +00:00
|
|
|
case 'w':
|
2015-09-06 10:20:12 +00:00
|
|
|
return istext(format) ? "w" : "wb";
|
2015-09-06 08:51:04 +00:00
|
|
|
}
|
|
|
|
/* The assert above should make sure we never reach this point */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *modeverb(char mode)
|
|
|
|
{
|
|
|
|
switch (mode) {
|
|
|
|
case 'a':
|
|
|
|
return "appending";
|
|
|
|
case 'r':
|
|
|
|
return "reading";
|
|
|
|
case 'w':
|
|
|
|
return "writing";
|
|
|
|
}
|
|
|
|
return "(doing something)";
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Open a file for writing, owner-read-only.
|
|
|
|
*/
|
|
|
|
BIO *bio_open_owner(const char *filename, int format, int private)
|
|
|
|
{
|
|
|
|
FILE *fp = NULL;
|
|
|
|
BIO *b = NULL;
|
2016-01-14 13:07:57 +00:00
|
|
|
int fd = -1, bflags, mode, textmode;
|
2015-09-06 08:51:04 +00:00
|
|
|
|
|
|
|
if (!private || filename == NULL || strcmp(filename, "-") == 0)
|
|
|
|
return bio_open_default(filename, 'w', format);
|
|
|
|
|
|
|
|
mode = O_WRONLY;
|
|
|
|
#ifdef O_CREAT
|
|
|
|
mode |= O_CREAT;
|
|
|
|
#endif
|
|
|
|
#ifdef O_TRUNC
|
|
|
|
mode |= O_TRUNC;
|
|
|
|
#endif
|
2016-01-14 13:07:57 +00:00
|
|
|
textmode = istext(format);
|
|
|
|
if (!textmode) {
|
2015-09-06 08:51:04 +00:00
|
|
|
#ifdef O_BINARY
|
|
|
|
mode |= O_BINARY;
|
|
|
|
#elif defined(_O_BINARY)
|
|
|
|
mode |= _O_BINARY;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2016-01-14 13:08:49 +00:00
|
|
|
#ifdef OPENSSL_SYS_VMS
|
|
|
|
/* VMS doesn't have O_BINARY, it just doesn't make sense. But,
|
|
|
|
* it still needs to know that we're going binary, or fdopen()
|
|
|
|
* will fail with "invalid argument"... so we tell VMS what the
|
|
|
|
* context is.
|
|
|
|
*/
|
|
|
|
if (!textmode)
|
|
|
|
fd = open(filename, mode, 0600, "ctx=bin");
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
fd = open(filename, mode, 0600);
|
2015-09-06 08:51:04 +00:00
|
|
|
if (fd < 0)
|
|
|
|
goto err;
|
|
|
|
fp = fdopen(fd, modestr('w', format));
|
|
|
|
if (fp == NULL)
|
|
|
|
goto err;
|
|
|
|
bflags = BIO_CLOSE;
|
2016-01-14 13:07:57 +00:00
|
|
|
if (textmode)
|
2015-09-06 08:51:04 +00:00
|
|
|
bflags |= BIO_FP_TEXT;
|
|
|
|
b = BIO_new_fp(fp, bflags);
|
|
|
|
if (b)
|
|
|
|
return b;
|
|
|
|
|
|
|
|
err:
|
|
|
|
BIO_printf(bio_err, "%s: Can't open \"%s\" for writing, %s\n",
|
|
|
|
opt_getprog(), filename, strerror(errno));
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
/* If we have fp, then fdopen took over fd, so don't close both. */
|
|
|
|
if (fp)
|
|
|
|
fclose(fp);
|
|
|
|
else if (fd >= 0)
|
|
|
|
close(fd);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static BIO *bio_open_default_(const char *filename, char mode, int format,
|
|
|
|
int quiet)
|
|
|
|
{
|
|
|
|
BIO *ret;
|
|
|
|
|
|
|
|
if (filename == NULL || strcmp(filename, "-") == 0) {
|
2015-09-06 10:20:12 +00:00
|
|
|
ret = mode == 'r' ? dup_bio_in(format) : dup_bio_out(format);
|
2015-09-06 08:51:04 +00:00
|
|
|
if (quiet) {
|
|
|
|
ERR_clear_error();
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
if (ret != NULL)
|
|
|
|
return ret;
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Can't open %s, %s\n",
|
|
|
|
mode == 'r' ? "stdin" : "stdout", strerror(errno));
|
|
|
|
} else {
|
|
|
|
ret = BIO_new_file(filename, modestr(mode, format));
|
|
|
|
if (quiet) {
|
|
|
|
ERR_clear_error();
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
if (ret != NULL)
|
|
|
|
return ret;
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Can't open %s for %s, %s\n",
|
|
|
|
filename, modeverb(mode), strerror(errno));
|
|
|
|
}
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
BIO *bio_open_default(const char *filename, char mode, int format)
|
|
|
|
{
|
|
|
|
return bio_open_default_(filename, mode, format, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
BIO *bio_open_default_quiet(const char *filename, char mode, int format)
|
|
|
|
{
|
|
|
|
return bio_open_default_(filename, mode, format, 1);
|
|
|
|
}
|
|
|
|
|
2015-10-06 13:04:11 +00:00
|
|
|
void wait_for_async(SSL *s)
|
|
|
|
{
|
2016-01-25 15:28:57 +00:00
|
|
|
int width = 0;
|
2015-10-06 13:04:11 +00:00
|
|
|
fd_set asyncfds;
|
2016-01-25 15:28:57 +00:00
|
|
|
OSSL_ASYNC_FD *fds;
|
|
|
|
size_t numfds;
|
2015-10-06 13:04:11 +00:00
|
|
|
|
2016-01-25 15:28:57 +00:00
|
|
|
if (!SSL_get_all_async_fds(s, NULL, &numfds))
|
|
|
|
return;
|
|
|
|
if (numfds == 0)
|
2015-10-06 13:04:11 +00:00
|
|
|
return;
|
2016-01-25 15:28:57 +00:00
|
|
|
fds = OPENSSL_malloc(sizeof(OSSL_ASYNC_FD) * numfds);
|
|
|
|
if (!SSL_get_all_async_fds(s, fds, &numfds)) {
|
|
|
|
OPENSSL_free(fds);
|
|
|
|
}
|
2015-10-06 13:04:11 +00:00
|
|
|
|
|
|
|
FD_ZERO(&asyncfds);
|
2016-01-25 15:28:57 +00:00
|
|
|
while (numfds > 0) {
|
|
|
|
if (width <= (int)*fds)
|
|
|
|
width = (int)*fds + 1;
|
|
|
|
openssl_fdset((int)*fds, &asyncfds);
|
|
|
|
numfds--;
|
|
|
|
fds++;
|
|
|
|
}
|
2015-10-06 13:04:11 +00:00
|
|
|
select(width, (void *)&asyncfds, NULL, NULL, NULL);
|
|
|
|
}
|