2015-01-22 03:40:55 +00:00
|
|
|
/*
|
|
|
|
* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL project
|
|
|
|
* 2002.
|
2006-02-12 23:11:56 +00:00
|
|
|
*/
|
|
|
|
/* ====================================================================
|
|
|
|
* Copyright (c) 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.
|
2006-02-12 23:11:56 +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
|
|
|
|
* licensing@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).
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include "apps.h"
|
|
|
|
#include <openssl/bio.h>
|
|
|
|
#include <openssl/err.h>
|
|
|
|
#include <openssl/pem.h>
|
|
|
|
#include <openssl/rand.h>
|
|
|
|
#include <openssl/ts.h>
|
2008-03-16 21:05:46 +00:00
|
|
|
#include <openssl/bn.h>
|
2006-02-12 23:11:56 +00:00
|
|
|
|
|
|
|
/* Length of the nonce of the request in bits (must be a multiple of 8). */
|
2015-01-22 03:40:55 +00:00
|
|
|
#define NONCE_LENGTH 64
|
2006-02-12 23:11:56 +00:00
|
|
|
|
|
|
|
/* Macro definitions for the configuration file. */
|
2015-01-22 03:40:55 +00:00
|
|
|
#define ENV_OID_FILE "oid_file"
|
2006-02-12 23:11:56 +00:00
|
|
|
|
|
|
|
/* Local function declarations. */
|
|
|
|
|
|
|
|
static ASN1_OBJECT *txt2obj(const char *oid);
|
|
|
|
static CONF *load_config_file(const char *configfile);
|
|
|
|
|
|
|
|
/* Query related functions. */
|
|
|
|
static int query_command(const char *data, char *digest,
|
2015-01-22 03:40:55 +00:00
|
|
|
const EVP_MD *md, const char *policy, int no_nonce,
|
|
|
|
int cert, const char *in, const char *out, int text);
|
2006-02-12 23:11:56 +00:00
|
|
|
static TS_REQ *create_query(BIO *data_bio, char *digest, const EVP_MD *md,
|
2015-01-22 03:40:55 +00:00
|
|
|
const char *policy, int no_nonce, int cert);
|
2006-02-12 23:11:56 +00:00
|
|
|
static int create_digest(BIO *input, char *digest,
|
2015-01-22 03:40:55 +00:00
|
|
|
const EVP_MD *md, unsigned char **md_value);
|
2006-02-12 23:11:56 +00:00
|
|
|
static ASN1_INTEGER *create_nonce(int bits);
|
|
|
|
|
|
|
|
/* Reply related functions. */
|
2015-01-22 03:40:55 +00:00
|
|
|
static int reply_command(CONF *conf, char *section, char *engine,
|
|
|
|
char *queryfile, char *passin, char *inkey,
|
|
|
|
char *signer, char *chain, const char *policy,
|
|
|
|
char *in, int token_in, char *out, int token_out,
|
|
|
|
int text);
|
2006-02-12 23:11:56 +00:00
|
|
|
static TS_RESP *read_PKCS7(BIO *in_bio);
|
|
|
|
static TS_RESP *create_response(CONF *conf, const char *section, char *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
|
|
|
char *queryfile, char *passin,
|
|
|
|
char *inkey, char *signer, char *chain,
|
2015-01-22 03:40:55 +00:00
|
|
|
const char *policy);
|
|
|
|
static ASN1_INTEGER *serial_cb(TS_RESP_CTX *ctx, void *data);
|
2006-02-12 23:11:56 +00:00
|
|
|
static ASN1_INTEGER *next_serial(const char *serialfile);
|
|
|
|
static int save_ts_serial(const char *serialfile, ASN1_INTEGER *serial);
|
|
|
|
|
|
|
|
/* Verify related functions. */
|
|
|
|
static int verify_command(char *data, char *digest, char *queryfile,
|
2015-01-22 03:40:55 +00:00
|
|
|
char *in, int token_in,
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*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 *CApath, char *CAfile, char *untrusted);
|
2015-01-22 03:40:55 +00:00
|
|
|
static TS_VERIFY_CTX *create_verify_ctx(char *data, char *digest,
|
|
|
|
char *queryfile,
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*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 *CApath, char *CAfile,
|
2015-01-22 03:40:55 +00:00
|
|
|
char *untrusted);
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*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 X509_STORE *create_cert_store(char *CApath, char *CAfile);
|
2015-01-12 22:29:26 +00:00
|
|
|
static int verify_cb(int ok, X509_STORE_CTX *ctx);
|
2006-02-12 23:11:56 +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
|
|
|
typedef enum OPTION_choice {
|
|
|
|
OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
|
|
|
|
OPT_ENGINE, OPT_CONFIG, OPT_SECTION, OPT_QUERY, OPT_DATA,
|
|
|
|
OPT_DIGEST, OPT_RAND, OPT_POLICY, OPT_NO_NONCE, OPT_CERT,
|
|
|
|
OPT_IN, OPT_TOKEN_IN, OPT_OUT, OPT_TOKEN_OUT, OPT_TEXT,
|
|
|
|
OPT_REPLY, OPT_QUERYFILE, OPT_PASSIN, OPT_INKEY, OPT_SIGNER,
|
|
|
|
OPT_CHAIN, OPT_VERIFY, OPT_CAPATH, OPT_CAFILE, OPT_UNTRUSTED,
|
|
|
|
OPT_MD
|
|
|
|
} OPTION_CHOICE;
|
|
|
|
|
|
|
|
OPTIONS ts_options[] = {
|
|
|
|
{"help", OPT_HELP, '-', "Display this summary"},
|
|
|
|
{"config", OPT_CONFIG, '<', "Configuration file"},
|
|
|
|
{"section", OPT_SECTION, 's', "Section to use within config file"},
|
|
|
|
{"query", OPT_QUERY, '-', "Generate a TS query"},
|
|
|
|
{"data", OPT_DATA, '<', "File to hash"},
|
|
|
|
{"digest", OPT_DIGEST, 's', "Digest (as a hex string)"},
|
|
|
|
{"rand", OPT_RAND, 's',
|
|
|
|
"Load the file(s) into the random number generator"},
|
|
|
|
{"policy", OPT_POLICY, 's', "Policy OID to use"},
|
|
|
|
{"no_nonce", OPT_NO_NONCE, '-', "Do not include a nonce"},
|
|
|
|
{"cert", OPT_CERT, '-', "Put cert request into query"},
|
|
|
|
{"in", OPT_IN, '<', "Input file"},
|
|
|
|
{"token_in", OPT_TOKEN_IN, '-', "Input is a PKCS#7 file"},
|
|
|
|
{"out", OPT_OUT, '>', "Output file"},
|
|
|
|
{"token_out", OPT_TOKEN_OUT, '-', "Output is a PKCS#7 file"},
|
|
|
|
{"text", OPT_TEXT, '-', "Output text (not DER)"},
|
|
|
|
{"reply", OPT_REPLY, '-', "Generate a TS reply"},
|
|
|
|
{"queryfile", OPT_QUERYFILE, '<', "File containing a TS query"},
|
|
|
|
{"passin", OPT_PASSIN, 's'},
|
|
|
|
{"inkey", OPT_INKEY, '<', "File with private key for reply"},
|
|
|
|
{"signer", OPT_SIGNER, 's'},
|
|
|
|
{"chain", OPT_CHAIN, '<', "File with signer CA chain"},
|
|
|
|
{"verify", OPT_VERIFY, '-', "Verify a TS response"},
|
|
|
|
{"CApath", OPT_CAPATH, '/', "Path to trusted CA files"},
|
|
|
|
{"CAfile", OPT_CAFILE, '<', "File with trusted CA certs"},
|
|
|
|
{"untrusted", OPT_UNTRUSTED, '<', "File with untrusted certs"},
|
2015-05-15 17:50:38 +00:00
|
|
|
{"", OPT_MD, '-', "Any supported digest"},
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
|
|
|
{"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
|
|
|
|
#endif
|
|
|
|
{NULL}
|
|
|
|
};
|
2006-02-12 23:11:56 +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
|
|
|
/*
|
|
|
|
* This comand is so complex, special help is needed.
|
|
|
|
*/
|
|
|
|
static char* opt_helplist[] = {
|
|
|
|
"Typical uses:",
|
|
|
|
"ts -query [-rand file...] [-config file] [-data file]",
|
|
|
|
" [-digest hexstring] [-policy oid] [-no_nonce] [-cert]",
|
|
|
|
" [-in file] [-out file] [-text]",
|
|
|
|
" or",
|
|
|
|
"ts -reply [-config file] [-section tsa_section]",
|
|
|
|
" [-queryfile file] [-passin password]",
|
|
|
|
" [-signer tsa_cert.pem] [-inkey private_key.pem]",
|
|
|
|
" [-chain certs_file.pem] [-policy oid]",
|
|
|
|
" [-in file] [-token_in] [-out file] [-token_out]",
|
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
|
|
|
" [-text]",
|
|
|
|
#else
|
|
|
|
" [-text] [-engine id]",
|
|
|
|
#endif
|
|
|
|
" or",
|
|
|
|
"ts -verify -CApath dir -CAfile file.pem -untrusted file.pem",
|
|
|
|
" [-data file] [-digest hexstring]",
|
|
|
|
" [-queryfile file] -in file [-token_in]",
|
|
|
|
NULL,
|
|
|
|
};
|
|
|
|
|
|
|
|
int ts_main(int argc, char **argv)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
CONF *conf = 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
|
|
|
char *CAfile = NULL, *untrusted = NULL, *engine = NULL, *prog, **helpp;
|
2015-05-28 17:52:55 +00:00
|
|
|
char *configfile = default_config_file;
|
|
|
|
char *section = NULL, *password = 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
|
|
|
char *data = NULL, *digest = NULL, *rnd = NULL, *policy = NULL;
|
|
|
|
char *in = NULL, *out = NULL, *queryfile = NULL, *passin = NULL;
|
|
|
|
char *inkey = NULL, *signer = NULL, *chain = NULL, *CApath = NULL;
|
2015-01-22 03:40:55 +00:00
|
|
|
const EVP_MD *md = 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
|
|
|
OPTION_CHOICE o, mode = OPT_ERR;
|
|
|
|
int ret = 1, no_nonce = 0, cert = 0, text = 0;
|
2015-01-22 03:40:55 +00:00
|
|
|
/* Input is ContentInfo instead of TimeStampResp. */
|
|
|
|
int token_in = 0;
|
|
|
|
/* Output is ContentInfo instead of TimeStampResp. */
|
|
|
|
int token_out = 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
|
|
|
prog = opt_init(argc, argv, ts_options);
|
|
|
|
while ((o = opt_next()) != OPT_EOF) {
|
|
|
|
switch (o) {
|
|
|
|
case OPT_EOF:
|
|
|
|
case OPT_ERR:
|
|
|
|
opthelp:
|
|
|
|
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
|
|
|
|
goto end;
|
|
|
|
case OPT_HELP:
|
|
|
|
opt_help(ts_options);
|
|
|
|
for (helpp = opt_helplist; *helpp; ++helpp)
|
|
|
|
BIO_printf(bio_err, "%s\n", *helpp);
|
|
|
|
ret = 0;
|
|
|
|
goto end;
|
|
|
|
case OPT_CONFIG:
|
|
|
|
configfile = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_SECTION:
|
|
|
|
section = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_QUERY:
|
|
|
|
case OPT_REPLY:
|
|
|
|
case OPT_VERIFY:
|
|
|
|
if (mode != OPT_ERR)
|
|
|
|
goto opthelp;
|
|
|
|
mode = o;
|
|
|
|
break;
|
|
|
|
case OPT_DATA:
|
|
|
|
data = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_DIGEST:
|
|
|
|
digest = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_RAND:
|
|
|
|
rnd = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_POLICY:
|
|
|
|
policy = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_NO_NONCE:
|
2015-01-22 03:40:55 +00:00
|
|
|
no_nonce = 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
|
|
|
break;
|
|
|
|
case OPT_CERT:
|
2015-01-22 03:40:55 +00:00
|
|
|
cert = 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
|
|
|
break;
|
|
|
|
case OPT_IN:
|
|
|
|
in = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_TOKEN_IN:
|
2015-01-22 03:40:55 +00:00
|
|
|
token_in = 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
|
|
|
break;
|
|
|
|
case OPT_OUT:
|
|
|
|
out = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_TOKEN_OUT:
|
2015-01-22 03:40:55 +00:00
|
|
|
token_out = 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
|
|
|
break;
|
|
|
|
case OPT_TEXT:
|
2015-01-22 03:40:55 +00:00
|
|
|
text = 1;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
break;
|
|
|
|
case OPT_QUERYFILE:
|
|
|
|
queryfile = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_PASSIN:
|
|
|
|
passin = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_INKEY:
|
|
|
|
inkey = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_SIGNER:
|
|
|
|
signer = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_CHAIN:
|
|
|
|
chain = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_CAPATH:
|
|
|
|
CApath = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_CAFILE:
|
|
|
|
CAfile = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_UNTRUSTED:
|
|
|
|
untrusted = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_ENGINE:
|
|
|
|
engine = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_MD:
|
|
|
|
if (!opt_md(opt_unknown(), &md))
|
|
|
|
goto opthelp;
|
|
|
|
break;
|
|
|
|
}
|
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
|
|
|
argc = opt_num_rest();
|
|
|
|
argv = opt_rest();
|
|
|
|
if (mode == OPT_ERR || argc != 0)
|
|
|
|
goto opthelp;
|
2015-01-22 03:40:55 +00:00
|
|
|
|
|
|
|
/* Seed the random number generator if it is going to be used. */
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*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 (mode == OPT_QUERY && !no_nonce) {
|
|
|
|
if (!app_RAND_load_file(NULL, 1) && rnd == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
BIO_printf(bio_err, "warning, not much extra random "
|
|
|
|
"data, consider using the -rand option\n");
|
|
|
|
if (rnd != NULL)
|
|
|
|
BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
|
|
|
|
app_RAND_load_files(rnd));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the password if required. */
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*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 (mode == OPT_REPLY && passin &&
|
|
|
|
!app_passwd(passin, NULL, &password, NULL)) {
|
2015-01-22 03:40:55 +00:00
|
|
|
BIO_printf(bio_err, "Error getting password.\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
|
|
|
goto end;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
|
2015-05-29 06:07:10 +00:00
|
|
|
conf = load_config_file(configfile);
|
|
|
|
if (!app_load_modules(conf))
|
|
|
|
goto end;
|
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/*
|
|
|
|
* Check consistency of parameters and execute the appropriate function.
|
|
|
|
*/
|
|
|
|
switch (mode) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*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
|
|
|
default:
|
|
|
|
case OPT_ERR:
|
|
|
|
goto opthelp;
|
|
|
|
case OPT_QUERY:
|
2015-01-22 03:40:55 +00:00
|
|
|
/*
|
|
|
|
* Data file and message imprint cannot be specified at the same
|
|
|
|
* time.
|
|
|
|
*/
|
|
|
|
ret = data != NULL && digest != NULL;
|
|
|
|
if (ret)
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*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
|
|
|
goto opthelp;
|
2015-01-22 03:40:55 +00:00
|
|
|
ret = !query_command(data, digest, md, policy, no_nonce, cert,
|
|
|
|
in, out, text);
|
|
|
|
break;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
case OPT_REPLY:
|
2015-01-22 03:40:55 +00:00
|
|
|
if (in == NULL) {
|
|
|
|
ret = !(queryfile != NULL && conf != NULL && !token_in);
|
|
|
|
if (ret)
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*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
|
|
|
goto opthelp;
|
2015-01-22 03:40:55 +00:00
|
|
|
} else {
|
|
|
|
/* 'in' and 'queryfile' are exclusive. */
|
|
|
|
ret = !(queryfile == NULL);
|
|
|
|
if (ret)
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*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
|
|
|
goto opthelp;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
ret = !reply_command(conf, section, engine, queryfile,
|
|
|
|
password, inkey, signer, chain, policy,
|
|
|
|
in, token_in, out, token_out, text);
|
|
|
|
break;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
case OPT_VERIFY:
|
2015-01-22 03:40:55 +00:00
|
|
|
ret = !(((queryfile && !data && !digest)
|
|
|
|
|| (!queryfile && data && !digest)
|
|
|
|
|| (!queryfile && !data && digest))
|
|
|
|
&& in != NULL);
|
|
|
|
if (ret)
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*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
|
|
|
goto opthelp;
|
2015-01-22 03:40:55 +00:00
|
|
|
|
|
|
|
ret = !verify_command(data, digest, queryfile, in, token_in,
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*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
|
|
|
CApath, CAfile, untrusted);
|
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
|
|
|
end:
|
2015-01-22 03:40:55 +00:00
|
|
|
/* Clean up. */
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*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
|
|
|
app_RAND_write_file(NULL);
|
2015-01-22 03:40:55 +00:00
|
|
|
NCONF_free(conf);
|
|
|
|
OPENSSL_free(password);
|
|
|
|
OBJ_cleanup();
|
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*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 (ret);
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
2006-02-12 23:11:56 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Configuration file-related function definitions.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static ASN1_OBJECT *txt2obj(const char *oid)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
ASN1_OBJECT *oid_obj = NULL;
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((oid_obj = OBJ_txt2obj(oid, 0)) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
BIO_printf(bio_err, "cannot convert %s to OID\n", oid);
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
return oid_obj;
|
|
|
|
}
|
2006-02-12 23:11:56 +00:00
|
|
|
|
|
|
|
static CONF *load_config_file(const char *configfile)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
2015-05-28 17:52:55 +00:00
|
|
|
CONF *conf = app_load_config(configfile);
|
2015-01-22 03:40:55 +00:00
|
|
|
|
|
|
|
if (conf != NULL) {
|
|
|
|
const char *p;
|
|
|
|
|
|
|
|
BIO_printf(bio_err, "Using configuration from %s\n", configfile);
|
|
|
|
p = NCONF_get_string(conf, NULL, ENV_OID_FILE);
|
|
|
|
if (p != NULL) {
|
|
|
|
BIO *oid_bio = BIO_new_file(p, "r");
|
|
|
|
if (!oid_bio)
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
else {
|
|
|
|
OBJ_create_objects(oid_bio);
|
|
|
|
BIO_free_all(oid_bio);
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
ERR_clear_error();
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
if (!add_oid_section(conf))
|
2015-01-22 03:40:55 +00:00
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
}
|
|
|
|
return conf;
|
|
|
|
}
|
2006-02-12 23:11:56 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Query-related method definitions.
|
|
|
|
*/
|
|
|
|
static int query_command(const char *data, char *digest, const EVP_MD *md,
|
2015-01-22 03:40:55 +00:00
|
|
|
const char *policy, int no_nonce,
|
|
|
|
int cert, const char *in, const char *out, int text)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
TS_REQ *query = NULL;
|
|
|
|
BIO *in_bio = NULL;
|
|
|
|
BIO *data_bio = NULL;
|
|
|
|
BIO *out_bio = NULL;
|
|
|
|
|
|
|
|
/* Build query object either from file or from scratch. */
|
|
|
|
if (in != NULL) {
|
2015-09-04 10:49:06 +00:00
|
|
|
if ((in_bio = bio_open_default(in, 'r', FORMAT_ASN1)) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
query = d2i_TS_REQ_bio(in_bio, 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
|
|
|
/* Open the file if no explicit digest bytes were specified. */
|
2015-05-06 17:43:59 +00:00
|
|
|
if (digest == NULL
|
2015-09-04 10:49:06 +00:00
|
|
|
&& (data_bio = bio_open_default(data, 'r', FORMAT_ASN1)) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
query = create_query(data_bio, digest, md, policy, no_nonce, cert);
|
|
|
|
}
|
|
|
|
if (query == NULL)
|
|
|
|
goto end;
|
|
|
|
|
|
|
|
/* Write query either in ASN.1 or in text format. */
|
|
|
|
if (text) {
|
|
|
|
/* Text output. */
|
2015-09-04 10:49:06 +00:00
|
|
|
if ((out_bio = bio_open_default(out, 'w', FORMAT_TEXT)) == NULL)
|
|
|
|
goto end;
|
2015-01-22 03:40:55 +00:00
|
|
|
if (!TS_REQ_print_bio(out_bio, query))
|
|
|
|
goto end;
|
|
|
|
} else {
|
|
|
|
/* ASN.1 output. */
|
2015-09-04 10:49:06 +00:00
|
|
|
if ((out_bio = bio_open_default(out, 'w', FORMAT_ASN1)) == NULL)
|
|
|
|
goto end;
|
2015-01-22 03:40:55 +00:00
|
|
|
if (!i2d_TS_REQ_bio(out_bio, query))
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = 1;
|
2006-02-12 23:11:56 +00:00
|
|
|
|
|
|
|
end:
|
2015-01-22 03:40:55 +00:00
|
|
|
ERR_print_errors(bio_err);
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/* Clean up. */
|
|
|
|
BIO_free_all(in_bio);
|
|
|
|
BIO_free_all(data_bio);
|
|
|
|
BIO_free_all(out_bio);
|
|
|
|
TS_REQ_free(query);
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
return ret;
|
|
|
|
}
|
2006-02-12 23:11:56 +00:00
|
|
|
|
|
|
|
static TS_REQ *create_query(BIO *data_bio, char *digest, const EVP_MD *md,
|
2015-01-22 03:40:55 +00:00
|
|
|
const char *policy, int no_nonce, int cert)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
TS_REQ *ts_req = NULL;
|
|
|
|
int len;
|
|
|
|
TS_MSG_IMPRINT *msg_imprint = NULL;
|
|
|
|
X509_ALGOR *algo = NULL;
|
|
|
|
unsigned char *data = NULL;
|
|
|
|
ASN1_OBJECT *policy_obj = NULL;
|
|
|
|
ASN1_INTEGER *nonce_asn1 = NULL;
|
|
|
|
|
|
|
|
/* Setting default message digest. */
|
2015-05-06 17:43:59 +00:00
|
|
|
if (md == NULL && (md = EVP_get_digestbyname("sha1")) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
/* Creating request object. */
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((ts_req = TS_REQ_new()) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
/* Setting version. */
|
|
|
|
if (!TS_REQ_set_version(ts_req, 1))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
/* Creating and adding MSG_IMPRINT object. */
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((msg_imprint = TS_MSG_IMPRINT_new()) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
/* Adding algorithm. */
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((algo = X509_ALGOR_new()) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((algo->algorithm = OBJ_nid2obj(EVP_MD_type(md))) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((algo->parameter = ASN1_TYPE_new()) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
algo->parameter->type = V_ASN1_NULL;
|
|
|
|
if (!TS_MSG_IMPRINT_set_algo(msg_imprint, algo))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
/* Adding message digest. */
|
|
|
|
if ((len = create_digest(data_bio, digest, md, &data)) == 0)
|
|
|
|
goto err;
|
|
|
|
if (!TS_MSG_IMPRINT_set_msg(msg_imprint, data, len))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
if (!TS_REQ_set_msg_imprint(ts_req, msg_imprint))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
/* Setting policy if requested. */
|
2015-05-06 17:43:59 +00:00
|
|
|
if (policy && (policy_obj = txt2obj(policy)) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
if (policy_obj && !TS_REQ_set_policy_id(ts_req, policy_obj))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
/* Setting nonce if requested. */
|
2015-05-06 17:43:59 +00:00
|
|
|
if (!no_nonce && (nonce_asn1 = create_nonce(NONCE_LENGTH)) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
if (nonce_asn1 && !TS_REQ_set_nonce(ts_req, nonce_asn1))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
/* Setting certificate request flag if requested. */
|
|
|
|
if (!TS_REQ_set_cert_req(ts_req, cert))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
ret = 1;
|
2006-02-12 23:11:56 +00:00
|
|
|
err:
|
2015-01-22 03:40:55 +00:00
|
|
|
if (!ret) {
|
|
|
|
TS_REQ_free(ts_req);
|
|
|
|
ts_req = NULL;
|
|
|
|
BIO_printf(bio_err, "could not create query\n");
|
|
|
|
}
|
|
|
|
TS_MSG_IMPRINT_free(msg_imprint);
|
|
|
|
X509_ALGOR_free(algo);
|
|
|
|
OPENSSL_free(data);
|
|
|
|
ASN1_OBJECT_free(policy_obj);
|
|
|
|
ASN1_INTEGER_free(nonce_asn1);
|
|
|
|
return ts_req;
|
|
|
|
}
|
2006-02-12 23:11:56 +00:00
|
|
|
|
|
|
|
static int create_digest(BIO *input, char *digest, const EVP_MD *md,
|
2015-01-22 03:40:55 +00:00
|
|
|
unsigned char **md_value)
|
|
|
|
{
|
|
|
|
int md_value_len;
|
|
|
|
|
|
|
|
md_value_len = EVP_MD_size(md);
|
|
|
|
if (md_value_len < 0)
|
|
|
|
goto err;
|
|
|
|
if (input) {
|
|
|
|
/* Digest must be computed from an input file. */
|
|
|
|
EVP_MD_CTX md_ctx;
|
|
|
|
unsigned char buffer[4096];
|
|
|
|
int length;
|
|
|
|
|
2015-04-30 21:48:31 +00:00
|
|
|
*md_value = app_malloc(md_value_len, "digest buffer");
|
2015-01-22 03:40:55 +00:00
|
|
|
EVP_DigestInit(&md_ctx, md);
|
|
|
|
while ((length = BIO_read(input, buffer, sizeof(buffer))) > 0) {
|
|
|
|
EVP_DigestUpdate(&md_ctx, buffer, length);
|
|
|
|
}
|
|
|
|
if (!EVP_DigestFinal(&md_ctx, *md_value, NULL))
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
/* Digest bytes are specified with digest. */
|
|
|
|
long digest_len;
|
|
|
|
*md_value = string_to_hex(digest, &digest_len);
|
|
|
|
if (!*md_value || md_value_len != digest_len) {
|
|
|
|
OPENSSL_free(*md_value);
|
|
|
|
*md_value = NULL;
|
|
|
|
BIO_printf(bio_err, "bad digest, %d bytes "
|
|
|
|
"must be specified\n", md_value_len);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return md_value_len;
|
2006-02-12 23:11:56 +00:00
|
|
|
err:
|
2015-01-22 03:40:55 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2006-02-12 23:11:56 +00:00
|
|
|
|
|
|
|
static ASN1_INTEGER *create_nonce(int bits)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
unsigned char buf[20];
|
|
|
|
ASN1_INTEGER *nonce = NULL;
|
|
|
|
int len = (bits - 1) / 8 + 1;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* Generating random byte sequence. */
|
|
|
|
if (len > (int)sizeof(buf))
|
|
|
|
goto err;
|
|
|
|
if (RAND_bytes(buf, len) <= 0)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
/* Find the first non-zero byte and creating ASN1_INTEGER object. */
|
2015-05-06 17:43:59 +00:00
|
|
|
for (i = 0; i < len && !buf[i]; ++i)
|
|
|
|
continue;
|
|
|
|
if ((nonce = ASN1_INTEGER_new()) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
OPENSSL_free(nonce->data);
|
|
|
|
/* Allocate at least one byte. */
|
|
|
|
nonce->length = len - i;
|
2015-04-30 21:48:31 +00:00
|
|
|
nonce->data = app_malloc(nonce->length + 1, "nonce buffer");
|
2015-01-22 03:40:55 +00:00
|
|
|
memcpy(nonce->data, buf + i, nonce->length);
|
|
|
|
|
|
|
|
return nonce;
|
2006-02-12 23:11:56 +00:00
|
|
|
err:
|
2015-01-22 03:40:55 +00:00
|
|
|
BIO_printf(bio_err, "could not create nonce\n");
|
|
|
|
ASN1_INTEGER_free(nonce);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2006-02-12 23:11:56 +00:00
|
|
|
/*
|
|
|
|
* Reply-related method definitions.
|
|
|
|
*/
|
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
static int reply_command(CONF *conf, char *section, char *engine,
|
|
|
|
char *queryfile, char *passin, char *inkey,
|
|
|
|
char *signer, char *chain, const char *policy,
|
|
|
|
char *in, int token_in,
|
|
|
|
char *out, int token_out, int text)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
TS_RESP *response = NULL;
|
|
|
|
BIO *in_bio = NULL;
|
|
|
|
BIO *query_bio = NULL;
|
|
|
|
BIO *inkey_bio = NULL;
|
|
|
|
BIO *signer_bio = NULL;
|
|
|
|
BIO *out_bio = NULL;
|
|
|
|
|
|
|
|
/* Build response object either from response or query. */
|
|
|
|
if (in != NULL) {
|
|
|
|
if ((in_bio = BIO_new_file(in, "rb")) == NULL)
|
|
|
|
goto end;
|
|
|
|
if (token_in) {
|
|
|
|
/*
|
|
|
|
* We have a ContentInfo (PKCS7) object, add 'granted' status
|
|
|
|
* info around it.
|
|
|
|
*/
|
|
|
|
response = read_PKCS7(in_bio);
|
|
|
|
} else {
|
|
|
|
/* We have a ready-made TS_RESP object. */
|
|
|
|
response = d2i_TS_RESP_bio(in_bio, NULL);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
response = create_response(conf, section, engine, queryfile,
|
|
|
|
passin, inkey, signer, chain, policy);
|
|
|
|
if (response)
|
|
|
|
BIO_printf(bio_err, "Response has been generated.\n");
|
|
|
|
else
|
|
|
|
BIO_printf(bio_err, "Response is not generated.\n");
|
|
|
|
}
|
|
|
|
if (response == NULL)
|
|
|
|
goto end;
|
|
|
|
|
|
|
|
/* Write response either in ASN.1 or text format. */
|
|
|
|
if (text) {
|
|
|
|
/* Text output. */
|
2015-09-04 10:49:06 +00:00
|
|
|
if ((out_bio = bio_open_default(out, 'w', FORMAT_TEXT)) == NULL)
|
|
|
|
goto end;
|
2015-01-22 03:40:55 +00:00
|
|
|
if (token_out) {
|
|
|
|
TS_TST_INFO *tst_info = TS_RESP_get_tst_info(response);
|
|
|
|
if (!TS_TST_INFO_print_bio(out_bio, tst_info))
|
|
|
|
goto end;
|
|
|
|
} else {
|
|
|
|
if (!TS_RESP_print_bio(out_bio, response))
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* ASN.1 DER output. */
|
2015-09-04 10:49:06 +00:00
|
|
|
if ((out_bio = bio_open_default(out, 'w', FORMAT_ASN1)) == NULL)
|
|
|
|
goto end;
|
2015-01-22 03:40:55 +00:00
|
|
|
if (token_out) {
|
|
|
|
PKCS7 *token = TS_RESP_get_token(response);
|
|
|
|
if (!i2d_PKCS7_bio(out_bio, token))
|
|
|
|
goto end;
|
|
|
|
} else {
|
|
|
|
if (!i2d_TS_RESP_bio(out_bio, response))
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = 1;
|
2006-02-12 23:11:56 +00:00
|
|
|
|
|
|
|
end:
|
2015-01-22 03:40:55 +00:00
|
|
|
ERR_print_errors(bio_err);
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/* Clean up. */
|
|
|
|
BIO_free_all(in_bio);
|
|
|
|
BIO_free_all(query_bio);
|
|
|
|
BIO_free_all(inkey_bio);
|
|
|
|
BIO_free_all(signer_bio);
|
|
|
|
BIO_free_all(out_bio);
|
|
|
|
TS_RESP_free(response);
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
return ret;
|
|
|
|
}
|
2006-02-12 23:11:56 +00:00
|
|
|
|
|
|
|
/* Reads a PKCS7 token and adds default 'granted' status info to it. */
|
|
|
|
static TS_RESP *read_PKCS7(BIO *in_bio)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
PKCS7 *token = NULL;
|
|
|
|
TS_TST_INFO *tst_info = NULL;
|
|
|
|
TS_RESP *resp = NULL;
|
|
|
|
TS_STATUS_INFO *si = NULL;
|
|
|
|
|
|
|
|
/* Read PKCS7 object and extract the signed time stamp info. */
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((token = d2i_PKCS7_bio(in_bio, NULL)) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((tst_info = PKCS7_to_TS_TST_INFO(token)) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
|
|
|
|
/* Creating response object. */
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((resp = TS_RESP_new()) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
|
|
|
|
/* Create granted status info. */
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((si = TS_STATUS_INFO_new()) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
2015-06-10 18:07:40 +00:00
|
|
|
if (!TS_STATUS_INFO_set_status(si, TS_STATUS_GRANTED))
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
if (!TS_RESP_set_status_info(resp, si))
|
|
|
|
goto end;
|
|
|
|
|
|
|
|
/* Setting encapsulated token. */
|
|
|
|
TS_RESP_set_tst_info(resp, token, tst_info);
|
|
|
|
token = NULL; /* Ownership is lost. */
|
|
|
|
tst_info = NULL; /* Ownership is lost. */
|
|
|
|
|
|
|
|
ret = 1;
|
2006-02-12 23:11:56 +00:00
|
|
|
end:
|
2015-01-22 03:40:55 +00:00
|
|
|
PKCS7_free(token);
|
|
|
|
TS_TST_INFO_free(tst_info);
|
|
|
|
if (!ret) {
|
|
|
|
TS_RESP_free(resp);
|
|
|
|
resp = NULL;
|
|
|
|
}
|
|
|
|
TS_STATUS_INFO_free(si);
|
|
|
|
return resp;
|
|
|
|
}
|
|
|
|
|
|
|
|
static TS_RESP *create_response(CONF *conf, const char *section, char *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
|
|
|
char *queryfile, char *passin,
|
|
|
|
char *inkey, char *signer, char *chain,
|
|
|
|
const char *policy)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
TS_RESP *response = NULL;
|
|
|
|
BIO *query_bio = NULL;
|
|
|
|
TS_RESP_CTX *resp_ctx = NULL;
|
|
|
|
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((query_bio = BIO_new_file(queryfile, "rb")) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
|
|
|
|
/* Getting TSA configuration section. */
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((section = TS_CONF_get_tsa_section(conf, section)) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
|
|
|
|
/* Setting up response generation context. */
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((resp_ctx = TS_RESP_CTX_new()) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
|
|
|
|
/* Setting serial number provider callback. */
|
|
|
|
if (!TS_CONF_set_serial(conf, section, serial_cb, resp_ctx))
|
|
|
|
goto end;
|
2008-12-20 17:04:40 +00:00
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
2015-01-22 03:40:55 +00:00
|
|
|
/* Setting default OpenSSL engine. */
|
|
|
|
if (!TS_CONF_set_crypto_device(conf, section, engine))
|
|
|
|
goto end;
|
2008-12-20 17:04:40 +00:00
|
|
|
#endif
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/* Setting TSA signer certificate. */
|
|
|
|
if (!TS_CONF_set_signer_cert(conf, section, signer, resp_ctx))
|
|
|
|
goto end;
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/* Setting TSA signer certificate chain. */
|
|
|
|
if (!TS_CONF_set_certs(conf, section, chain, resp_ctx))
|
|
|
|
goto end;
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/* Setting TSA signer private key. */
|
|
|
|
if (!TS_CONF_set_signer_key(conf, section, inkey, passin, resp_ctx))
|
|
|
|
goto end;
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/* Setting default policy OID. */
|
|
|
|
if (!TS_CONF_set_def_policy(conf, section, policy, resp_ctx))
|
|
|
|
goto end;
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/* Setting acceptable policy OIDs. */
|
|
|
|
if (!TS_CONF_set_policies(conf, section, resp_ctx))
|
|
|
|
goto end;
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/* Setting the acceptable one-way hash algorithms. */
|
|
|
|
if (!TS_CONF_set_digests(conf, section, resp_ctx))
|
|
|
|
goto end;
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/* Setting guaranteed time stamp accuracy. */
|
|
|
|
if (!TS_CONF_set_accuracy(conf, section, resp_ctx))
|
|
|
|
goto end;
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/* Setting the precision of the time. */
|
|
|
|
if (!TS_CONF_set_clock_precision_digits(conf, section, resp_ctx))
|
|
|
|
goto end;
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/* Setting the ordering flaf if requested. */
|
|
|
|
if (!TS_CONF_set_ordering(conf, section, resp_ctx))
|
|
|
|
goto end;
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/* Setting the TSA name required flag if requested. */
|
|
|
|
if (!TS_CONF_set_tsa_name(conf, section, resp_ctx))
|
|
|
|
goto end;
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/* Setting the ESS cert id chain flag if requested. */
|
|
|
|
if (!TS_CONF_set_ess_cert_id_chain(conf, section, resp_ctx))
|
|
|
|
goto end;
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/* Creating the response. */
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((response = TS_RESP_create_response(resp_ctx, query_bio)) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
ret = 1;
|
2006-02-12 23:11:56 +00:00
|
|
|
end:
|
2015-01-22 03:40:55 +00:00
|
|
|
if (!ret) {
|
|
|
|
TS_RESP_free(response);
|
|
|
|
response = NULL;
|
|
|
|
}
|
|
|
|
TS_RESP_CTX_free(resp_ctx);
|
|
|
|
BIO_free_all(query_bio);
|
|
|
|
|
|
|
|
return response;
|
|
|
|
}
|
|
|
|
|
|
|
|
static ASN1_INTEGER *serial_cb(TS_RESP_CTX *ctx, void *data)
|
|
|
|
{
|
|
|
|
const char *serial_file = (const char *)data;
|
|
|
|
ASN1_INTEGER *serial = next_serial(serial_file);
|
|
|
|
|
|
|
|
if (!serial) {
|
|
|
|
TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
|
|
|
|
"Error during serial number "
|
|
|
|
"generation.");
|
|
|
|
TS_RESP_CTX_add_failure_info(ctx, TS_INFO_ADD_INFO_NOT_AVAILABLE);
|
|
|
|
} else
|
|
|
|
save_ts_serial(serial_file, serial);
|
|
|
|
|
|
|
|
return serial;
|
|
|
|
}
|
2006-02-12 23:11:56 +00:00
|
|
|
|
|
|
|
static ASN1_INTEGER *next_serial(const char *serialfile)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
BIO *in = NULL;
|
|
|
|
ASN1_INTEGER *serial = NULL;
|
|
|
|
BIGNUM *bn = NULL;
|
|
|
|
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((serial = ASN1_INTEGER_new()) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((in = BIO_new_file(serialfile, "r")) == NULL) {
|
2015-01-22 03:40:55 +00:00
|
|
|
ERR_clear_error();
|
|
|
|
BIO_printf(bio_err, "Warning: could not open file %s for "
|
|
|
|
"reading, using serial number: 1\n", serialfile);
|
|
|
|
if (!ASN1_INTEGER_set(serial, 1))
|
|
|
|
goto err;
|
|
|
|
} else {
|
|
|
|
char buf[1024];
|
|
|
|
if (!a2i_ASN1_INTEGER(in, serial, buf, sizeof(buf))) {
|
|
|
|
BIO_printf(bio_err, "unable to load number from %s\n",
|
|
|
|
serialfile);
|
|
|
|
goto err;
|
|
|
|
}
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((bn = ASN1_INTEGER_to_BN(serial, NULL)) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
ASN1_INTEGER_free(serial);
|
|
|
|
serial = NULL;
|
|
|
|
if (!BN_add_word(bn, 1))
|
|
|
|
goto err;
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((serial = BN_to_ASN1_INTEGER(bn, NULL)) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
ret = 1;
|
2006-02-12 23:11:56 +00:00
|
|
|
err:
|
2015-01-22 03:40:55 +00:00
|
|
|
if (!ret) {
|
|
|
|
ASN1_INTEGER_free(serial);
|
|
|
|
serial = NULL;
|
|
|
|
}
|
|
|
|
BIO_free_all(in);
|
|
|
|
BN_free(bn);
|
|
|
|
return serial;
|
|
|
|
}
|
2006-02-12 23:11:56 +00:00
|
|
|
|
|
|
|
static int save_ts_serial(const char *serialfile, ASN1_INTEGER *serial)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
BIO *out = NULL;
|
|
|
|
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((out = BIO_new_file(serialfile, "w")) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
if (i2a_ASN1_INTEGER(out, serial) <= 0)
|
|
|
|
goto err;
|
|
|
|
if (BIO_puts(out, "\n") <= 0)
|
|
|
|
goto err;
|
|
|
|
ret = 1;
|
2006-02-12 23:11:56 +00:00
|
|
|
err:
|
2015-01-22 03:40:55 +00:00
|
|
|
if (!ret)
|
|
|
|
BIO_printf(bio_err, "could not save serial number to %s\n",
|
|
|
|
serialfile);
|
|
|
|
BIO_free_all(out);
|
|
|
|
return ret;
|
|
|
|
}
|
2006-02-12 23:11:56 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Verify-related method definitions.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int verify_command(char *data, char *digest, char *queryfile,
|
2015-01-22 03:40:55 +00:00
|
|
|
char *in, int token_in,
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*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 *CApath, char *CAfile, char *untrusted)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
BIO *in_bio = NULL;
|
|
|
|
PKCS7 *token = NULL;
|
|
|
|
TS_RESP *response = NULL;
|
|
|
|
TS_VERIFY_CTX *verify_ctx = NULL;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
/* Decode the token (PKCS7) or response (TS_RESP) files. */
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((in_bio = BIO_new_file(in, "rb")) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
if (token_in) {
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((token = d2i_PKCS7_bio(in_bio, NULL)) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
} else {
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((response = d2i_TS_RESP_bio(in_bio, NULL)) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((verify_ctx = create_verify_ctx(data, digest, queryfile,
|
|
|
|
CApath, CAfile, untrusted)) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto end;
|
|
|
|
|
|
|
|
/* Checking the token or response against the request. */
|
|
|
|
ret = token_in ?
|
|
|
|
TS_RESP_verify_token(verify_ctx, token) :
|
|
|
|
TS_RESP_verify_response(verify_ctx, response);
|
2006-02-12 23:11:56 +00:00
|
|
|
|
|
|
|
end:
|
2015-01-22 03:40:55 +00:00
|
|
|
printf("Verification: ");
|
|
|
|
if (ret)
|
|
|
|
printf("OK\n");
|
|
|
|
else {
|
|
|
|
printf("FAILED\n");
|
|
|
|
/* Print errors, if there are any. */
|
|
|
|
ERR_print_errors(bio_err);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Clean up. */
|
|
|
|
BIO_free_all(in_bio);
|
|
|
|
PKCS7_free(token);
|
|
|
|
TS_RESP_free(response);
|
|
|
|
TS_VERIFY_CTX_free(verify_ctx);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static TS_VERIFY_CTX *create_verify_ctx(char *data, char *digest,
|
|
|
|
char *queryfile,
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*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 *CApath, char *CAfile,
|
2015-01-22 03:40:55 +00:00
|
|
|
char *untrusted)
|
|
|
|
{
|
|
|
|
TS_VERIFY_CTX *ctx = NULL;
|
|
|
|
BIO *input = NULL;
|
|
|
|
TS_REQ *request = NULL;
|
|
|
|
int ret = 0;
|
2015-06-10 18:07:40 +00:00
|
|
|
int f = 0;
|
2015-01-22 03:40:55 +00:00
|
|
|
|
|
|
|
if (data != NULL || digest != NULL) {
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((ctx = TS_VERIFY_CTX_new()) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
2015-06-10 18:07:40 +00:00
|
|
|
f = TS_VFY_VERSION | TS_VFY_SIGNER;
|
2015-01-22 03:40:55 +00:00
|
|
|
if (data != NULL) {
|
2015-06-10 18:07:40 +00:00
|
|
|
f |= TS_VFY_DATA;
|
|
|
|
if (TS_VERIFY_CTX_set_data(ctx, BIO_new_file(data, "rb")) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
} else if (digest != NULL) {
|
|
|
|
long imprint_len;
|
2015-06-10 18:07:40 +00:00
|
|
|
unsigned char *hexstr = string_to_hex(digest, &imprint_len);
|
|
|
|
f |= TS_VFY_IMPRINT;
|
|
|
|
if (TS_VERIFY_CTX_set_imprint(ctx, hexstr, imprint_len) == NULL) {
|
2015-01-22 03:40:55 +00:00
|
|
|
BIO_printf(bio_err, "invalid digest string\n");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
} else if (queryfile != NULL) {
|
|
|
|
/*
|
|
|
|
* The request has just to be read, decoded and converted to a verify
|
|
|
|
* context object.
|
|
|
|
*/
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((input = BIO_new_file(queryfile, "rb")) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((request = d2i_TS_REQ_bio(input, NULL)) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
2015-05-06 17:43:59 +00:00
|
|
|
if ((ctx = TS_REQ_to_TS_VERIFY_CTX(request, NULL)) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
} else
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* Add the signature verification flag and arguments. */
|
2015-06-10 18:07:40 +00:00
|
|
|
TS_VERIFY_CTX_add_flags(ctx, f | TS_VFY_SIGNATURE);
|
2015-01-22 03:40:55 +00:00
|
|
|
|
|
|
|
/* Initialising the X509_STORE object. */
|
2015-06-10 18:07:40 +00:00
|
|
|
if (TS_VERIFY_CTX_set_store(ctx, create_cert_store(CApath, CAfile))
|
|
|
|
== NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
/* Loading untrusted certificates. */
|
2015-06-10 18:07:40 +00:00
|
|
|
if (untrusted
|
|
|
|
&& TS_VERIFY_CTS_set_certs(ctx, TS_CONF_load_certs(untrusted)) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
ret = 1;
|
2006-02-12 23:11:56 +00:00
|
|
|
err:
|
2015-01-22 03:40:55 +00:00
|
|
|
if (!ret) {
|
|
|
|
TS_VERIFY_CTX_free(ctx);
|
|
|
|
ctx = NULL;
|
|
|
|
}
|
|
|
|
BIO_free_all(input);
|
|
|
|
TS_REQ_free(request);
|
|
|
|
return ctx;
|
|
|
|
}
|
2006-02-12 23:11:56 +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 X509_STORE *create_cert_store(char *CApath, char *CAfile)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
X509_STORE *cert_ctx = NULL;
|
|
|
|
X509_LOOKUP *lookup = NULL;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* Creating the X509_STORE object. */
|
|
|
|
cert_ctx = X509_STORE_new();
|
|
|
|
|
|
|
|
/* Setting the callback for certificate chain verification. */
|
|
|
|
X509_STORE_set_verify_cb(cert_ctx, verify_cb);
|
|
|
|
|
|
|
|
/* Adding a trusted certificate directory source. */
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*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 (CApath) {
|
2015-01-22 03:40:55 +00:00
|
|
|
lookup = X509_STORE_add_lookup(cert_ctx, X509_LOOKUP_hash_dir());
|
|
|
|
if (lookup == NULL) {
|
|
|
|
BIO_printf(bio_err, "memory allocation failure\n");
|
|
|
|
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
|
|
|
i = X509_LOOKUP_add_dir(lookup, CApath, X509_FILETYPE_PEM);
|
2015-01-22 03:40:55 +00:00
|
|
|
if (!i) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "Error loading directory %s\n", CApath);
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Adding a trusted certificate file source. */
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*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 (CAfile) {
|
2015-01-22 03:40:55 +00:00
|
|
|
lookup = X509_STORE_add_lookup(cert_ctx, X509_LOOKUP_file());
|
|
|
|
if (lookup == NULL) {
|
|
|
|
BIO_printf(bio_err, "memory allocation failure\n");
|
|
|
|
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
|
|
|
i = X509_LOOKUP_load_file(lookup, CAfile, X509_FILETYPE_PEM);
|
2015-01-22 03:40:55 +00:00
|
|
|
if (!i) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
BIO_printf(bio_err, "Error loading file %s\n", CAfile);
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return cert_ctx;
|
2006-02-12 23:11:56 +00:00
|
|
|
err:
|
2015-01-22 03:40:55 +00:00
|
|
|
X509_STORE_free(cert_ctx);
|
|
|
|
return NULL;
|
|
|
|
}
|
2006-02-12 23:11:56 +00:00
|
|
|
|
2015-01-12 22:29:26 +00:00
|
|
|
static int verify_cb(int ok, X509_STORE_CTX *ctx)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
return ok;
|
|
|
|
}
|