2016-05-18 02:18:30 +08:00
|
|
|
/*
|
2018-02-13 20:51:29 +08:00
|
|
|
* Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
*
|
2018-12-06 20:00:26 +08:00
|
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
2016-05-18 02:18:30 +08:00
|
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
|
|
* in the file LICENSE in the source distribution or at
|
|
|
|
* https://www.openssl.org/source/license.html
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
*/
|
2000-02-11 05:50:52 +08:00
|
|
|
|
2017-08-23 17:43:36 +08:00
|
|
|
#include <string.h>
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2017-08-23 17:43:36 +08:00
|
|
|
#include "apps.h"
|
2018-01-31 18:13:10 +08:00
|
|
|
#include "progs.h"
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2017-08-23 17:43:36 +08:00
|
|
|
#include <openssl/bio.h>
|
|
|
|
#include <openssl/err.h>
|
|
|
|
#include <openssl/evp.h>
|
|
|
|
#include <openssl/rand.h>
|
|
|
|
#ifndef OPENSSL_NO_DES
|
|
|
|
# include <openssl/des.h>
|
|
|
|
#endif
|
|
|
|
#include <openssl/md5.h>
|
|
|
|
#include <openssl/sha.h>
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
static unsigned const char cov_2char[64] = {
|
|
|
|
/* from crypto/des/fcrypt.c */
|
|
|
|
0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35,
|
|
|
|
0x36, 0x37, 0x38, 0x39, 0x41, 0x42, 0x43, 0x44,
|
|
|
|
0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C,
|
|
|
|
0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54,
|
|
|
|
0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x61, 0x62,
|
|
|
|
0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A,
|
|
|
|
0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72,
|
|
|
|
0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A
|
2000-02-11 05:50:52 +08:00
|
|
|
};
|
|
|
|
|
2017-08-23 22:03:18 +08:00
|
|
|
static const char ascii_dollar[] = { 0x24, 0x00 };
|
|
|
|
|
2016-09-14 11:06:56 +08:00
|
|
|
typedef enum {
|
|
|
|
passwd_unset = 0,
|
|
|
|
passwd_crypt,
|
|
|
|
passwd_md5,
|
|
|
|
passwd_apr1,
|
|
|
|
passwd_sha256,
|
2017-01-20 13:37:43 +08:00
|
|
|
passwd_sha512,
|
|
|
|
passwd_aixmd5
|
2016-09-14 11:06:56 +08:00
|
|
|
} passwd_modes;
|
|
|
|
|
2000-02-12 00:25:44 +08:00
|
|
|
static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
|
2015-01-22 11:40:55 +08:00
|
|
|
char *passwd, BIO *out, int quiet, int table,
|
2016-09-14 11:06:56 +08:00
|
|
|
int reverse, size_t pw_maxlen, passwd_modes mode);
|
2000-02-12 00:25:44 +08:00
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
typedef enum OPTION_choice {
|
|
|
|
OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
|
|
|
|
OPT_IN,
|
|
|
|
OPT_NOVERIFY, OPT_QUIET, OPT_TABLE, OPT_REVERSE, OPT_APR1,
|
2017-07-05 22:58:48 +08:00
|
|
|
OPT_1, OPT_5, OPT_6, OPT_CRYPT, OPT_AIXMD5, OPT_SALT, OPT_STDIN,
|
2017-07-17 09:05:13 +08:00
|
|
|
OPT_R_ENUM
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
} OPTION_CHOICE;
|
|
|
|
|
2016-03-13 21:07:50 +08:00
|
|
|
const OPTIONS passwd_options[] = {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
{"help", OPT_HELP, '-', "Display this summary"},
|
2017-03-29 05:57:28 +08:00
|
|
|
{"in", OPT_IN, '<', "Read passwords from file"},
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
{"noverify", OPT_NOVERIFY, '-',
|
|
|
|
"Never verify when reading password from terminal"},
|
|
|
|
{"quiet", OPT_QUIET, '-', "No warnings"},
|
|
|
|
{"table", OPT_TABLE, '-', "Format output as table"},
|
|
|
|
{"reverse", OPT_REVERSE, '-', "Switch table columns"},
|
2015-05-16 01:50:38 +08:00
|
|
|
{"salt", OPT_SALT, 's', "Use provided salt"},
|
|
|
|
{"stdin", OPT_STDIN, '-', "Read passwords from stdin"},
|
2016-09-14 09:52:40 +08:00
|
|
|
{"6", OPT_6, '-', "SHA512-based password algorithm"},
|
|
|
|
{"5", OPT_5, '-', "SHA256-based password algorithm"},
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
{"apr1", OPT_APR1, '-', "MD5-based password algorithm, Apache variant"},
|
|
|
|
{"1", OPT_1, '-', "MD5-based password algorithm"},
|
2017-01-20 13:37:43 +08:00
|
|
|
{"aixmd5", OPT_AIXMD5, '-', "AIX MD5-based password algorithm"},
|
2017-08-23 17:43:36 +08:00
|
|
|
#ifndef OPENSSL_NO_DES
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
{"crypt", OPT_CRYPT, '-', "Standard Unix password algorithm (default)"},
|
2017-08-23 17:43:36 +08:00
|
|
|
#endif
|
2017-07-05 22:58:48 +08:00
|
|
|
OPT_R_OPTIONS,
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
{NULL}
|
|
|
|
};
|
2000-02-24 18:37:58 +08:00
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
int passwd_main(int argc, char **argv)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
BIO *in = NULL;
|
|
|
|
char *infile = NULL, *salt = NULL, *passwd = NULL, **passwds = NULL;
|
|
|
|
char *salt_malloc = NULL, *passwd_malloc = NULL, *prog;
|
|
|
|
OPTION_CHOICE o;
|
2016-03-22 01:08:57 +08:00
|
|
|
int in_stdin = 0, pw_source_defined = 0;
|
2017-08-23 17:43:36 +08:00
|
|
|
#ifndef OPENSSL_NO_UI_CONSOLE
|
2016-03-22 01:08:57 +08:00
|
|
|
int in_noverify = 0;
|
2017-08-23 17:43:36 +08:00
|
|
|
#endif
|
2015-01-22 11:40:55 +08:00
|
|
|
int passed_salt = 0, quiet = 0, table = 0, reverse = 0;
|
2016-09-14 11:06:56 +08:00
|
|
|
int ret = 1;
|
|
|
|
passwd_modes mode = passwd_unset;
|
|
|
|
size_t passwd_malloc_size = 0;
|
|
|
|
size_t pw_maxlen = 256; /* arbitrary limit, should be enough for most
|
|
|
|
* passwords */
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
|
|
|
|
prog = opt_init(argc, argv, passwd_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(passwd_options);
|
|
|
|
ret = 0;
|
|
|
|
goto end;
|
|
|
|
case OPT_IN:
|
|
|
|
if (pw_source_defined)
|
|
|
|
goto opthelp;
|
|
|
|
infile = opt_arg();
|
|
|
|
pw_source_defined = 1;
|
|
|
|
break;
|
|
|
|
case OPT_NOVERIFY:
|
2017-08-23 17:43:36 +08:00
|
|
|
#ifndef OPENSSL_NO_UI_CONSOLE
|
2015-01-22 11:40:55 +08:00
|
|
|
in_noverify = 1;
|
2017-08-23 17:43:36 +08:00
|
|
|
#endif
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
break;
|
|
|
|
case OPT_QUIET:
|
2015-01-22 11:40:55 +08:00
|
|
|
quiet = 1;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
break;
|
|
|
|
case OPT_TABLE:
|
2015-01-22 11:40:55 +08:00
|
|
|
table = 1;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
break;
|
|
|
|
case OPT_REVERSE:
|
2015-01-22 11:40:55 +08:00
|
|
|
reverse = 1;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
break;
|
2016-09-14 11:06:56 +08:00
|
|
|
case OPT_1:
|
|
|
|
if (mode != passwd_unset)
|
|
|
|
goto opthelp;
|
|
|
|
mode = passwd_md5;
|
|
|
|
break;
|
2016-09-14 09:52:40 +08:00
|
|
|
case OPT_5:
|
2016-09-14 11:06:56 +08:00
|
|
|
if (mode != passwd_unset)
|
|
|
|
goto opthelp;
|
|
|
|
mode = passwd_sha256;
|
2016-09-14 09:52:40 +08:00
|
|
|
break;
|
|
|
|
case OPT_6:
|
2016-09-14 11:06:56 +08:00
|
|
|
if (mode != passwd_unset)
|
|
|
|
goto opthelp;
|
|
|
|
mode = passwd_sha512;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
break;
|
|
|
|
case OPT_APR1:
|
2016-09-14 11:06:56 +08:00
|
|
|
if (mode != passwd_unset)
|
|
|
|
goto opthelp;
|
|
|
|
mode = passwd_apr1;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
break;
|
2017-01-20 13:37:43 +08:00
|
|
|
case OPT_AIXMD5:
|
|
|
|
if (mode != passwd_unset)
|
|
|
|
goto opthelp;
|
|
|
|
mode = passwd_aixmd5;
|
|
|
|
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-25 03:26:15 +08:00
|
|
|
case OPT_CRYPT:
|
2017-08-23 17:43:36 +08:00
|
|
|
#ifndef OPENSSL_NO_DES
|
2016-09-14 11:06:56 +08:00
|
|
|
if (mode != passwd_unset)
|
|
|
|
goto opthelp;
|
|
|
|
mode = passwd_crypt;
|
2017-08-23 17:43:36 +08:00
|
|
|
#endif
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
break;
|
|
|
|
case OPT_SALT:
|
|
|
|
passed_salt = 1;
|
|
|
|
salt = opt_arg();
|
|
|
|
break;
|
|
|
|
case OPT_STDIN:
|
|
|
|
if (pw_source_defined)
|
|
|
|
goto opthelp;
|
|
|
|
in_stdin = 1;
|
2016-04-27 00:00:33 +08:00
|
|
|
pw_source_defined = 1;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
break;
|
2017-07-05 22:58:48 +08:00
|
|
|
case OPT_R_CASES:
|
|
|
|
if (!opt_rand(o))
|
|
|
|
goto end;
|
|
|
|
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-25 03:26:15 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
argc = opt_num_rest();
|
|
|
|
argv = opt_rest();
|
|
|
|
|
2017-06-13 01:24:02 +08:00
|
|
|
if (*argv != NULL) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
if (pw_source_defined)
|
|
|
|
goto opthelp;
|
|
|
|
pw_source_defined = 1;
|
|
|
|
passwds = argv;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
2016-09-14 11:06:56 +08:00
|
|
|
if (mode == passwd_unset) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
/* use default */
|
2016-09-14 11:06:56 +08:00
|
|
|
mode = passwd_crypt;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2017-08-23 17:43:36 +08:00
|
|
|
#ifdef OPENSSL_NO_DES
|
2016-09-14 11:06:56 +08:00
|
|
|
if (mode == passwd_crypt)
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
goto opthelp;
|
2017-08-23 17:43:36 +08:00
|
|
|
#endif
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2016-03-31 14:29:39 +08:00
|
|
|
if (infile != NULL && in_stdin) {
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
BIO_printf(bio_err, "%s: Can't combine -in and -stdin\n", prog);
|
|
|
|
goto end;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
2016-03-31 14:29:39 +08:00
|
|
|
if (infile != NULL || in_stdin) {
|
|
|
|
/*
|
|
|
|
* If in_stdin is true, we know that infile is NULL, and that
|
|
|
|
* bio_open_default() will give us back an alias for stdin.
|
|
|
|
*/
|
|
|
|
in = bio_open_default(infile, 'r', FORMAT_TEXT);
|
|
|
|
if (in == NULL)
|
|
|
|
goto end;
|
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2016-09-14 11:06:56 +08:00
|
|
|
if (mode == passwd_crypt)
|
2015-01-22 11:40:55 +08:00
|
|
|
pw_maxlen = 8;
|
|
|
|
|
|
|
|
if (passwds == NULL) {
|
|
|
|
/* no passwords on the command line */
|
|
|
|
|
|
|
|
passwd_malloc_size = pw_maxlen + 2;
|
2015-05-01 05:48:31 +08:00
|
|
|
/* longer than necessary so that we can warn about truncation */
|
|
|
|
passwd = passwd_malloc =
|
|
|
|
app_malloc(passwd_malloc_size, "password buffer");
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if ((in == NULL) && (passwds == NULL)) {
|
2017-05-31 22:46:30 +08:00
|
|
|
/*
|
|
|
|
* we use the following method to make sure what
|
|
|
|
* in the 'else' section is always compiled, to
|
|
|
|
* avoid rot of not-frequently-used code.
|
|
|
|
*/
|
2016-03-22 01:08:57 +08:00
|
|
|
if (1) {
|
2017-08-23 17:43:36 +08:00
|
|
|
#ifndef OPENSSL_NO_UI_CONSOLE
|
2016-03-22 01:08:57 +08:00
|
|
|
/* build a null-terminated list */
|
|
|
|
static char *passwds_static[2] = { NULL, NULL };
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2016-03-22 01:08:57 +08:00
|
|
|
passwds = passwds_static;
|
2017-05-31 22:46:30 +08:00
|
|
|
if (in == NULL) {
|
2016-03-22 01:08:57 +08:00
|
|
|
if (EVP_read_pw_string
|
|
|
|
(passwd_malloc, passwd_malloc_size, "Password: ",
|
|
|
|
!(passed_salt || in_noverify)) != 0)
|
|
|
|
goto end;
|
2017-05-31 22:46:30 +08:00
|
|
|
}
|
2016-03-22 01:08:57 +08:00
|
|
|
passwds[0] = passwd_malloc;
|
|
|
|
} else {
|
2017-08-23 17:43:36 +08:00
|
|
|
#endif
|
2016-03-22 01:08:57 +08:00
|
|
|
BIO_printf(bio_err, "password required\n");
|
|
|
|
goto end;
|
|
|
|
}
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (in == NULL) {
|
|
|
|
assert(passwds != NULL);
|
|
|
|
assert(*passwds != NULL);
|
|
|
|
|
|
|
|
do { /* loop over list of passwords */
|
|
|
|
passwd = *passwds++;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, bio_out,
|
2016-09-14 11:06:56 +08:00
|
|
|
quiet, table, reverse, pw_maxlen, 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-25 03:26:15 +08:00
|
|
|
goto end;
|
2017-05-31 22:46:30 +08:00
|
|
|
} while (*passwds != NULL);
|
|
|
|
} else {
|
2015-01-22 11:40:55 +08:00
|
|
|
/* in != NULL */
|
|
|
|
int done;
|
|
|
|
|
|
|
|
assert(passwd != NULL);
|
|
|
|
do {
|
|
|
|
int r = BIO_gets(in, passwd, pw_maxlen + 1);
|
|
|
|
if (r > 0) {
|
|
|
|
char *c = (strchr(passwd, '\n'));
|
2017-05-31 22:46:30 +08:00
|
|
|
if (c != NULL) {
|
2015-01-22 11:40:55 +08:00
|
|
|
*c = 0; /* truncate at newline */
|
2017-05-31 22:46:30 +08:00
|
|
|
} else {
|
2015-01-22 11:40:55 +08:00
|
|
|
/* ignore rest of line */
|
|
|
|
char trash[BUFSIZ];
|
|
|
|
do
|
2017-12-08 02:39:34 +08:00
|
|
|
r = BIO_gets(in, trash, sizeof(trash));
|
2015-01-22 11:40:55 +08:00
|
|
|
while ((r > 0) && (!strchr(trash, '\n')));
|
|
|
|
}
|
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
if (!do_passwd
|
|
|
|
(passed_salt, &salt, &salt_malloc, passwd, bio_out, quiet,
|
2016-09-14 11:06:56 +08:00
|
|
|
table, reverse, pw_maxlen, 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-25 03:26:15 +08:00
|
|
|
goto end;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
done = (r <= 0);
|
2017-05-31 22:46:30 +08:00
|
|
|
} while (!done);
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
end:
|
2017-08-23 22:03:18 +08:00
|
|
|
#if 0
|
2015-01-22 11:40:55 +08:00
|
|
|
ERR_print_errors(bio_err);
|
2017-08-23 22:03:18 +08:00
|
|
|
#endif
|
2015-05-01 22:02:07 +08:00
|
|
|
OPENSSL_free(salt_malloc);
|
|
|
|
OPENSSL_free(passwd_malloc);
|
2015-03-25 23:31:18 +08:00
|
|
|
BIO_free(in);
|
2017-10-17 22:04:09 +08:00
|
|
|
return ret;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* MD5-based password algorithm (should probably be available as a library
|
|
|
|
* function; then the static buffer would not be acceptable). For magic
|
|
|
|
* string "1", this should be compatible to the MD5-based BSD password
|
|
|
|
* algorithm. For 'magic' string "apr1", this is compatible to the MD5-based
|
|
|
|
* Apache password algorithm. (Apparently, the Apache password algorithm is
|
|
|
|
* identical except that the 'magic' string was changed -- the laziest
|
|
|
|
* application of the NIH principle I've ever encountered.)
|
2000-06-24 02:00:16 +08:00
|
|
|
*/
|
|
|
|
static char *md5crypt(const char *passwd, const char *magic, const char *salt)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
/* "$apr1$..salt..$.......md5hash..........\0" */
|
|
|
|
static char out_buf[6 + 9 + 24 + 2];
|
|
|
|
unsigned char buf[MD5_DIGEST_LENGTH];
|
2017-08-23 22:03:18 +08:00
|
|
|
char ascii_magic[5]; /* "apr1" plus '\0' */
|
|
|
|
char ascii_salt[9]; /* Max 8 chars plus '\0' */
|
|
|
|
char *ascii_passwd = NULL;
|
2015-01-22 11:40:55 +08:00
|
|
|
char *salt_out;
|
|
|
|
int n;
|
|
|
|
unsigned int i;
|
2016-06-18 22:46:13 +08:00
|
|
|
EVP_MD_CTX *md = NULL, *md2 = NULL;
|
2016-05-10 00:42:58 +08:00
|
|
|
size_t passwd_len, salt_len, magic_len;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
passwd_len = strlen(passwd);
|
2017-01-20 13:37:43 +08:00
|
|
|
|
|
|
|
out_buf[0] = 0;
|
2016-05-10 00:42:58 +08:00
|
|
|
magic_len = strlen(magic);
|
2017-12-08 02:39:34 +08:00
|
|
|
OPENSSL_strlcpy(ascii_magic, magic, sizeof(ascii_magic));
|
2017-08-23 22:03:18 +08:00
|
|
|
#ifdef CHARSET_EBCDIC
|
|
|
|
if ((magic[0] & 0x80) != 0) /* High bit is 1 in EBCDIC alnums */
|
|
|
|
ebcdic2ascii(ascii_magic, ascii_magic, magic_len);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* The salt gets truncated to 8 chars */
|
2017-12-08 02:39:34 +08:00
|
|
|
OPENSSL_strlcpy(ascii_salt, salt, sizeof(ascii_salt));
|
2017-08-23 22:03:18 +08:00
|
|
|
salt_len = strlen(ascii_salt);
|
|
|
|
#ifdef CHARSET_EBCDIC
|
|
|
|
ebcdic2ascii(ascii_salt, ascii_salt, salt_len);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CHARSET_EBCDIC
|
|
|
|
ascii_passwd = OPENSSL_strdup(passwd);
|
|
|
|
if (ascii_passwd == NULL)
|
|
|
|
return NULL;
|
|
|
|
ebcdic2ascii(ascii_passwd, ascii_passwd, passwd_len);
|
|
|
|
passwd = ascii_passwd;
|
|
|
|
#endif
|
2016-05-10 00:42:58 +08:00
|
|
|
|
2017-01-20 13:37:43 +08:00
|
|
|
if (magic_len > 0) {
|
2017-12-08 02:39:34 +08:00
|
|
|
OPENSSL_strlcat(out_buf, ascii_dollar, sizeof(out_buf));
|
2017-01-20 13:37:43 +08:00
|
|
|
|
|
|
|
if (magic_len > 4) /* assert it's "1" or "apr1" */
|
2017-08-23 22:03:18 +08:00
|
|
|
goto err;
|
2017-01-20 13:37:43 +08:00
|
|
|
|
2017-12-08 02:39:34 +08:00
|
|
|
OPENSSL_strlcat(out_buf, ascii_magic, sizeof(out_buf));
|
|
|
|
OPENSSL_strlcat(out_buf, ascii_dollar, sizeof(out_buf));
|
2017-01-20 13:37:43 +08:00
|
|
|
}
|
2016-05-10 00:42:58 +08:00
|
|
|
|
2017-12-08 02:39:34 +08:00
|
|
|
OPENSSL_strlcat(out_buf, ascii_salt, sizeof(out_buf));
|
2016-05-10 00:42:58 +08:00
|
|
|
|
2016-05-19 14:39:47 +08:00
|
|
|
if (strlen(out_buf) > 6 + 8) /* assert "$apr1$..salt.." */
|
2017-08-23 22:03:18 +08:00
|
|
|
goto err;
|
2016-05-10 00:42:58 +08:00
|
|
|
|
2017-01-20 13:37:43 +08:00
|
|
|
salt_out = out_buf;
|
|
|
|
if (magic_len > 0)
|
|
|
|
salt_out += 2 + magic_len;
|
2016-05-10 00:42:58 +08:00
|
|
|
|
|
|
|
if (salt_len > 8)
|
2017-08-23 22:03:18 +08:00
|
|
|
goto err;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2015-12-02 07:49:35 +08:00
|
|
|
md = EVP_MD_CTX_new();
|
2016-06-18 22:46:13 +08:00
|
|
|
if (md == NULL
|
|
|
|
|| !EVP_DigestInit_ex(md, EVP_md5(), NULL)
|
2017-01-20 13:37:43 +08:00
|
|
|
|| !EVP_DigestUpdate(md, passwd, passwd_len))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
if (magic_len > 0)
|
2017-08-23 22:03:18 +08:00
|
|
|
if (!EVP_DigestUpdate(md, ascii_dollar, 1)
|
|
|
|
|| !EVP_DigestUpdate(md, ascii_magic, magic_len)
|
|
|
|
|| !EVP_DigestUpdate(md, ascii_dollar, 1))
|
2017-01-20 13:37:43 +08:00
|
|
|
goto err;
|
|
|
|
|
2017-08-23 22:03:18 +08:00
|
|
|
if (!EVP_DigestUpdate(md, ascii_salt, salt_len))
|
2016-09-14 04:48:35 +08:00
|
|
|
goto err;
|
2015-11-27 21:02:12 +08:00
|
|
|
|
2015-12-02 07:49:35 +08:00
|
|
|
md2 = EVP_MD_CTX_new();
|
2016-06-18 22:46:13 +08:00
|
|
|
if (md2 == NULL
|
|
|
|
|| !EVP_DigestInit_ex(md2, EVP_md5(), NULL)
|
|
|
|
|| !EVP_DigestUpdate(md2, passwd, passwd_len)
|
2017-08-23 22:03:18 +08:00
|
|
|
|| !EVP_DigestUpdate(md2, ascii_salt, salt_len)
|
2016-06-18 22:46:13 +08:00
|
|
|
|| !EVP_DigestUpdate(md2, passwd, passwd_len)
|
|
|
|
|| !EVP_DigestFinal_ex(md2, buf, NULL))
|
|
|
|
goto err;
|
|
|
|
|
2017-12-08 02:39:34 +08:00
|
|
|
for (i = passwd_len; i > sizeof(buf); i -= sizeof(buf)) {
|
|
|
|
if (!EVP_DigestUpdate(md, buf, sizeof(buf)))
|
2016-06-18 22:46:13 +08:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (!EVP_DigestUpdate(md, buf, i))
|
|
|
|
goto err;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
n = passwd_len;
|
|
|
|
while (n) {
|
2016-06-18 22:46:13 +08:00
|
|
|
if (!EVP_DigestUpdate(md, (n & 1) ? "\0" : passwd, 1))
|
|
|
|
goto err;
|
2015-01-22 11:40:55 +08:00
|
|
|
n >>= 1;
|
|
|
|
}
|
2016-06-18 22:46:13 +08:00
|
|
|
if (!EVP_DigestFinal_ex(md, buf, NULL))
|
|
|
|
return NULL;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
for (i = 0; i < 1000; i++) {
|
2016-06-18 22:46:13 +08:00
|
|
|
if (!EVP_DigestInit_ex(md2, EVP_md5(), NULL))
|
|
|
|
goto err;
|
|
|
|
if (!EVP_DigestUpdate(md2,
|
|
|
|
(i & 1) ? (unsigned const char *)passwd : buf,
|
2017-12-08 02:39:34 +08:00
|
|
|
(i & 1) ? passwd_len : sizeof(buf)))
|
2016-06-18 22:46:13 +08:00
|
|
|
goto err;
|
|
|
|
if (i % 3) {
|
2017-08-23 22:03:18 +08:00
|
|
|
if (!EVP_DigestUpdate(md2, ascii_salt, salt_len))
|
2016-06-18 22:46:13 +08:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (i % 7) {
|
|
|
|
if (!EVP_DigestUpdate(md2, passwd, passwd_len))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (!EVP_DigestUpdate(md2,
|
|
|
|
(i & 1) ? buf : (unsigned const char *)passwd,
|
2017-12-08 02:39:34 +08:00
|
|
|
(i & 1) ? sizeof(buf) : passwd_len))
|
2016-06-18 22:46:13 +08:00
|
|
|
goto err;
|
|
|
|
if (!EVP_DigestFinal_ex(md2, buf, NULL))
|
|
|
|
goto err;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2015-12-02 07:49:35 +08:00
|
|
|
EVP_MD_CTX_free(md2);
|
|
|
|
EVP_MD_CTX_free(md);
|
2016-06-18 22:46:13 +08:00
|
|
|
md2 = NULL;
|
|
|
|
md = NULL;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
{
|
|
|
|
/* transform buf into output string */
|
2017-12-08 02:39:34 +08:00
|
|
|
unsigned char buf_perm[sizeof(buf)];
|
2015-01-22 11:40:55 +08:00
|
|
|
int dest, source;
|
|
|
|
char *output;
|
|
|
|
|
|
|
|
/* silly output permutation */
|
|
|
|
for (dest = 0, source = 0; dest < 14;
|
|
|
|
dest++, source = (source + 6) % 17)
|
|
|
|
buf_perm[dest] = buf[source];
|
|
|
|
buf_perm[14] = buf[5];
|
|
|
|
buf_perm[15] = buf[11];
|
2017-08-23 17:43:36 +08:00
|
|
|
# ifndef PEDANTIC /* Unfortunately, this generates a "no
|
2015-01-22 11:40:55 +08:00
|
|
|
* effect" warning */
|
2017-12-08 02:39:34 +08:00
|
|
|
assert(16 == sizeof(buf_perm));
|
2017-08-23 17:43:36 +08:00
|
|
|
# endif
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
output = salt_out + salt_len;
|
|
|
|
assert(output == out_buf + strlen(out_buf));
|
|
|
|
|
2017-08-23 22:03:18 +08:00
|
|
|
*output++ = ascii_dollar[0];
|
2015-01-22 11:40:55 +08:00
|
|
|
|
|
|
|
for (i = 0; i < 15; i += 3) {
|
|
|
|
*output++ = cov_2char[buf_perm[i + 2] & 0x3f];
|
|
|
|
*output++ = cov_2char[((buf_perm[i + 1] & 0xf) << 2) |
|
|
|
|
(buf_perm[i + 2] >> 6)];
|
|
|
|
*output++ = cov_2char[((buf_perm[i] & 3) << 4) |
|
|
|
|
(buf_perm[i + 1] >> 4)];
|
|
|
|
*output++ = cov_2char[buf_perm[i] >> 2];
|
|
|
|
}
|
|
|
|
assert(i == 15);
|
|
|
|
*output++ = cov_2char[buf_perm[i] & 0x3f];
|
|
|
|
*output++ = cov_2char[buf_perm[i] >> 6];
|
|
|
|
*output = 0;
|
|
|
|
assert(strlen(out_buf) < sizeof(out_buf));
|
2017-08-23 22:03:18 +08:00
|
|
|
#ifdef CHARSET_EBCDIC
|
|
|
|
ascii2ebcdic(out_buf, out_buf, strlen(out_buf));
|
|
|
|
#endif
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return out_buf;
|
2016-06-18 22:46:13 +08:00
|
|
|
|
|
|
|
err:
|
2017-08-23 22:03:18 +08:00
|
|
|
OPENSSL_free(ascii_passwd);
|
2016-06-18 22:46:13 +08:00
|
|
|
EVP_MD_CTX_free(md2);
|
|
|
|
EVP_MD_CTX_free(md);
|
|
|
|
return NULL;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
2000-02-12 00:25:44 +08:00
|
|
|
|
2016-09-14 09:52:40 +08:00
|
|
|
/*
|
|
|
|
* SHA based password algorithm, describe by Ulrich Drepper here:
|
|
|
|
* https://www.akkadia.org/drepper/SHA-crypt.txt
|
|
|
|
* (note that it's in the public domain)
|
|
|
|
*/
|
|
|
|
static char *shacrypt(const char *passwd, const char *magic, const char *salt)
|
|
|
|
{
|
|
|
|
/* Prefix for optional rounds specification. */
|
|
|
|
static const char rounds_prefix[] = "rounds=";
|
|
|
|
/* Maximum salt string length. */
|
2017-08-23 17:43:36 +08:00
|
|
|
# define SALT_LEN_MAX 16
|
2016-09-14 09:52:40 +08:00
|
|
|
/* Default number of rounds if not explicitly specified. */
|
2017-08-23 17:43:36 +08:00
|
|
|
# define ROUNDS_DEFAULT 5000
|
2016-09-14 09:52:40 +08:00
|
|
|
/* Minimum number of rounds. */
|
2017-08-23 17:43:36 +08:00
|
|
|
# define ROUNDS_MIN 1000
|
2016-09-14 09:52:40 +08:00
|
|
|
/* Maximum number of rounds. */
|
2017-08-23 17:43:36 +08:00
|
|
|
# define ROUNDS_MAX 999999999
|
2016-09-14 09:52:40 +08:00
|
|
|
|
|
|
|
/* "$6$rounds=<N>$......salt......$...shahash(up to 86 chars)...\0" */
|
|
|
|
static char out_buf[3 + 17 + 17 + 86 + 1];
|
|
|
|
unsigned char buf[SHA512_DIGEST_LENGTH];
|
|
|
|
unsigned char temp_buf[SHA512_DIGEST_LENGTH];
|
|
|
|
size_t buf_size = 0;
|
2017-08-23 22:03:18 +08:00
|
|
|
char ascii_magic[2];
|
|
|
|
char ascii_salt[17]; /* Max 16 chars plus '\0' */
|
|
|
|
char *ascii_passwd = NULL;
|
2016-09-14 09:52:40 +08:00
|
|
|
size_t n;
|
|
|
|
EVP_MD_CTX *md = NULL, *md2 = NULL;
|
|
|
|
const EVP_MD *sha = NULL;
|
|
|
|
size_t passwd_len, salt_len, magic_len;
|
2017-03-27 04:38:05 +08:00
|
|
|
unsigned int rounds = 5000; /* Default */
|
2016-09-14 09:52:40 +08:00
|
|
|
char rounds_custom = 0;
|
|
|
|
char *p_bytes = NULL;
|
|
|
|
char *s_bytes = NULL;
|
|
|
|
char *cp = NULL;
|
|
|
|
|
|
|
|
passwd_len = strlen(passwd);
|
|
|
|
magic_len = strlen(magic);
|
|
|
|
|
|
|
|
/* assert it's "5" or "6" */
|
|
|
|
if (magic_len != 1)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
switch (magic[0]) {
|
|
|
|
case '5':
|
|
|
|
sha = EVP_sha256();
|
|
|
|
buf_size = 32;
|
|
|
|
break;
|
|
|
|
case '6':
|
|
|
|
sha = EVP_sha512();
|
|
|
|
buf_size = 64;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strncmp(salt, rounds_prefix, sizeof(rounds_prefix) - 1) == 0) {
|
|
|
|
const char *num = salt + sizeof(rounds_prefix) - 1;
|
|
|
|
char *endp;
|
|
|
|
unsigned long int srounds = strtoul (num, &endp, 10);
|
|
|
|
if (*endp == '$') {
|
|
|
|
salt = endp + 1;
|
|
|
|
if (srounds > ROUNDS_MAX)
|
|
|
|
rounds = ROUNDS_MAX;
|
|
|
|
else if (srounds < ROUNDS_MIN)
|
|
|
|
rounds = ROUNDS_MIN;
|
|
|
|
else
|
2017-03-27 04:38:05 +08:00
|
|
|
rounds = (unsigned int)srounds;
|
2016-09-14 09:52:40 +08:00
|
|
|
rounds_custom = 1;
|
|
|
|
} else {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-12-08 02:39:34 +08:00
|
|
|
OPENSSL_strlcpy(ascii_magic, magic, sizeof(ascii_magic));
|
2017-08-23 22:03:18 +08:00
|
|
|
#ifdef CHARSET_EBCDIC
|
|
|
|
if ((magic[0] & 0x80) != 0) /* High bit is 1 in EBCDIC alnums */
|
|
|
|
ebcdic2ascii(ascii_magic, ascii_magic, magic_len);
|
|
|
|
#endif
|
|
|
|
|
2016-09-14 09:52:40 +08:00
|
|
|
/* The salt gets truncated to 16 chars */
|
2017-12-08 02:39:34 +08:00
|
|
|
OPENSSL_strlcpy(ascii_salt, salt, sizeof(ascii_salt));
|
2017-08-23 22:03:18 +08:00
|
|
|
salt_len = strlen(ascii_salt);
|
|
|
|
#ifdef CHARSET_EBCDIC
|
|
|
|
ebcdic2ascii(ascii_salt, ascii_salt, salt_len);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CHARSET_EBCDIC
|
|
|
|
ascii_passwd = OPENSSL_strdup(passwd);
|
|
|
|
if (ascii_passwd == NULL)
|
|
|
|
return NULL;
|
|
|
|
ebcdic2ascii(ascii_passwd, ascii_passwd, passwd_len);
|
|
|
|
passwd = ascii_passwd;
|
|
|
|
#endif
|
2016-09-14 09:52:40 +08:00
|
|
|
|
|
|
|
out_buf[0] = 0;
|
2017-12-08 02:39:34 +08:00
|
|
|
OPENSSL_strlcat(out_buf, ascii_dollar, sizeof(out_buf));
|
|
|
|
OPENSSL_strlcat(out_buf, ascii_magic, sizeof(out_buf));
|
|
|
|
OPENSSL_strlcat(out_buf, ascii_dollar, sizeof(out_buf));
|
2016-09-14 09:52:40 +08:00
|
|
|
if (rounds_custom) {
|
2017-02-17 20:23:22 +08:00
|
|
|
char tmp_buf[80]; /* "rounds=999999999" */
|
2017-03-27 04:38:05 +08:00
|
|
|
sprintf(tmp_buf, "rounds=%u", rounds);
|
2017-08-23 22:03:18 +08:00
|
|
|
#ifdef CHARSET_EBCDIC
|
|
|
|
/* In case we're really on a ASCII based platform and just pretend */
|
|
|
|
if (tmp_buf[0] != 0x72) /* ASCII 'r' */
|
|
|
|
ebcdic2ascii(tmp_buf, tmp_buf, strlen(tmp_buf));
|
|
|
|
#endif
|
2017-12-08 02:39:34 +08:00
|
|
|
OPENSSL_strlcat(out_buf, tmp_buf, sizeof(out_buf));
|
|
|
|
OPENSSL_strlcat(out_buf, ascii_dollar, sizeof(out_buf));
|
2016-09-14 09:52:40 +08:00
|
|
|
}
|
2017-12-08 02:39:34 +08:00
|
|
|
OPENSSL_strlcat(out_buf, ascii_salt, sizeof(out_buf));
|
2016-09-14 09:52:40 +08:00
|
|
|
|
|
|
|
/* assert "$5$rounds=999999999$......salt......" */
|
|
|
|
if (strlen(out_buf) > 3 + 17 * rounds_custom + salt_len )
|
2017-08-23 22:03:18 +08:00
|
|
|
goto err;
|
2016-09-14 09:52:40 +08:00
|
|
|
|
|
|
|
md = EVP_MD_CTX_new();
|
|
|
|
if (md == NULL
|
|
|
|
|| !EVP_DigestInit_ex(md, sha, NULL)
|
|
|
|
|| !EVP_DigestUpdate(md, passwd, passwd_len)
|
2017-08-23 22:03:18 +08:00
|
|
|
|| !EVP_DigestUpdate(md, ascii_salt, salt_len))
|
2016-09-14 09:52:40 +08:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
md2 = EVP_MD_CTX_new();
|
|
|
|
if (md2 == NULL
|
|
|
|
|| !EVP_DigestInit_ex(md2, sha, NULL)
|
|
|
|
|| !EVP_DigestUpdate(md2, passwd, passwd_len)
|
2017-08-23 22:03:18 +08:00
|
|
|
|| !EVP_DigestUpdate(md2, ascii_salt, salt_len)
|
2016-09-14 09:52:40 +08:00
|
|
|
|| !EVP_DigestUpdate(md2, passwd, passwd_len)
|
|
|
|
|| !EVP_DigestFinal_ex(md2, buf, NULL))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
for (n = passwd_len; n > buf_size; n -= buf_size) {
|
|
|
|
if (!EVP_DigestUpdate(md, buf, buf_size))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (!EVP_DigestUpdate(md, buf, n))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
n = passwd_len;
|
|
|
|
while (n) {
|
|
|
|
if (!EVP_DigestUpdate(md,
|
|
|
|
(n & 1) ? buf : (unsigned const char *)passwd,
|
|
|
|
(n & 1) ? buf_size : passwd_len))
|
|
|
|
goto err;
|
|
|
|
n >>= 1;
|
|
|
|
}
|
|
|
|
if (!EVP_DigestFinal_ex(md, buf, NULL))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* P sequence */
|
|
|
|
if (!EVP_DigestInit_ex(md2, sha, NULL))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
for (n = passwd_len; n > 0; n--)
|
|
|
|
if (!EVP_DigestUpdate(md2, passwd, passwd_len))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
if (!EVP_DigestFinal_ex(md2, temp_buf, NULL))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if ((p_bytes = OPENSSL_zalloc(passwd_len)) == NULL)
|
|
|
|
goto err;
|
|
|
|
for (cp = p_bytes, n = passwd_len; n > buf_size; n -= buf_size, cp += buf_size)
|
|
|
|
memcpy(cp, temp_buf, buf_size);
|
|
|
|
memcpy(cp, temp_buf, n);
|
|
|
|
|
|
|
|
/* S sequence */
|
|
|
|
if (!EVP_DigestInit_ex(md2, sha, NULL))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
for (n = 16 + buf[0]; n > 0; n--)
|
2017-08-23 22:03:18 +08:00
|
|
|
if (!EVP_DigestUpdate(md2, ascii_salt, salt_len))
|
2016-09-14 09:52:40 +08:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
if (!EVP_DigestFinal_ex(md2, temp_buf, NULL))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if ((s_bytes = OPENSSL_zalloc(salt_len)) == NULL)
|
|
|
|
goto err;
|
|
|
|
for (cp = s_bytes, n = salt_len; n > buf_size; n -= buf_size, cp += buf_size)
|
|
|
|
memcpy(cp, temp_buf, buf_size);
|
|
|
|
memcpy(cp, temp_buf, n);
|
|
|
|
|
|
|
|
for (n = 0; n < rounds; n++) {
|
|
|
|
if (!EVP_DigestInit_ex(md2, sha, NULL))
|
|
|
|
goto err;
|
|
|
|
if (!EVP_DigestUpdate(md2,
|
|
|
|
(n & 1) ? (unsigned const char *)p_bytes : buf,
|
|
|
|
(n & 1) ? passwd_len : buf_size))
|
|
|
|
goto err;
|
|
|
|
if (n % 3) {
|
|
|
|
if (!EVP_DigestUpdate(md2, s_bytes, salt_len))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (n % 7) {
|
|
|
|
if (!EVP_DigestUpdate(md2, p_bytes, passwd_len))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (!EVP_DigestUpdate(md2,
|
|
|
|
(n & 1) ? buf : (unsigned const char *)p_bytes,
|
|
|
|
(n & 1) ? buf_size : passwd_len))
|
|
|
|
goto err;
|
|
|
|
if (!EVP_DigestFinal_ex(md2, buf, NULL))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
EVP_MD_CTX_free(md2);
|
|
|
|
EVP_MD_CTX_free(md);
|
|
|
|
md2 = NULL;
|
|
|
|
md = NULL;
|
|
|
|
OPENSSL_free(p_bytes);
|
|
|
|
OPENSSL_free(s_bytes);
|
|
|
|
p_bytes = NULL;
|
|
|
|
s_bytes = NULL;
|
|
|
|
|
|
|
|
cp = out_buf + strlen(out_buf);
|
2017-08-23 22:03:18 +08:00
|
|
|
*cp++ = ascii_dollar[0];
|
2016-09-14 09:52:40 +08:00
|
|
|
|
2017-08-23 17:43:36 +08:00
|
|
|
# define b64_from_24bit(B2, B1, B0, N) \
|
2016-09-14 09:52:40 +08:00
|
|
|
do { \
|
|
|
|
unsigned int w = ((B2) << 16) | ((B1) << 8) | (B0); \
|
|
|
|
int i = (N); \
|
|
|
|
while (i-- > 0) \
|
|
|
|
{ \
|
|
|
|
*cp++ = cov_2char[w & 0x3f]; \
|
|
|
|
w >>= 6; \
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
|
2017-08-23 22:03:18 +08:00
|
|
|
switch (magic[0]) {
|
2016-09-14 09:52:40 +08:00
|
|
|
case '5':
|
|
|
|
b64_from_24bit (buf[0], buf[10], buf[20], 4);
|
|
|
|
b64_from_24bit (buf[21], buf[1], buf[11], 4);
|
|
|
|
b64_from_24bit (buf[12], buf[22], buf[2], 4);
|
|
|
|
b64_from_24bit (buf[3], buf[13], buf[23], 4);
|
|
|
|
b64_from_24bit (buf[24], buf[4], buf[14], 4);
|
|
|
|
b64_from_24bit (buf[15], buf[25], buf[5], 4);
|
|
|
|
b64_from_24bit (buf[6], buf[16], buf[26], 4);
|
|
|
|
b64_from_24bit (buf[27], buf[7], buf[17], 4);
|
|
|
|
b64_from_24bit (buf[18], buf[28], buf[8], 4);
|
|
|
|
b64_from_24bit (buf[9], buf[19], buf[29], 4);
|
|
|
|
b64_from_24bit (0, buf[31], buf[30], 3);
|
|
|
|
break;
|
|
|
|
case '6':
|
|
|
|
b64_from_24bit (buf[0], buf[21], buf[42], 4);
|
|
|
|
b64_from_24bit (buf[22], buf[43], buf[1], 4);
|
|
|
|
b64_from_24bit (buf[44], buf[2], buf[23], 4);
|
|
|
|
b64_from_24bit (buf[3], buf[24], buf[45], 4);
|
|
|
|
b64_from_24bit (buf[25], buf[46], buf[4], 4);
|
|
|
|
b64_from_24bit (buf[47], buf[5], buf[26], 4);
|
|
|
|
b64_from_24bit (buf[6], buf[27], buf[48], 4);
|
|
|
|
b64_from_24bit (buf[28], buf[49], buf[7], 4);
|
|
|
|
b64_from_24bit (buf[50], buf[8], buf[29], 4);
|
|
|
|
b64_from_24bit (buf[9], buf[30], buf[51], 4);
|
|
|
|
b64_from_24bit (buf[31], buf[52], buf[10], 4);
|
|
|
|
b64_from_24bit (buf[53], buf[11], buf[32], 4);
|
|
|
|
b64_from_24bit (buf[12], buf[33], buf[54], 4);
|
|
|
|
b64_from_24bit (buf[34], buf[55], buf[13], 4);
|
|
|
|
b64_from_24bit (buf[56], buf[14], buf[35], 4);
|
|
|
|
b64_from_24bit (buf[15], buf[36], buf[57], 4);
|
|
|
|
b64_from_24bit (buf[37], buf[58], buf[16], 4);
|
|
|
|
b64_from_24bit (buf[59], buf[17], buf[38], 4);
|
|
|
|
b64_from_24bit (buf[18], buf[39], buf[60], 4);
|
|
|
|
b64_from_24bit (buf[40], buf[61], buf[19], 4);
|
|
|
|
b64_from_24bit (buf[62], buf[20], buf[41], 4);
|
|
|
|
b64_from_24bit (0, 0, buf[63], 2);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
*cp = '\0';
|
2017-08-23 22:03:18 +08:00
|
|
|
#ifdef CHARSET_EBCDIC
|
|
|
|
ascii2ebcdic(out_buf, out_buf, strlen(out_buf));
|
|
|
|
#endif
|
2016-09-14 09:52:40 +08:00
|
|
|
|
|
|
|
return out_buf;
|
|
|
|
|
|
|
|
err:
|
|
|
|
EVP_MD_CTX_free(md2);
|
|
|
|
EVP_MD_CTX_free(md);
|
|
|
|
OPENSSL_free(p_bytes);
|
|
|
|
OPENSSL_free(s_bytes);
|
2017-08-23 22:03:18 +08:00
|
|
|
OPENSSL_free(ascii_passwd);
|
2016-09-14 09:52:40 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2000-02-12 00:25:44 +08:00
|
|
|
static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
|
2015-01-22 11:40:55 +08:00
|
|
|
char *passwd, BIO *out, int quiet, int table,
|
2016-09-14 11:06:56 +08:00
|
|
|
int reverse, size_t pw_maxlen, passwd_modes mode)
|
2015-01-22 11:40:55 +08:00
|
|
|
{
|
|
|
|
char *hash = NULL;
|
|
|
|
|
|
|
|
assert(salt_p != NULL);
|
|
|
|
assert(salt_malloc_p != NULL);
|
|
|
|
|
|
|
|
/* first make sure we have a salt */
|
|
|
|
if (!passed_salt) {
|
2017-08-23 22:03:18 +08:00
|
|
|
size_t saltlen = 0;
|
|
|
|
size_t i;
|
|
|
|
|
2017-08-23 17:43:36 +08:00
|
|
|
#ifndef OPENSSL_NO_DES
|
2017-08-23 22:03:18 +08:00
|
|
|
if (mode == passwd_crypt)
|
|
|
|
saltlen = 2;
|
2017-08-23 17:43:36 +08:00
|
|
|
#endif /* !OPENSSL_NO_DES */
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2017-08-23 22:03:18 +08:00
|
|
|
if (mode == passwd_md5 || mode == passwd_apr1 || mode == passwd_aixmd5)
|
|
|
|
saltlen = 8;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2017-08-23 22:03:18 +08:00
|
|
|
if (mode == passwd_sha256 || mode == passwd_sha512)
|
|
|
|
saltlen = 16;
|
2015-01-22 11:40:55 +08:00
|
|
|
|
2017-08-23 22:03:18 +08:00
|
|
|
assert(saltlen != 0);
|
2016-09-14 09:52:40 +08:00
|
|
|
|
2017-08-23 22:03:18 +08:00
|
|
|
if (*salt_malloc_p == NULL)
|
|
|
|
*salt_p = *salt_malloc_p = app_malloc(saltlen + 1, "salt buffer");
|
|
|
|
if (RAND_bytes((unsigned char *)*salt_p, saltlen) <= 0)
|
|
|
|
goto end;
|
2016-09-14 09:52:40 +08:00
|
|
|
|
2017-08-23 22:03:18 +08:00
|
|
|
for (i = 0; i < saltlen; i++)
|
|
|
|
(*salt_p)[i] = cov_2char[(*salt_p)[i] & 0x3f]; /* 6 bits */
|
|
|
|
(*salt_p)[i] = 0;
|
|
|
|
# ifdef CHARSET_EBCDIC
|
|
|
|
/* The password encryption funtion will convert back to ASCII */
|
|
|
|
ascii2ebcdic(*salt_p, *salt_p, saltlen);
|
|
|
|
# endif
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
assert(*salt_p != NULL);
|
|
|
|
|
|
|
|
/* truncate password if necessary */
|
|
|
|
if ((strlen(passwd) > pw_maxlen)) {
|
|
|
|
if (!quiet)
|
|
|
|
/*
|
|
|
|
* XXX: really we should know how to print a size_t, not cast it
|
|
|
|
*/
|
|
|
|
BIO_printf(bio_err,
|
|
|
|
"Warning: truncating password to %u characters\n",
|
|
|
|
(unsigned)pw_maxlen);
|
|
|
|
passwd[pw_maxlen] = 0;
|
|
|
|
}
|
|
|
|
assert(strlen(passwd) <= pw_maxlen);
|
|
|
|
|
|
|
|
/* now compute password hash */
|
2017-08-23 17:43:36 +08:00
|
|
|
#ifndef OPENSSL_NO_DES
|
2016-09-14 11:06:56 +08:00
|
|
|
if (mode == passwd_crypt)
|
2015-01-22 11:40:55 +08:00
|
|
|
hash = DES_crypt(passwd, *salt_p);
|
2017-08-23 17:43:36 +08:00
|
|
|
#endif
|
2016-09-14 11:06:56 +08:00
|
|
|
if (mode == passwd_md5 || mode == passwd_apr1)
|
|
|
|
hash = md5crypt(passwd, (mode == passwd_md5 ? "1" : "apr1"), *salt_p);
|
2017-01-20 13:37:43 +08:00
|
|
|
if (mode == passwd_aixmd5)
|
|
|
|
hash = md5crypt(passwd, "", *salt_p);
|
2016-09-14 11:06:56 +08:00
|
|
|
if (mode == passwd_sha256 || mode == passwd_sha512)
|
|
|
|
hash = shacrypt(passwd, (mode == passwd_sha256 ? "5" : "6"), *salt_p);
|
2015-01-22 11:40:55 +08:00
|
|
|
assert(hash != NULL);
|
|
|
|
|
|
|
|
if (table && !reverse)
|
|
|
|
BIO_printf(out, "%s\t%s\n", passwd, hash);
|
|
|
|
else if (table && reverse)
|
|
|
|
BIO_printf(out, "%s\t%s\n", hash, passwd);
|
|
|
|
else
|
|
|
|
BIO_printf(out, "%s\n", hash);
|
2016-08-01 19:07:48 +08:00
|
|
|
return 1;
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-25 03:26:15 +08:00
|
|
|
|
|
|
|
end:
|
2016-08-01 19:07:48 +08:00
|
|
|
return 0;
|
2015-01-22 11:40:55 +08:00
|
|
|
}
|