Latest update.
This commit is contained in:
+6
-2
@@ -12,8 +12,8 @@ ENDIF
|
||||
# Source for the 'openssl' program
|
||||
$OPENSSLSRC=\
|
||||
openssl.c progs.c \
|
||||
asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c dgst.c dhparam.c \
|
||||
dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c errstr.c gendsa.c \
|
||||
asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c dgst.c \
|
||||
ec.c ecparam.c enc.c engine.c errstr.c \
|
||||
genpkey.c genrsa.c kdf.c mac.c nseq.c ocsp.c passwd.c pkcs12.c pkcs7.c \
|
||||
pkcs8.c pkey.c pkeyparam.c pkeyutl.c prime.c rand.c req.c rsa.c \
|
||||
rsautl.c s_client.c s_server.c s_time.c sess_id.c smime.c speed.c \
|
||||
@@ -31,6 +31,10 @@ IF[{- !$disabled{apps} -}]
|
||||
SOURCE[openssl]=openssl.rc
|
||||
ENDIF
|
||||
|
||||
IF[{- !$disabled{'deprecated-3.0'} -}]
|
||||
SOURCE[openssl]=dhparam.c dsa.c dsaparam.c gendsa.c
|
||||
ENDIF
|
||||
|
||||
SCRIPTS{misc}=CA.pl
|
||||
SOURCE[CA.pl]=CA.pl.in
|
||||
# linkname tells build files that a symbolic link or copy of this script
|
||||
|
||||
@@ -7,6 +7,9 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
/* We need to use some deprecated APIs */
|
||||
#define OPENSSL_SUPPRESS_DEPRECATED
|
||||
|
||||
#include <openssl/opensslconf.h>
|
||||
#ifdef OPENSSL_NO_DH
|
||||
NON_EMPTY_TRANSLATION_UNIT
|
||||
|
||||
@@ -7,6 +7,9 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
/* We need to use the deprecated DSA_print */
|
||||
#define OPENSSL_SUPPRESS_DEPRECATED
|
||||
|
||||
#include <openssl/opensslconf.h>
|
||||
#ifdef OPENSSL_NO_DSA
|
||||
NON_EMPTY_TRANSLATION_UNIT
|
||||
@@ -173,6 +176,7 @@ int dsa_main(int argc, char **argv)
|
||||
EVP_PKEY_free(pkey);
|
||||
}
|
||||
}
|
||||
|
||||
if (dsa == NULL) {
|
||||
BIO_printf(bio_err, "unable to load Key\n");
|
||||
ERR_print_errors(bio_err);
|
||||
|
||||
@@ -7,6 +7,9 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
/* We need to use some deprecated APIs */
|
||||
#define OPENSSL_SUPPRESS_DEPRECATED
|
||||
|
||||
#include <openssl/opensslconf.h>
|
||||
#ifdef OPENSSL_NO_DSA
|
||||
NON_EMPTY_TRANSLATION_UNIT
|
||||
|
||||
@@ -7,6 +7,9 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
/* We need to use some deprecated APIs */
|
||||
#define OPENSSL_SUPPRESS_DEPRECATED
|
||||
|
||||
#include <openssl/opensslconf.h>
|
||||
#ifdef OPENSSL_NO_DSA
|
||||
NON_EMPTY_TRANSLATION_UNIT
|
||||
|
||||
@@ -13,6 +13,8 @@
|
||||
# include <openssl/lhash.h>
|
||||
# include "opt.h"
|
||||
|
||||
#define DEPRECATED_NO_ALTERNATIVE "unknown"
|
||||
|
||||
typedef enum FUNC_TYPE {
|
||||
FT_none, FT_general, FT_md, FT_cipher, FT_pkey,
|
||||
FT_md_alg, FT_cipher_alg
|
||||
@@ -23,6 +25,7 @@ typedef struct function_st {
|
||||
const char *name;
|
||||
int (*func)(int argc, char *argv[]);
|
||||
const OPTIONS *help;
|
||||
const char *deprecated_alternative;
|
||||
} FUNCTION;
|
||||
|
||||
DEFINE_LHASH_OF(FUNCTION);
|
||||
|
||||
@@ -190,6 +190,7 @@ static STRINT_PAIR cert_type_list[] = {
|
||||
{"RSA fixed ECDH", TLS_CT_RSA_FIXED_ECDH},
|
||||
{"ECDSA fixed ECDH", TLS_CT_ECDSA_FIXED_ECDH},
|
||||
{"GOST01 Sign", TLS_CT_GOST01_SIGN},
|
||||
{"GOST12 Sign", TLS_CT_GOST12_SIGN},
|
||||
{NULL}
|
||||
};
|
||||
|
||||
|
||||
@@ -47,6 +47,15 @@ BIO *bio_in = NULL;
|
||||
BIO *bio_out = NULL;
|
||||
BIO *bio_err = NULL;
|
||||
|
||||
static void warn_deprecated(const char *pname,
|
||||
const char *deprecated_alternative)
|
||||
{
|
||||
BIO_printf(bio_err, "The command %s is deprecated.", pname);
|
||||
if (strcmp(deprecated_alternative, DEPRECATED_NO_ALTERNATIVE) != 0)
|
||||
BIO_printf(bio_err, " Use '%s' instead.", deprecated_alternative);
|
||||
BIO_printf(bio_err, "\n");
|
||||
}
|
||||
|
||||
static int apps_startup(void)
|
||||
{
|
||||
#ifdef SIGPIPE
|
||||
@@ -277,6 +286,8 @@ int main(int argc, char *argv[])
|
||||
fp = lh_FUNCTION_retrieve(prog, &f);
|
||||
if (fp != NULL) {
|
||||
argv[0] = pname;
|
||||
if (fp->deprecated_alternative != NULL)
|
||||
warn_deprecated(pname, fp->deprecated_alternative);
|
||||
ret = fp->func(argc, argv);
|
||||
goto end;
|
||||
}
|
||||
@@ -470,6 +481,8 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
|
||||
}
|
||||
}
|
||||
if (fp != NULL) {
|
||||
if (fp->deprecated_alternative != NULL)
|
||||
warn_deprecated(fp->name, fp->deprecated_alternative);
|
||||
return fp->func(argc, argv);
|
||||
}
|
||||
if ((strncmp(argv[0], "no-", 3)) == 0) {
|
||||
|
||||
+3
-2
@@ -556,8 +556,9 @@ static EVP_PKEY_CTX *init_ctx(const char *kdfalg, int *pkeysize,
|
||||
|| (group = EC_KEY_get0_group(eckey)) == NULL
|
||||
|| (nid = EC_GROUP_get_curve_name(group)) == 0)
|
||||
goto end;
|
||||
if (nid == NID_sm2)
|
||||
EVP_PKEY_set_alias_type(pkey, EVP_PKEY_SM2);
|
||||
if (nid == NID_sm2
|
||||
&& !EVP_PKEY_set_alias_type(pkey, EVP_PKEY_SM2))
|
||||
goto end;
|
||||
}
|
||||
#endif
|
||||
*pkeysize = EVP_PKEY_size(pkey);
|
||||
|
||||
+170
-170
@@ -13,388 +13,388 @@
|
||||
#include "progs.h"
|
||||
|
||||
FUNCTION functions[] = {
|
||||
{FT_general, "asn1parse", asn1parse_main, asn1parse_options},
|
||||
{FT_general, "ca", ca_main, ca_options},
|
||||
{FT_general, "asn1parse", asn1parse_main, asn1parse_options, NULL},
|
||||
{FT_general, "ca", ca_main, ca_options, NULL},
|
||||
#ifndef OPENSSL_NO_SOCK
|
||||
{FT_general, "ciphers", ciphers_main, ciphers_options},
|
||||
{FT_general, "ciphers", ciphers_main, ciphers_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_CMS
|
||||
{FT_general, "cms", cms_main, cms_options},
|
||||
{FT_general, "cms", cms_main, cms_options, NULL},
|
||||
#endif
|
||||
{FT_general, "crl", crl_main, crl_options},
|
||||
{FT_general, "crl2pkcs7", crl2pkcs7_main, crl2pkcs7_options},
|
||||
{FT_general, "dgst", dgst_main, dgst_options},
|
||||
#ifndef OPENSSL_NO_DH
|
||||
{FT_general, "dhparam", dhparam_main, dhparam_options},
|
||||
{FT_general, "crl", crl_main, crl_options, NULL},
|
||||
{FT_general, "crl2pkcs7", crl2pkcs7_main, crl2pkcs7_options, NULL},
|
||||
{FT_general, "dgst", dgst_main, dgst_options, NULL},
|
||||
#if !defined(OPENSSL_NO_DH) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
{FT_general, "dhparam", dhparam_main, dhparam_options, "pkeyparam"},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
{FT_general, "dsa", dsa_main, dsa_options},
|
||||
#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
{FT_general, "dsa", dsa_main, dsa_options, "pkey"},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
{FT_general, "dsaparam", dsaparam_main, dsaparam_options},
|
||||
#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
{FT_general, "dsaparam", dsaparam_main, dsaparam_options, "pkeyparam"},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_EC
|
||||
{FT_general, "ec", ec_main, ec_options},
|
||||
{FT_general, "ec", ec_main, ec_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_EC
|
||||
{FT_general, "ecparam", ecparam_main, ecparam_options},
|
||||
{FT_general, "ecparam", ecparam_main, ecparam_options, NULL},
|
||||
#endif
|
||||
{FT_general, "enc", enc_main, enc_options},
|
||||
{FT_general, "enc", enc_main, enc_options, NULL},
|
||||
#ifndef OPENSSL_NO_ENGINE
|
||||
{FT_general, "engine", engine_main, engine_options},
|
||||
{FT_general, "engine", engine_main, engine_options, NULL},
|
||||
#endif
|
||||
{FT_general, "errstr", errstr_main, errstr_options},
|
||||
{FT_general, "fipsinstall", fipsinstall_main, fipsinstall_options},
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
{FT_general, "gendsa", gendsa_main, gendsa_options},
|
||||
{FT_general, "errstr", errstr_main, errstr_options, NULL},
|
||||
{FT_general, "fipsinstall", fipsinstall_main, fipsinstall_options, NULL},
|
||||
#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
{FT_general, "gendsa", gendsa_main, gendsa_options, "genpkey"},
|
||||
#endif
|
||||
{FT_general, "genpkey", genpkey_main, genpkey_options},
|
||||
{FT_general, "genpkey", genpkey_main, genpkey_options, NULL},
|
||||
#ifndef OPENSSL_NO_RSA
|
||||
{FT_general, "genrsa", genrsa_main, genrsa_options},
|
||||
{FT_general, "genrsa", genrsa_main, genrsa_options, NULL},
|
||||
#endif
|
||||
{FT_general, "help", help_main, help_options},
|
||||
{FT_general, "info", info_main, info_options},
|
||||
{FT_general, "kdf", kdf_main, kdf_options},
|
||||
{FT_general, "list", list_main, list_options},
|
||||
{FT_general, "mac", mac_main, mac_options},
|
||||
{FT_general, "nseq", nseq_main, nseq_options},
|
||||
{FT_general, "help", help_main, help_options, NULL},
|
||||
{FT_general, "info", info_main, info_options, NULL},
|
||||
{FT_general, "kdf", kdf_main, kdf_options, NULL},
|
||||
{FT_general, "list", list_main, list_options, NULL},
|
||||
{FT_general, "mac", mac_main, mac_options, NULL},
|
||||
{FT_general, "nseq", nseq_main, nseq_options, NULL},
|
||||
#ifndef OPENSSL_NO_OCSP
|
||||
{FT_general, "ocsp", ocsp_main, ocsp_options},
|
||||
{FT_general, "ocsp", ocsp_main, ocsp_options, NULL},
|
||||
#endif
|
||||
{FT_general, "passwd", passwd_main, passwd_options},
|
||||
{FT_general, "passwd", passwd_main, passwd_options, NULL},
|
||||
#ifndef OPENSSL_NO_DES
|
||||
{FT_general, "pkcs12", pkcs12_main, pkcs12_options},
|
||||
{FT_general, "pkcs12", pkcs12_main, pkcs12_options, NULL},
|
||||
#endif
|
||||
{FT_general, "pkcs7", pkcs7_main, pkcs7_options},
|
||||
{FT_general, "pkcs8", pkcs8_main, pkcs8_options},
|
||||
{FT_general, "pkey", pkey_main, pkey_options},
|
||||
{FT_general, "pkeyparam", pkeyparam_main, pkeyparam_options},
|
||||
{FT_general, "pkeyutl", pkeyutl_main, pkeyutl_options},
|
||||
{FT_general, "prime", prime_main, prime_options},
|
||||
{FT_general, "provider", provider_main, provider_options},
|
||||
{FT_general, "rand", rand_main, rand_options},
|
||||
{FT_general, "rehash", rehash_main, rehash_options},
|
||||
{FT_general, "req", req_main, req_options},
|
||||
{FT_general, "rsa", rsa_main, rsa_options},
|
||||
{FT_general, "pkcs7", pkcs7_main, pkcs7_options, NULL},
|
||||
{FT_general, "pkcs8", pkcs8_main, pkcs8_options, NULL},
|
||||
{FT_general, "pkey", pkey_main, pkey_options, NULL},
|
||||
{FT_general, "pkeyparam", pkeyparam_main, pkeyparam_options, NULL},
|
||||
{FT_general, "pkeyutl", pkeyutl_main, pkeyutl_options, NULL},
|
||||
{FT_general, "prime", prime_main, prime_options, NULL},
|
||||
{FT_general, "provider", provider_main, provider_options, NULL},
|
||||
{FT_general, "rand", rand_main, rand_options, NULL},
|
||||
{FT_general, "rehash", rehash_main, rehash_options, NULL},
|
||||
{FT_general, "req", req_main, req_options, NULL},
|
||||
{FT_general, "rsa", rsa_main, rsa_options, NULL},
|
||||
#ifndef OPENSSL_NO_RSA
|
||||
{FT_general, "rsautl", rsautl_main, rsautl_options},
|
||||
{FT_general, "rsautl", rsautl_main, rsautl_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SOCK
|
||||
{FT_general, "s_client", s_client_main, s_client_options},
|
||||
{FT_general, "s_client", s_client_main, s_client_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SOCK
|
||||
{FT_general, "s_server", s_server_main, s_server_options},
|
||||
{FT_general, "s_server", s_server_main, s_server_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SOCK
|
||||
{FT_general, "s_time", s_time_main, s_time_options},
|
||||
{FT_general, "s_time", s_time_main, s_time_options, NULL},
|
||||
#endif
|
||||
{FT_general, "sess_id", sess_id_main, sess_id_options},
|
||||
{FT_general, "smime", smime_main, smime_options},
|
||||
{FT_general, "speed", speed_main, speed_options},
|
||||
{FT_general, "spkac", spkac_main, spkac_options},
|
||||
{FT_general, "sess_id", sess_id_main, sess_id_options, NULL},
|
||||
{FT_general, "smime", smime_main, smime_options, NULL},
|
||||
{FT_general, "speed", speed_main, speed_options, NULL},
|
||||
{FT_general, "spkac", spkac_main, spkac_options, NULL},
|
||||
#ifndef OPENSSL_NO_SRP
|
||||
{FT_general, "srp", srp_main, srp_options},
|
||||
{FT_general, "srp", srp_main, srp_options, NULL},
|
||||
#endif
|
||||
{FT_general, "storeutl", storeutl_main, storeutl_options},
|
||||
{FT_general, "storeutl", storeutl_main, storeutl_options, NULL},
|
||||
#ifndef OPENSSL_NO_TS
|
||||
{FT_general, "ts", ts_main, ts_options},
|
||||
{FT_general, "ts", ts_main, ts_options, NULL},
|
||||
#endif
|
||||
{FT_general, "verify", verify_main, verify_options},
|
||||
{FT_general, "version", version_main, version_options},
|
||||
{FT_general, "x509", x509_main, x509_options},
|
||||
{FT_general, "verify", verify_main, verify_options, NULL},
|
||||
{FT_general, "version", version_main, version_options, NULL},
|
||||
{FT_general, "x509", x509_main, x509_options, NULL},
|
||||
#ifndef OPENSSL_NO_MD2
|
||||
{FT_md, "md2", dgst_main},
|
||||
{FT_md, "md2", dgst_main, NULL, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_MD4
|
||||
{FT_md, "md4", dgst_main},
|
||||
{FT_md, "md4", dgst_main, NULL, NULL},
|
||||
#endif
|
||||
{FT_md, "md5", dgst_main},
|
||||
{FT_md, "md5", dgst_main, NULL, NULL},
|
||||
#ifndef OPENSSL_NO_GOST
|
||||
{FT_md, "gost", dgst_main},
|
||||
{FT_md, "gost", dgst_main, NULL, NULL},
|
||||
#endif
|
||||
{FT_md, "sha1", dgst_main},
|
||||
{FT_md, "sha224", dgst_main},
|
||||
{FT_md, "sha256", dgst_main},
|
||||
{FT_md, "sha384", dgst_main},
|
||||
{FT_md, "sha512", dgst_main},
|
||||
{FT_md, "sha512-224", dgst_main},
|
||||
{FT_md, "sha512-256", dgst_main},
|
||||
{FT_md, "sha3-224", dgst_main},
|
||||
{FT_md, "sha3-256", dgst_main},
|
||||
{FT_md, "sha3-384", dgst_main},
|
||||
{FT_md, "sha3-512", dgst_main},
|
||||
{FT_md, "shake128", dgst_main},
|
||||
{FT_md, "shake256", dgst_main},
|
||||
{FT_md, "sha1", dgst_main, NULL, NULL},
|
||||
{FT_md, "sha224", dgst_main, NULL, NULL},
|
||||
{FT_md, "sha256", dgst_main, NULL, NULL},
|
||||
{FT_md, "sha384", dgst_main, NULL, NULL},
|
||||
{FT_md, "sha512", dgst_main, NULL, NULL},
|
||||
{FT_md, "sha512-224", dgst_main, NULL, NULL},
|
||||
{FT_md, "sha512-256", dgst_main, NULL, NULL},
|
||||
{FT_md, "sha3-224", dgst_main, NULL, NULL},
|
||||
{FT_md, "sha3-256", dgst_main, NULL, NULL},
|
||||
{FT_md, "sha3-384", dgst_main, NULL, NULL},
|
||||
{FT_md, "sha3-512", dgst_main, NULL, NULL},
|
||||
{FT_md, "shake128", dgst_main, NULL, NULL},
|
||||
{FT_md, "shake256", dgst_main, NULL, NULL},
|
||||
#ifndef OPENSSL_NO_MDC2
|
||||
{FT_md, "mdc2", dgst_main},
|
||||
{FT_md, "mdc2", dgst_main, NULL, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RMD160
|
||||
{FT_md, "rmd160", dgst_main},
|
||||
{FT_md, "rmd160", dgst_main, NULL, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_BLAKE2
|
||||
{FT_md, "blake2b512", dgst_main},
|
||||
{FT_md, "blake2b512", dgst_main, NULL, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_BLAKE2
|
||||
{FT_md, "blake2s256", dgst_main},
|
||||
{FT_md, "blake2s256", dgst_main, NULL, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SM3
|
||||
{FT_md, "sm3", dgst_main},
|
||||
{FT_md, "sm3", dgst_main, NULL, NULL},
|
||||
#endif
|
||||
{FT_cipher, "aes-128-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "aes-128-ecb", enc_main, enc_options},
|
||||
{FT_cipher, "aes-192-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "aes-192-ecb", enc_main, enc_options},
|
||||
{FT_cipher, "aes-256-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "aes-256-ecb", enc_main, enc_options},
|
||||
{FT_cipher, "aes-128-cbc", enc_main, enc_options, NULL},
|
||||
{FT_cipher, "aes-128-ecb", enc_main, enc_options, NULL},
|
||||
{FT_cipher, "aes-192-cbc", enc_main, enc_options, NULL},
|
||||
{FT_cipher, "aes-192-ecb", enc_main, enc_options, NULL},
|
||||
{FT_cipher, "aes-256-cbc", enc_main, enc_options, NULL},
|
||||
{FT_cipher, "aes-256-ecb", enc_main, enc_options, NULL},
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-128-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "aria-128-cbc", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-128-cfb", enc_main, enc_options},
|
||||
{FT_cipher, "aria-128-cfb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-128-ctr", enc_main, enc_options},
|
||||
{FT_cipher, "aria-128-ctr", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-128-ecb", enc_main, enc_options},
|
||||
{FT_cipher, "aria-128-ecb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-128-ofb", enc_main, enc_options},
|
||||
{FT_cipher, "aria-128-ofb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-128-cfb1", enc_main, enc_options},
|
||||
{FT_cipher, "aria-128-cfb1", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-128-cfb8", enc_main, enc_options},
|
||||
{FT_cipher, "aria-128-cfb8", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-192-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "aria-192-cbc", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-192-cfb", enc_main, enc_options},
|
||||
{FT_cipher, "aria-192-cfb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-192-ctr", enc_main, enc_options},
|
||||
{FT_cipher, "aria-192-ctr", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-192-ecb", enc_main, enc_options},
|
||||
{FT_cipher, "aria-192-ecb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-192-ofb", enc_main, enc_options},
|
||||
{FT_cipher, "aria-192-ofb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-192-cfb1", enc_main, enc_options},
|
||||
{FT_cipher, "aria-192-cfb1", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-192-cfb8", enc_main, enc_options},
|
||||
{FT_cipher, "aria-192-cfb8", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-256-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "aria-256-cbc", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-256-cfb", enc_main, enc_options},
|
||||
{FT_cipher, "aria-256-cfb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-256-ctr", enc_main, enc_options},
|
||||
{FT_cipher, "aria-256-ctr", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-256-ecb", enc_main, enc_options},
|
||||
{FT_cipher, "aria-256-ecb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-256-ofb", enc_main, enc_options},
|
||||
{FT_cipher, "aria-256-ofb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-256-cfb1", enc_main, enc_options},
|
||||
{FT_cipher, "aria-256-cfb1", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_ARIA
|
||||
{FT_cipher, "aria-256-cfb8", enc_main, enc_options},
|
||||
{FT_cipher, "aria-256-cfb8", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_CAMELLIA
|
||||
{FT_cipher, "camellia-128-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "camellia-128-cbc", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_CAMELLIA
|
||||
{FT_cipher, "camellia-128-ecb", enc_main, enc_options},
|
||||
{FT_cipher, "camellia-128-ecb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_CAMELLIA
|
||||
{FT_cipher, "camellia-192-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "camellia-192-cbc", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_CAMELLIA
|
||||
{FT_cipher, "camellia-192-ecb", enc_main, enc_options},
|
||||
{FT_cipher, "camellia-192-ecb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_CAMELLIA
|
||||
{FT_cipher, "camellia-256-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "camellia-256-cbc", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_CAMELLIA
|
||||
{FT_cipher, "camellia-256-ecb", enc_main, enc_options},
|
||||
{FT_cipher, "camellia-256-ecb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
{FT_cipher, "base64", enc_main, enc_options},
|
||||
{FT_cipher, "base64", enc_main, enc_options, NULL},
|
||||
#ifdef ZLIB
|
||||
{FT_cipher, "zlib", enc_main, enc_options},
|
||||
{FT_cipher, "zlib", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
{FT_cipher, "des", enc_main, enc_options},
|
||||
{FT_cipher, "des", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
{FT_cipher, "des3", enc_main, enc_options},
|
||||
{FT_cipher, "des3", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
{FT_cipher, "desx", enc_main, enc_options},
|
||||
{FT_cipher, "desx", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_IDEA
|
||||
{FT_cipher, "idea", enc_main, enc_options},
|
||||
{FT_cipher, "idea", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SEED
|
||||
{FT_cipher, "seed", enc_main, enc_options},
|
||||
{FT_cipher, "seed", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC4
|
||||
{FT_cipher, "rc4", enc_main, enc_options},
|
||||
{FT_cipher, "rc4", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC4
|
||||
{FT_cipher, "rc4-40", enc_main, enc_options},
|
||||
{FT_cipher, "rc4-40", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC2
|
||||
{FT_cipher, "rc2", enc_main, enc_options},
|
||||
{FT_cipher, "rc2", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_BF
|
||||
{FT_cipher, "bf", enc_main, enc_options},
|
||||
{FT_cipher, "bf", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_CAST
|
||||
{FT_cipher, "cast", enc_main, enc_options},
|
||||
{FT_cipher, "cast", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC5
|
||||
{FT_cipher, "rc5", enc_main, enc_options},
|
||||
{FT_cipher, "rc5", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
{FT_cipher, "des-ecb", enc_main, enc_options},
|
||||
{FT_cipher, "des-ecb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
{FT_cipher, "des-ede", enc_main, enc_options},
|
||||
{FT_cipher, "des-ede", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
{FT_cipher, "des-ede3", enc_main, enc_options},
|
||||
{FT_cipher, "des-ede3", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
{FT_cipher, "des-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "des-cbc", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
{FT_cipher, "des-ede-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "des-ede-cbc", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
{FT_cipher, "des-ede3-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "des-ede3-cbc", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
{FT_cipher, "des-cfb", enc_main, enc_options},
|
||||
{FT_cipher, "des-cfb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
{FT_cipher, "des-ede-cfb", enc_main, enc_options},
|
||||
{FT_cipher, "des-ede-cfb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
{FT_cipher, "des-ede3-cfb", enc_main, enc_options},
|
||||
{FT_cipher, "des-ede3-cfb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
{FT_cipher, "des-ofb", enc_main, enc_options},
|
||||
{FT_cipher, "des-ofb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
{FT_cipher, "des-ede-ofb", enc_main, enc_options},
|
||||
{FT_cipher, "des-ede-ofb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
{FT_cipher, "des-ede3-ofb", enc_main, enc_options},
|
||||
{FT_cipher, "des-ede3-ofb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_IDEA
|
||||
{FT_cipher, "idea-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "idea-cbc", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_IDEA
|
||||
{FT_cipher, "idea-ecb", enc_main, enc_options},
|
||||
{FT_cipher, "idea-ecb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_IDEA
|
||||
{FT_cipher, "idea-cfb", enc_main, enc_options},
|
||||
{FT_cipher, "idea-cfb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_IDEA
|
||||
{FT_cipher, "idea-ofb", enc_main, enc_options},
|
||||
{FT_cipher, "idea-ofb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SEED
|
||||
{FT_cipher, "seed-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "seed-cbc", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SEED
|
||||
{FT_cipher, "seed-ecb", enc_main, enc_options},
|
||||
{FT_cipher, "seed-ecb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SEED
|
||||
{FT_cipher, "seed-cfb", enc_main, enc_options},
|
||||
{FT_cipher, "seed-cfb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SEED
|
||||
{FT_cipher, "seed-ofb", enc_main, enc_options},
|
||||
{FT_cipher, "seed-ofb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC2
|
||||
{FT_cipher, "rc2-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "rc2-cbc", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC2
|
||||
{FT_cipher, "rc2-ecb", enc_main, enc_options},
|
||||
{FT_cipher, "rc2-ecb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC2
|
||||
{FT_cipher, "rc2-cfb", enc_main, enc_options},
|
||||
{FT_cipher, "rc2-cfb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC2
|
||||
{FT_cipher, "rc2-ofb", enc_main, enc_options},
|
||||
{FT_cipher, "rc2-ofb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC2
|
||||
{FT_cipher, "rc2-64-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "rc2-64-cbc", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC2
|
||||
{FT_cipher, "rc2-40-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "rc2-40-cbc", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_BF
|
||||
{FT_cipher, "bf-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "bf-cbc", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_BF
|
||||
{FT_cipher, "bf-ecb", enc_main, enc_options},
|
||||
{FT_cipher, "bf-ecb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_BF
|
||||
{FT_cipher, "bf-cfb", enc_main, enc_options},
|
||||
{FT_cipher, "bf-cfb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_BF
|
||||
{FT_cipher, "bf-ofb", enc_main, enc_options},
|
||||
{FT_cipher, "bf-ofb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_CAST
|
||||
{FT_cipher, "cast5-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "cast5-cbc", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_CAST
|
||||
{FT_cipher, "cast5-ecb", enc_main, enc_options},
|
||||
{FT_cipher, "cast5-ecb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_CAST
|
||||
{FT_cipher, "cast5-cfb", enc_main, enc_options},
|
||||
{FT_cipher, "cast5-cfb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_CAST
|
||||
{FT_cipher, "cast5-ofb", enc_main, enc_options},
|
||||
{FT_cipher, "cast5-ofb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_CAST
|
||||
{FT_cipher, "cast-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "cast-cbc", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC5
|
||||
{FT_cipher, "rc5-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "rc5-cbc", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC5
|
||||
{FT_cipher, "rc5-ecb", enc_main, enc_options},
|
||||
{FT_cipher, "rc5-ecb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC5
|
||||
{FT_cipher, "rc5-cfb", enc_main, enc_options},
|
||||
{FT_cipher, "rc5-cfb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC5
|
||||
{FT_cipher, "rc5-ofb", enc_main, enc_options},
|
||||
{FT_cipher, "rc5-ofb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SM4
|
||||
{FT_cipher, "sm4-cbc", enc_main, enc_options},
|
||||
{FT_cipher, "sm4-cbc", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SM4
|
||||
{FT_cipher, "sm4-ecb", enc_main, enc_options},
|
||||
{FT_cipher, "sm4-ecb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SM4
|
||||
{FT_cipher, "sm4-cfb", enc_main, enc_options},
|
||||
{FT_cipher, "sm4-cfb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SM4
|
||||
{FT_cipher, "sm4-ofb", enc_main, enc_options},
|
||||
{FT_cipher, "sm4-ofb", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SM4
|
||||
{FT_cipher, "sm4-ctr", enc_main, enc_options},
|
||||
{FT_cipher, "sm4-ctr", enc_main, enc_options, NULL},
|
||||
#endif
|
||||
{0, NULL, NULL}
|
||||
{0, NULL, NULL, NULL, NULL}
|
||||
};
|
||||
+20
-7
@@ -94,20 +94,33 @@ EOF
|
||||
ciphers => "sock",
|
||||
genrsa => "rsa",
|
||||
rsautl => "rsa",
|
||||
gendsa => "dsa",
|
||||
dsaparam => "dsa",
|
||||
gendh => "dh",
|
||||
dhparam => "dh",
|
||||
ecparam => "ec",
|
||||
pkcs12 => "des",
|
||||
);
|
||||
my %cmd_deprecated = (
|
||||
dhparam => [ "3_0", "pkeyparam", "dh" ],
|
||||
dsaparam => [ "3_0", "pkeyparam", "dsa" ],
|
||||
dsa => [ "3_0", "pkey", "dsa" ],
|
||||
gendsa => [ "3_0", "genpkey", "dsa" ],
|
||||
);
|
||||
|
||||
print "FUNCTION functions[] = {\n";
|
||||
foreach my $cmd ( @ARGV ) {
|
||||
my $str =
|
||||
" {FT_general, \"$cmd\", ${cmd}_main, ${cmd}_options},\n";
|
||||
" {FT_general, \"$cmd\", ${cmd}_main, ${cmd}_options, NULL},\n";
|
||||
if ($cmd =~ /^s_/) {
|
||||
print "#ifndef OPENSSL_NO_SOCK\n${str}#endif\n";
|
||||
} elsif (my $deprecated = $cmd_deprecated{$cmd}) {
|
||||
my @dep = @{$deprecated};
|
||||
print "#if ";
|
||||
if ($dep[2]) {
|
||||
print "!defined(OPENSSL_NO_" . uc($dep[2]) . ") && ";
|
||||
}
|
||||
print "!defined(OPENSSL_NO_DEPRECATED_" . $dep[0] . ")";
|
||||
my $dalt = "\"" . $dep[1] . "\"";
|
||||
$str =~ s/NULL/$dalt/;
|
||||
print "\n${str}#endif\n";
|
||||
} elsif (grep { $cmd eq $_ } @disablables) {
|
||||
print "#ifndef OPENSSL_NO_" . uc($cmd) . "\n${str}#endif\n";
|
||||
} elsif (my $disabler = $cmd_disabler{$cmd}) {
|
||||
@@ -131,7 +144,7 @@ EOF
|
||||
"mdc2", "rmd160", "blake2b512", "blake2s256",
|
||||
"sm3"
|
||||
) {
|
||||
my $str = " {FT_md, \"$cmd\", dgst_main},\n";
|
||||
my $str = " {FT_md, \"$cmd\", dgst_main, NULL, NULL},\n";
|
||||
if (grep { $cmd eq $_ } @disablables) {
|
||||
print "#ifndef OPENSSL_NO_" . uc($cmd) . "\n${str}#endif\n";
|
||||
} elsif (my $disabler = $md_disabler{$cmd}) {
|
||||
@@ -177,7 +190,7 @@ EOF
|
||||
"cast-cbc", "rc5-cbc", "rc5-ecb", "rc5-cfb", "rc5-ofb",
|
||||
"sm4-cbc", "sm4-ecb", "sm4-cfb", "sm4-ofb", "sm4-ctr"
|
||||
) {
|
||||
my $str = " {FT_cipher, \"$cmd\", enc_main, enc_options},\n";
|
||||
my $str = " {FT_cipher, \"$cmd\", enc_main, enc_options, NULL},\n";
|
||||
(my $algo = $cmd) =~ s/-.*//g;
|
||||
if ($cmd eq "zlib") {
|
||||
print "#ifdef ZLIB\n${str}#endif\n";
|
||||
@@ -190,5 +203,5 @@ EOF
|
||||
}
|
||||
}
|
||||
|
||||
print " {0, NULL, NULL}\n};\n";
|
||||
print " {0, NULL, NULL, NULL, NULL}\n};\n";
|
||||
}
|
||||
+13
-13
@@ -99,7 +99,7 @@
|
||||
# include "./testrsa.h"
|
||||
#endif
|
||||
#include <openssl/x509.h>
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
# include <openssl/dsa.h>
|
||||
# include "./testdsa.h"
|
||||
#endif
|
||||
@@ -406,7 +406,7 @@ static const OPT_PAIR doit_choices[] = {
|
||||
|
||||
static double results[ALGOR_NUM][SIZE_NUM];
|
||||
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
enum { R_DSA_512, R_DSA_1024, R_DSA_2048, DSA_NUM };
|
||||
static const OPT_PAIR dsa_choices[DSA_NUM] = {
|
||||
{"dsa512", R_DSA_512},
|
||||
@@ -545,7 +545,7 @@ typedef struct loopargs_st {
|
||||
#ifndef OPENSSL_NO_RSA
|
||||
RSA *rsa_key[RSA_NUM];
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
DSA *dsa_key[DSA_NUM];
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_EC
|
||||
@@ -1066,7 +1066,7 @@ static int RSA_verify_loop(void *args)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
static long dsa_c[DSA_NUM][2];
|
||||
static int DSA_sign_loop(void *args)
|
||||
{
|
||||
@@ -1520,7 +1520,7 @@ int speed_main(int argc, char **argv)
|
||||
uint8_t rsa_doit[RSA_NUM] = { 0 };
|
||||
int primes = RSA_DEFAULT_PRIME_NUM;
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
static const unsigned int dsa_bits[DSA_NUM] = { 512, 1024, 2048 };
|
||||
uint8_t dsa_doit[DSA_NUM] = { 0 };
|
||||
#endif
|
||||
@@ -1760,7 +1760,7 @@ int speed_main(int argc, char **argv)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (strncmp(algo, "dsa", 3) == 0) {
|
||||
if (algo[3] == '\0') {
|
||||
memset(dsa_doit, 1, sizeof(dsa_doit));
|
||||
@@ -1912,7 +1912,7 @@ int speed_main(int argc, char **argv)
|
||||
#ifndef OPENSSL_NO_RSA
|
||||
memset(rsa_doit, 1, sizeof(rsa_doit));
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
memset(dsa_doit, 1, sizeof(dsa_doit));
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_EC
|
||||
@@ -1952,7 +1952,7 @@ int speed_main(int argc, char **argv)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
for (i = 0; i < loopargs_len; i++) {
|
||||
loopargs[i].dsa_key[0] = get_dsa(512);
|
||||
loopargs[i].dsa_key[1] = get_dsa(1024);
|
||||
@@ -2120,7 +2120,7 @@ int speed_main(int argc, char **argv)
|
||||
}
|
||||
# endif
|
||||
|
||||
# ifndef OPENSSL_NO_DSA
|
||||
# if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
dsa_c[R_DSA_512][0] = count / 1000;
|
||||
dsa_c[R_DSA_512][1] = count / 1000 / 2;
|
||||
for (i = 1; i < DSA_NUM; i++) {
|
||||
@@ -2955,7 +2955,7 @@ int speed_main(int argc, char **argv)
|
||||
if (RAND_bytes(loopargs[i].buf, 36) <= 0)
|
||||
goto end;
|
||||
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
for (testnum = 0; testnum < DSA_NUM; testnum++) {
|
||||
int st = 0;
|
||||
if (!dsa_doit[testnum])
|
||||
@@ -3582,7 +3582,7 @@ int speed_main(int argc, char **argv)
|
||||
rsa_results[k][0], rsa_results[k][1]);
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
testnum = 1;
|
||||
for (k = 0; k < DSA_NUM; k++) {
|
||||
if (!dsa_doit[k])
|
||||
@@ -3695,7 +3695,7 @@ int speed_main(int argc, char **argv)
|
||||
for (k = 0; k < RSA_NUM; k++)
|
||||
RSA_free(loopargs[i].rsa_key[k]);
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
for (k = 0; k < DSA_NUM; k++)
|
||||
DSA_free(loopargs[i].dsa_key[k]);
|
||||
#endif
|
||||
@@ -3901,7 +3901,7 @@ static int do_multi(int multi, int size_num)
|
||||
d = atof(sstrsep(&p, sep));
|
||||
rsa_results[k][1] += d;
|
||||
}
|
||||
# ifndef OPENSSL_NO_DSA
|
||||
#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
else if (strncmp(buf, "+F3:", 4) == 0) {
|
||||
int k;
|
||||
double d;
|
||||
|
||||
+1
-1
@@ -128,7 +128,7 @@ const OPTIONS x509_options[] = {
|
||||
{"setalias", OPT_SETALIAS, 's', "Set certificate alias"},
|
||||
{"days", OPT_DAYS, 'n',
|
||||
"How long till expiry of a signed certificate - def 30 days"},
|
||||
{"signkey", OPT_SIGNKEY, '<', "Self sign cert with arg"},
|
||||
{"signkey", OPT_SIGNKEY, 's', "Self sign cert with arg"},
|
||||
{"set_serial", OPT_SET_SERIAL, 's', "Serial number to use"},
|
||||
{"extensions", OPT_EXTENSIONS, 's', "Section from config file to use"},
|
||||
{"certopt", OPT_CERTOPT, 's', "Various certificate text options"},
|
||||
|
||||
Reference in New Issue
Block a user