mirror of
https://github.com/openssl/openssl.git
synced 2024-12-17 05:53:49 +08:00
7e1b748570
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
149 lines
4.9 KiB
C
149 lines
4.9 KiB
C
/* ====================================================================
|
|
* Copyright (c) 2004 The OpenSSL Project. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
*
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
*
|
|
* 3. All advertising materials mentioning features or use of this
|
|
* software must display the following acknowledgment:
|
|
* "This product includes software developed by the OpenSSL Project
|
|
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
|
|
*
|
|
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
|
* endorse or promote products derived from this software without
|
|
* prior written permission. For written permission, please contact
|
|
* openssl-core@openssl.org.
|
|
*
|
|
* 5. Products derived from this software may not be called "OpenSSL"
|
|
* nor may "OpenSSL" appear in their names without prior written
|
|
* permission of the OpenSSL Project.
|
|
*
|
|
* 6. Redistributions of any form whatsoever must retain the following
|
|
* acknowledgment:
|
|
* "This product includes software developed by the OpenSSL Project
|
|
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
|
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
|
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
|
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
*/
|
|
|
|
#include <string.h>
|
|
|
|
#include "apps.h"
|
|
#include <openssl/bn.h>
|
|
|
|
typedef enum OPTION_choice {
|
|
OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
|
|
OPT_HEX, OPT_GENERATE, OPT_BITS, OPT_SAFE, OPT_CHECKS
|
|
} OPTION_CHOICE;
|
|
|
|
OPTIONS prime_options[] = {
|
|
{OPT_HELP_STR, 1, '-', "Usage: %s [options] [number...]\n"},
|
|
{OPT_HELP_STR, 1, '-',
|
|
" number Number to check for primarility\n"},
|
|
{"help", OPT_HELP, '-', "Display this summary"},
|
|
{"hex", OPT_HEX, '-', "Hex output"},
|
|
{"generate", OPT_GENERATE, '-', "Generate a prime"},
|
|
{"bits", OPT_BITS, 'p', "Size of number in bits"},
|
|
{"safe", OPT_SAFE, '-',
|
|
"When used with -generate, generate a safe prime"},
|
|
{"checks", OPT_CHECKS, 'p', "Number of checks"},
|
|
{NULL}
|
|
};
|
|
|
|
int prime_main(int argc, char **argv)
|
|
{
|
|
BIGNUM *bn = NULL;
|
|
int hex = 0, checks = 20, generate = 0, bits = 0, safe = 0, ret = 1;
|
|
char *prog;
|
|
OPTION_CHOICE o;
|
|
|
|
prog = opt_init(argc, argv, prime_options);
|
|
while ((o = opt_next()) != OPT_EOF) {
|
|
switch (o) {
|
|
case OPT_EOF:
|
|
case OPT_ERR:
|
|
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
|
|
goto end;
|
|
case OPT_HELP:
|
|
opt_help(prime_options);
|
|
ret = 0;
|
|
goto end;
|
|
case OPT_HEX:
|
|
hex = 1;
|
|
break;
|
|
case OPT_GENERATE:
|
|
generate = 1;
|
|
break;
|
|
case OPT_BITS:
|
|
bits = atoi(opt_arg());
|
|
break;
|
|
case OPT_SAFE:
|
|
safe = 1;
|
|
break;
|
|
case OPT_CHECKS:
|
|
checks = atoi(opt_arg());
|
|
break;
|
|
}
|
|
}
|
|
argc = opt_num_rest();
|
|
argv = opt_rest();
|
|
|
|
if (argc == 0 && !generate) {
|
|
BIO_printf(bio_err, "%s: No prime specified\n", prog);
|
|
goto end;
|
|
}
|
|
|
|
if (generate) {
|
|
char *s;
|
|
|
|
if (!bits) {
|
|
BIO_printf(bio_err, "Specifiy the number of bits.\n");
|
|
goto end;
|
|
}
|
|
bn = BN_new();
|
|
BN_generate_prime_ex(bn, bits, safe, NULL, NULL, NULL);
|
|
s = hex ? BN_bn2hex(bn) : BN_bn2dec(bn);
|
|
BIO_printf(bio_out, "%s\n", s);
|
|
OPENSSL_free(s);
|
|
} else {
|
|
for ( ; *argv; argv++) {
|
|
if (hex)
|
|
BN_hex2bn(&bn, argv[0]);
|
|
else
|
|
BN_dec2bn(&bn, argv[0]);
|
|
|
|
BN_print(bio_out, bn);
|
|
BIO_printf(bio_out, " (%s) %s prime\n",
|
|
argv[0],
|
|
BN_is_prime_ex(bn, checks, NULL, NULL)
|
|
? "is" : "is not");
|
|
}
|
|
}
|
|
|
|
BN_free(bn);
|
|
|
|
end:
|
|
return ret;
|
|
}
|