13 files changed, 204 insertions, 315 deletions

diff --git a/src/usr.bin/openssl/apps.c b/src/usr.bin/openssl/apps.c
index 7c98f1e70c..46197dfd49 100644
--- a/src/usr.bin/openssl/apps.c
+++ b/src/usr.bin/openssl/apps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.c,v 1.70 2025/01/03 09:14:42 tb Exp $ */
+/* $OpenBSD: apps.c,v 1.72 2025/03/18 13:03:08 tb Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -1377,10 +1377,10 @@ int
 save_index(const char *file, const char *suffix, CA_DB *db)
 {
         char attrpath[PATH_MAX], dbfile[PATH_MAX];
-        BIO *out = BIO_new(BIO_s_file());
-        int j;
+        BIO *out;
+        int ret = 0;
 
-        if (out == NULL) {
+        if ((out = BIO_new(BIO_s_file())) == NULL) {
                 ERR_print_errors(bio_err);
                 goto err;
         }
@@ -1400,27 +1400,31 @@ save_index(const char *file, const char *suffix, CA_DB *db)
                 BIO_printf(bio_err, "unable to open '%s'\n", dbfile);
                 goto err;
         }
-        j = TXT_DB_write(out, db->db);
-        if (j <= 0)
+
+        if (TXT_DB_write(out, db->db) <= 0)
                 goto err;
 
         BIO_free(out);
-
-        out = BIO_new(BIO_s_file());
+        if ((out = BIO_new(BIO_s_file())) == NULL) {
+                ERR_print_errors(bio_err);
+                goto err;
+        }
 
         if (BIO_write_filename(out, attrpath) <= 0) {
                 perror(attrpath);
                 BIO_printf(bio_err, "unable to open '%s'\n", attrpath);
                 goto err;
         }
-        BIO_printf(out, "unique_subject = %s\n",
-            db->attributes.unique_subject ? "yes" : "no");
-        BIO_free(out);
+        if (BIO_printf(out, "unique_subject = %s\n",
+            db->attributes.unique_subject ? "yes" : "no") <= 0)
+                goto err;
 
-        return 1;
+        ret = 1;
 
  err:
-        return 0;
+        BIO_free(out);
+
+        return ret;
 }
 
 int
diff --git a/src/usr.bin/openssl/ca.c b/src/usr.bin/openssl/ca.c
index d69844620d..b644b746b9 100644
--- a/src/usr.bin/openssl/ca.c
+++ b/src/usr.bin/openssl/ca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ca.c,v 1.61 2025/02/25 09:49:33 tb Exp $ */
+/* $OpenBSD: ca.c,v 1.62 2025/04/14 08:39:27 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -104,7 +104,6 @@
 #define ENV_POLICY              "policy"
 #define ENV_EXTENSIONS          "x509_extensions"
 #define ENV_CRLEXT              "crl_extensions"
-#define ENV_MSIE_HACK           "msie_hack"
 #define ENV_NAMEOPT             "name_opt"
 #define ENV_CERTOPT             "cert_opt"
 #define ENV_EXTCOPY             "copy_extensions"
@@ -181,7 +180,6 @@ static struct {
         int keyform;
         char *md;
         int multirdn;
-        int msie_hack;
         int notext;
         char *outdir;
         char *outfile;
@@ -451,11 +449,6 @@ static const struct option ca_options[] = {
                 .opt.arg = &cfg.md,
         },
         {
-                .name = "msie_hack",
-                .type = OPTION_FLAG,
-                .opt.flag = &cfg.msie_hack,
-        },
-        {
                 .name = "multivalue-rdn",
                 .desc = "Enable support for multivalued RDNs",
                 .type = OPTION_FLAG,
@@ -827,11 +820,6 @@ ca_main(int argc, char **argv)
                 ERR_clear_error();
         if ((f != NULL) && ((*f == 'y') || (*f == 'Y')))
                 cfg.preserve = 1;
-        f = NCONF_get_string(conf, BASE_SECTION, ENV_MSIE_HACK);
-        if (f == NULL)
-                ERR_clear_error();
-        if ((f != NULL) && ((*f == 'y') || (*f == 'Y')))
-                cfg.msie_hack = 1;
 
         f = NCONF_get_string(conf, cfg.section, ENV_NAMEOPT);
 
@@ -1681,7 +1669,7 @@ do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
         X509_NAME_ENTRY *ne;
         X509_NAME_ENTRY *tne, *push;
         EVP_PKEY *pktmp;
-        int ok = -1, i, j, last, nid;
+        int ok = -1, i, j, last;
         const char *p;
         CONF_VALUE *cv;
         OPENSSL_STRING row[DB_NUMBER];
@@ -1723,23 +1711,6 @@ do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
                 if (obj == NULL)
                         goto err;
 
-                if (cfg.msie_hack) {
-                        /* assume all type should be strings */
-                        nid = OBJ_obj2nid(X509_NAME_ENTRY_get_object(ne));
-                        if (nid == NID_undef)
-                                goto err;
-
-                        if (str->type == V_ASN1_UNIVERSALSTRING)
-                                ASN1_UNIVERSALSTRING_to_string(str);
-
-                        if ((str->type == V_ASN1_IA5STRING) &&
-                            (nid != NID_pkcs9_emailAddress))
-                                str->type = V_ASN1_T61STRING;
-
-                        if ((nid == NID_pkcs9_emailAddress) &&
-                            (str->type == V_ASN1_PRINTABLESTRING))
-                                str->type = V_ASN1_IA5STRING;
-                }
                 /* If no EMAIL is wanted in the subject */
                 if ((OBJ_obj2nid(obj) == NID_pkcs9_emailAddress) && (!email_dn))
                         continue;
diff --git a/src/usr.bin/openssl/certhash.c b/src/usr.bin/openssl/certhash.c
index 5ee29b8d01..1ee1165516 100644
--- a/src/usr.bin/openssl/certhash.c
+++ b/src/usr.bin/openssl/certhash.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: certhash.c,v 1.21 2023/03/06 14:32:05 tb Exp $ */
+/*      $OpenBSD: certhash.c,v 1.22 2025/07/27 14:46:20 joshua Exp $ */
 /*
  * Copyright (c) 2014, 2015 Joel Sing <jsing@openbsd.org>
  *
@@ -297,11 +297,10 @@ hashinfo_from_linkname(const char *linkname, const char *target)
 }
 
 static struct hashinfo *
-certhash_cert(BIO *bio, const char *filename)
+certhash_cert(BIO *bio, const char *filename, const EVP_MD *digest)
 {
         unsigned char fingerprint[EVP_MAX_MD_SIZE];
         struct hashinfo *hi = NULL;
-        const EVP_MD *digest;
         X509 *cert = NULL;
         unsigned long hash;
         unsigned int len;
@@ -311,7 +310,6 @@ certhash_cert(BIO *bio, const char *filename)
 
         hash = X509_subject_name_hash(cert);
 
-        digest = EVP_sha256();
         if (X509_digest(cert, digest, fingerprint, &len) != 1) {
                 fprintf(stderr, "out of memory\n");
                 goto err;
@@ -326,11 +324,10 @@ certhash_cert(BIO *bio, const char *filename)
 }
 
 static struct hashinfo *
-certhash_crl(BIO *bio, const char *filename)
+certhash_crl(BIO *bio, const char *filename, const EVP_MD *digest)
 {
         unsigned char fingerprint[EVP_MAX_MD_SIZE];
         struct hashinfo *hi = NULL;
-        const EVP_MD *digest;
         X509_CRL *crl = NULL;
         unsigned long hash;
         unsigned int len;
@@ -340,7 +337,6 @@ certhash_crl(BIO *bio, const char *filename)
 
         hash = X509_NAME_hash(X509_CRL_get_issuer(crl));
 
-        digest = EVP_sha256();
         if (X509_CRL_digest(crl, digest, fingerprint, &len) != 1) {
                 fprintf(stderr, "out of memory\n");
                 goto err;
@@ -509,7 +505,7 @@ certhash_link(struct dirent *dep, struct hashinfo **links)
 
 static int
 certhash_file(struct dirent *dep, struct hashinfo **certs,
-    struct hashinfo **crls)
+    struct hashinfo **crls, const EVP_MD *digest)
 {
         struct hashinfo *hi = NULL;
         int has_cert, has_crl;
@@ -529,7 +525,7 @@ certhash_file(struct dirent *dep, struct hashinfo **certs,
                 goto err;
         }
 
-        if ((hi = certhash_cert(bio, dep->d_name)) != NULL) {
+        if ((hi = certhash_cert(bio, dep->d_name, digest)) != NULL) {
                 has_cert = 1;
                 *certs = hashinfo_chain(*certs, hi);
         }
@@ -539,7 +535,7 @@ certhash_file(struct dirent *dep, struct hashinfo **certs,
                 goto err;
         }
 
-        if ((hi = certhash_crl(bio, dep->d_name)) != NULL) {
+        if ((hi = certhash_crl(bio, dep->d_name, digest)) != NULL) {
                 has_crl = hi->is_crl = 1;
                 *crls = hashinfo_chain(*crls, hi);
         }
@@ -557,7 +553,7 @@ certhash_file(struct dirent *dep, struct hashinfo **certs,
 }
 
 static int
-certhash_directory(const char *path)
+certhash_directory(const char *path, const EVP_MD *digest)
 {
         struct hashinfo *links = NULL, *certs = NULL, *crls = NULL, *link;
         int ret = 0;
@@ -579,7 +575,7 @@ certhash_directory(const char *path)
                                 goto err;
                 }
                 if (filename_is_pem(dep->d_name)) {
-                        if (certhash_file(dep, &certs, &crls) == -1)
+                        if (certhash_file(dep, &certs, &crls, digest) == -1)
                                 goto err;
                 }
         }
@@ -678,7 +674,7 @@ certhash_main(int argc, char **argv)
                         ret = 1;
                         continue;
                 }
-                ret |= certhash_directory(argv[i]);
+                ret |= certhash_directory(argv[i], EVP_sha256());
                 if (fchdir(cwdfd) == -1) {
                         perror("failed to restore current directory");
                         ret = 1;
diff --git a/src/usr.bin/openssl/cms.c b/src/usr.bin/openssl/cms.c
index 7420d0ab8c..458ddb0e3b 100644
--- a/src/usr.bin/openssl/cms.c
+++ b/src/usr.bin/openssl/cms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms.c,v 1.36 2024/08/12 15:34:58 job Exp $ */
+/* $OpenBSD: cms.c,v 1.38 2025/06/07 08:24:15 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -193,15 +193,33 @@ get_cipher_by_name(char *name)
 static int
 cms_opt_cipher(int argc, char **argv, int *argsused)
 {
+        const EVP_CIPHER *cipher;
         char *name = argv[0];
 
         if (*name++ != '-')
                 return (1);
 
-        if ((cfg.cipher = get_cipher_by_name(name)) == NULL)
-                if ((cfg.cipher = EVP_get_cipherbyname(name)) == NULL)
+        if ((cipher = get_cipher_by_name(name)) == NULL)
+                if ((cipher = EVP_get_cipherbyname(name)) == NULL)
                         return (1);
 
+        /*
+         * XXX - this should really be done in CMS_{encrypt,decrypt}() until
+         * we have proper support for AuthEnvelopedData (RFC 5084), but this
+         * is good enough for now to avoid outputting garbage with this rusty
+         * swiss army knife.
+         */
+        if ((EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) != 0) {
+                BIO_printf(bio_err, "AuthEnvelopedData is not supported\n");
+                return (1);
+        }
+        if (EVP_CIPHER_mode(cipher) == EVP_CIPH_XTS_MODE) {
+                BIO_printf(bio_err, "XTS mode not supported\n");
+                return (1);
+        }
+
+        cfg.cipher = cipher;
+
         *argsused = 1;
         return (0);
 }
@@ -475,7 +493,7 @@ static const struct option cms_options[] = {
         },
         {
                 .name = "aes256",
-                .desc = "Encrypt PEM output with CBC AES",
+                .desc = "Encrypt PEM output with CBC AES (default)",
                 .type = OPTION_ARGV_FUNC,
                 .opt.argvfunc = cms_opt_cipher,
         },
@@ -509,7 +527,7 @@ static const struct option cms_options[] = {
         },
         {
                 .name = "des3",
-                .desc = "Encrypt with triple DES (default)",
+                .desc = "Encrypt with triple DES",
                 .type = OPTION_ARGV_FUNC,
                 .opt.argvfunc = cms_opt_cipher,
         },
@@ -1291,14 +1309,8 @@ cms_main(int argc, char **argv)
         }
 
         if (cfg.operation == SMIME_ENCRYPT) {
-                if (cfg.cipher == NULL) {
-#ifndef OPENSSL_NO_DES
-                        cfg.cipher = EVP_des_ede3_cbc();
-#else
-                        BIO_printf(bio_err, "No cipher selected\n");
-                        goto end;
-#endif
-                }
+                if (cfg.cipher == NULL)
+                        cfg.cipher = EVP_aes_256_cbc();
                 if (cfg.secret_key != NULL &&
                     cfg.secret_keyid == NULL) {
                         BIO_printf(bio_err, "No secret key id\n");
diff --git a/src/usr.bin/openssl/gendsa.c b/src/usr.bin/openssl/gendsa.c
index 00635c4551..69a7994da7 100644
--- a/src/usr.bin/openssl/gendsa.c
+++ b/src/usr.bin/openssl/gendsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gendsa.c,v 1.17 2023/03/06 14:32:06 tb Exp $ */
+/* $OpenBSD: gendsa.c,v 1.18 2025/06/07 08:33:58 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -80,7 +80,8 @@ static struct {
         char *passargout;
 } cfg;
 
-static const EVP_CIPHER *get_cipher_by_name(char *name)
+static const EVP_CIPHER *
+get_cipher_by_name(char *name)
 {
         if (name == NULL || strcmp(name, "") == 0)
                 return (NULL);
diff --git a/src/usr.bin/openssl/genrsa.c b/src/usr.bin/openssl/genrsa.c
index 0b5323fa5f..647780d8fa 100644
--- a/src/usr.bin/openssl/genrsa.c
+++ b/src/usr.bin/openssl/genrsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: genrsa.c,v 1.22 2023/03/06 14:32:06 tb Exp $ */
+/* $OpenBSD: genrsa.c,v 1.23 2025/06/07 08:33:58 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -108,7 +108,8 @@ set_public_exponent(int argc, char **argv, int *argsused)
         return (0);
 }
 
-static const EVP_CIPHER *get_cipher_by_name(char *name)
+static const EVP_CIPHER *
+get_cipher_by_name(char *name)
 {
         if (name == NULL || strcmp(name, "") == 0)
                 return (NULL);
diff --git a/src/usr.bin/openssl/ocsp.c b/src/usr.bin/openssl/ocsp.c
index d35940a7ae..01d28aa1f0 100644
--- a/src/usr.bin/openssl/ocsp.c
+++ b/src/usr.bin/openssl/ocsp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ocsp.c,v 1.26 2024/08/31 18:39:25 tb Exp $ */
+/* $OpenBSD: ocsp.c,v 1.27 2025/05/09 12:50:59 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -194,18 +194,18 @@ x509v3_add_value(const char *name, const char *value,
         int ret = 0;
 
         if ((conf_value = calloc(1, sizeof(*conf_value))) == NULL) {
-                X509V3error(ERR_R_MALLOC_FAILURE);
+                perror("calloc");
                 goto err;
         }
         if (name != NULL) {
                 if ((conf_value->name = strdup(name)) == NULL) {
-                        X509V3error(ERR_R_MALLOC_FAILURE);
+                        perror("strdup");
                         goto err;
                 }
         }
         if (value != NULL) {
                 if ((conf_value->value = strdup(value)) == NULL) {
-                        X509V3error(ERR_R_MALLOC_FAILURE);
+                        perror("strdup");
                         goto err;
                 }
         }
@@ -213,12 +213,12 @@ x509v3_add_value(const char *name, const char *value,
         if ((extlist = *out_extlist) == NULL)
                 extlist = sk_CONF_VALUE_new_null();
         if (extlist == NULL) {
-                X509V3error(ERR_R_MALLOC_FAILURE);
+                perror("sk_CONF_VALUE_new_null");
                 goto err;
         }
 
         if (!sk_CONF_VALUE_push(extlist, conf_value)) {
-                X509V3error(ERR_R_MALLOC_FAILURE);
+                perror("sk_CONF_VALUE_push");
                 goto err;
         }
         conf_value = NULL;
diff --git a/src/usr.bin/openssl/openssl.1 b/src/usr.bin/openssl/openssl.1
index 6ceb53ef5c..40defdc38b 100644
--- a/src/usr.bin/openssl/openssl.1
+++ b/src/usr.bin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.162 2025/01/19 10:24:17 tb Exp $
+.\" $OpenBSD: openssl.1,v 1.167 2025/06/07 08:29:20 tb Exp $
 .\" ====================================================================
 .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
 .\"
@@ -110,7 +110,7 @@
 .\" copied and put under another distribution licence
 .\" [including the GNU Public Licence.]
 .\"
-.Dd $Mdocdate: January 19 2025 $
+.Dd $Mdocdate: June 7 2025 $
 .Dt OPENSSL 1
 .Os
 .Sh NAME
@@ -325,7 +325,6 @@ into a nested structure.
 .Op Fl keyfile Ar file
 .Op Fl keyform Cm pem | der
 .Op Fl md Ar alg
-.Op Fl msie_hack
 .Op Fl multivalue-rdn
 .Op Fl name Ar section
 .Op Fl noemailDN
@@ -422,17 +421,6 @@ Possible values include
 and
 .Ar sha1 .
 This option also applies to CRLs.
-.It Fl msie_hack
-This is a legacy option to make
-.Nm ca
-work with very old versions of the IE certificate enrollment control
-.Qq certenr3 .
-It used UniversalStrings for almost everything.
-Since the old control has various security bugs,
-its use is strongly discouraged.
-The newer control
-.Qq Xenroll
-does not need this option.
 .It Fl multivalue-rdn
 This option causes the
 .Fl subj
@@ -629,11 +617,9 @@ specified using
 .Cm default_ca
 or
 .Fl name .
-The options
+The
 .Cm preserve
-and
-.Cm msie_hack
-are read directly from the
+option is read directly from the
 .Cm ca
 section.
 .Pp
@@ -746,9 +732,6 @@ simply set this to
 .Qq no .
 If not present, the default is to allow for the EMAIL field in the
 certificate's DN.
-.It Cm msie_hack
-The same as
-.Fl msie_hack .
 .It Cm name_opt , cert_opt
 These options allow the format used to display the certificate details
 when asking the user to confirm signing.
@@ -1108,7 +1091,7 @@ The encryption algorithm to use.
 128-, 192-, or 256-bit AES, 128-, 192-, or 256-bit CAMELLIA,
 DES (56 bits), triple DES (168 bits),
 or 40-, 64-, or 128-bit RC2, respectively;
-if not specified, triple DES is
+if not specified, 256-bit AES is
 used.
 Only used with
 .Fl encrypt
@@ -2990,9 +2973,6 @@ command processes private keys
 (both encrypted and unencrypted)
 in PKCS#8 format
 with a variety of PKCS#5 (v1.5 and v2.0) and PKCS#12 algorithms.
-The default encryption is only 56 bits;
-keys encrypted using PKCS#5 v2.0 algorithms and high iteration counts
-are more secure.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
@@ -3038,16 +3018,12 @@ which allow strong encryption algorithms like triple DES or 128-bit RC2.
 .El
 .It Fl v2 Ar alg
 Use PKCS#5 v2.0 algorithms.
-Supports algorithms such as 168-bit triple DES or 128-bit RC2,
-however not many implementations support PKCS#5 v2.0 yet
-(if using private keys with
-.Nm openssl
-this doesn't matter).
-.Pp
-.Ar alg
-is the encryption algorithm to use;
-valid values include des, des3, and rc2.
-It is recommended that des3 is used.
+These are block ciphers used in CBC mode.
+The default is AES-256-CBC.
+With the exception of AES, the choices available in RFC 8018
+are considered decrepit.
+They can be enabled with des, des3, and rc2
+(rc5 is no longer supported).
 .El
 .Tg pkcs12
 .Sh PKCS12
@@ -5122,7 +5098,7 @@ The remaining options are as follows:
 The encryption algorithm to use.
 128-, 192-, or 256-bit AES, DES (56 bits), triple DES (168 bits),
 or 40-, 64-, or 128-bit RC2, respectively;
-if not specified, 40-bit RC2 is
+if not specified, 256-bit AES is
 used.
 Only used with
 .Fl encrypt .
@@ -6165,7 +6141,7 @@ either using a list of comma-separated options or by specifying
 .Fl nameopt
 multiple times.
 The default behaviour is to use the
-.Cm oneline
+.Cm compat
 format.
 The options,
 which can be preceded by a dash to turn them off,
@@ -6247,7 +6223,7 @@ A one line format which is more readable than
 .Cm RFC2253 .
 Equivalent to
 .Cm esc_2253 , esc_ctrl , esc_msb , utf8 ,
-.Cm dump_nostr , dump_der , use_quote , sep_comma_plus_spc ,
+.Cm dump_nostr , dump_der , use_quote , sep_comma_plus_space ,
 .Cm space_eq ,
 and
 .Cm sname .
diff --git a/src/usr.bin/openssl/openssl.c b/src/usr.bin/openssl/openssl.c
index 75a0e4d266..a1ef139009 100644
--- a/src/usr.bin/openssl/openssl.c
+++ b/src/usr.bin/openssl/openssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openssl.c,v 1.39 2025/01/02 13:10:03 tb Exp $ */
+/* $OpenBSD: openssl.c,v 1.40 2025/05/25 04:54:41 joshua Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -235,9 +235,6 @@ FUNCTION functions[] = {
         { FUNC_TYPE_MD, "sm3", dgst_main },
         { FUNC_TYPE_MD, "sm3WithRSAEncryption", dgst_main },
 #endif
-#ifndef OPENSSL_NO_WHIRLPOOL
-        { FUNC_TYPE_MD, "whirlpool", dgst_main },
-#endif
 
         /* Ciphers. */
         { FUNC_TYPE_CIPHER, "base64", enc_main },
diff --git a/src/usr.bin/openssl/pkcs12.c b/src/usr.bin/openssl/pkcs12.c
index 1407a96e03..efd6d59163 100644
--- a/src/usr.bin/openssl/pkcs12.c
+++ b/src/usr.bin/openssl/pkcs12.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs12.c,v 1.29 2024/12/26 14:10:48 tb Exp $ */
+/* $OpenBSD: pkcs12.c,v 1.30 2025/06/07 08:33:58 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -152,7 +152,8 @@ pkcs12_opt_passarg(char *arg)
         return (0);
 }
 
-static const EVP_CIPHER *get_cipher_by_name(char *name)
+static const EVP_CIPHER *
+get_cipher_by_name(char *name)
 {
         if (name == NULL || strcmp(name, "") == 0)
                 return (NULL);
diff --git a/src/usr.bin/openssl/pkcs8.c b/src/usr.bin/openssl/pkcs8.c
index 10fad7aed1..5d7c52f865 100644
--- a/src/usr.bin/openssl/pkcs8.c
+++ b/src/usr.bin/openssl/pkcs8.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs8.c,v 1.18 2025/01/02 12:31:44 tb Exp $ */
+/* $OpenBSD: pkcs8.c,v 1.19 2025/05/24 02:35:25 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999-2004.
  */
@@ -224,8 +224,8 @@ pkcs8_main(int argc, char **argv)
                 BIO_printf(bio_err, "Error getting passwords\n");
                 goto end;
         }
-        if ((cfg.pbe_nid == -1) && !cfg.cipher)
-                cfg.pbe_nid = NID_pbeWithMD5AndDES_CBC;
+        if (cfg.pbe_nid == -1 && cfg.cipher == NULL)
+                cfg.cipher = EVP_aes_256_cbc();
 
         if (cfg.infile) {
                 if (!(in = BIO_new_file(cfg.infile, "rb"))) {
diff --git a/src/usr.bin/openssl/smime.c b/src/usr.bin/openssl/smime.c
index 46bfa08679..f9d7049ff9 100644
--- a/src/usr.bin/openssl/smime.c
+++ b/src/usr.bin/openssl/smime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smime.c,v 1.20 2023/04/14 15:27:13 tb Exp $ */
+/* $OpenBSD: smime.c,v 1.21 2025/06/07 08:28:49 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -271,7 +271,7 @@ static const struct option smime_options[] = {
         },
         {
                 .name = "aes256",
-                .desc = "Encrypt PEM output with CBC AES",
+                .desc = "Encrypt PEM output with CBC AES (default)",
                 .type = OPTION_ARGV_FUNC,
                 .opt.argvfunc = smime_opt_cipher,
         },
@@ -313,7 +313,7 @@ static const struct option smime_options[] = {
 #ifndef OPENSSL_NO_RC2
         {
                 .name = "rc2-40",
-                .desc = "Encrypt with RC2-40 (default)",
+                .desc = "Encrypt with RC2-40",
                 .type = OPTION_ARGV_FUNC,
                 .opt.argvfunc = smime_opt_cipher,
         },
@@ -825,14 +825,8 @@ smime_main(int argc, char **argv)
         }
 
         if (cfg.operation == SMIME_ENCRYPT) {
-                if (cfg.cipher == NULL) {
-#ifndef OPENSSL_NO_RC2
-                        cfg.cipher = EVP_rc2_40_cbc();
-#else
-                        BIO_printf(bio_err, "No cipher selected\n");
-                        goto end;
-#endif
-                }
+                if (cfg.cipher == NULL)
+                        cfg.cipher = EVP_aes_256_cbc();
                 if ((encerts = sk_X509_new_null()) == NULL)
                         goto end;
                 while (*args != NULL) {
diff --git a/src/usr.bin/openssl/speed.c b/src/usr.bin/openssl/speed.c
index 9d03c6516e..3e9b4faa9d 100644
--- a/src/usr.bin/openssl/speed.c
+++ b/src/usr.bin/openssl/speed.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: speed.c,v 1.41 2025/01/02 13:37:43 tb Exp $ */
+/* $OpenBSD: speed.c,v 1.46 2025/05/25 05:05:30 joshua Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -142,9 +142,6 @@
 #ifndef OPENSSL_NO_SHA
 #include <openssl/sha.h>
 #endif
-#ifndef OPENSSL_NO_WHIRLPOOL
-#include <openssl/whrlpool.h>
-#endif
 
 #define BUFSIZE (1024*8+64)
 volatile sig_atomic_t run;
@@ -152,7 +149,6 @@ volatile sig_atomic_t run;
 static int mr = 0;
 static int usertime = 1;
 
-static double Time_F(int s);
 static void print_message(const char *s, long num, int length);
 static void
 pkey_print_message(const char *str, const char *str2,
@@ -160,7 +156,7 @@ pkey_print_message(const char *str, const char *str2,
 static void print_result(int alg, int run_no, int count, double time_used);
 static int do_multi(int multi);
 
-#define ALGOR_NUM       32
+#define ALGOR_NUM       31
 #define SIZE_NUM        5
 #define RSA_NUM         4
 #define DSA_NUM         3
@@ -174,7 +170,7 @@ static const char *names[ALGOR_NUM] = {
         "rc2 cbc", "rc5-32/12 cbc", "blowfish cbc", "cast cbc",
         "aes-128 cbc", "aes-192 cbc", "aes-256 cbc",
         "camellia-128 cbc", "camellia-192 cbc", "camellia-256 cbc",
-        "evp", "sha256", "sha512", "whirlpool",
+        "evp", "sha256", "sha512",
         "aes-128 ige", "aes-192 ige", "aes-256 ige", "ghash",
         "aes-128 gcm", "aes-256 gcm", "chacha20 poly1305",
 };
@@ -895,6 +891,22 @@ static const unsigned char test4096[] = {
         0xaf, 0xf8, 0x2a, 0x91, 0x9d, 0x50, 0x44, 0x21, 0x17,
 };
 
+static const unsigned char key16[] = {
+        0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
+        0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12,
+};
+static const unsigned char key24[] = {
+        0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
+        0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12,
+        0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34,
+};
+static const unsigned char key32[] = {
+        0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
+        0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12,
+        0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34,
+        0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34, 0x56,
+};
+
 static void
 sig_done(int sig)
 {
@@ -904,16 +916,14 @@ sig_done(int sig)
 #define START   TM_RESET
 #define STOP    TM_GET
 
-
 static double
-Time_F(int s)
+time_f(int s)
 {
         if (usertime)
                 return app_timer_user(s);
-        else
-                return app_timer_real(s);
-}
 
+        return app_timer_real(s);
+}
 
 static const int KDF1_SHA1_len = 20;
 static void *
@@ -942,28 +952,7 @@ speed_main(int argc, char **argv)
         long rsa_count;
         unsigned rsa_num;
         unsigned char md[EVP_MAX_MD_SIZE];
-#ifndef OPENSSL_NO_MD4
-        unsigned char md4[MD4_DIGEST_LENGTH];
-#endif
-#ifndef OPENSSL_NO_MD5
-        unsigned char md5[MD5_DIGEST_LENGTH];
-        unsigned char hmac[MD5_DIGEST_LENGTH];
-#endif
-#ifndef OPENSSL_NO_SHA
-        unsigned char sha[SHA_DIGEST_LENGTH];
-#ifndef OPENSSL_NO_SHA256
-        unsigned char sha256[SHA256_DIGEST_LENGTH];
-#endif
-#ifndef OPENSSL_NO_SHA512
-        unsigned char sha512[SHA512_DIGEST_LENGTH];
-#endif
-#endif
-#ifndef OPENSSL_NO_WHIRLPOOL
-        unsigned char whirlpool[WHIRLPOOL_DIGEST_LENGTH];
-#endif
-#ifndef OPENSSL_NO_RIPEMD
-        unsigned char rmd160[RIPEMD160_DIGEST_LENGTH];
-#endif
+
 #ifndef OPENSSL_NO_RC4
         RC4_KEY rc4_ks;
 #endif
@@ -979,38 +968,8 @@ speed_main(int argc, char **argv)
 #ifndef OPENSSL_NO_CAST
         CAST_KEY cast_ks;
 #endif
-        static const unsigned char key16[16] =
-        {0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
-        0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12};
-#ifndef OPENSSL_NO_AES
-        static const unsigned char key24[24] =
-        {0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
-                0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12,
-        0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34};
-        static const unsigned char key32[32] =
-        {0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
-                0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12,
-                0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34,
-        0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34, 0x56};
-#endif
-#ifndef OPENSSL_NO_CAMELLIA
-        static const unsigned char ckey24[24] =
-        {0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
-                0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12,
-        0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34};
-        static const unsigned char ckey32[32] =
-        {0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
-                0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12,
-                0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34,
-        0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34, 0x56};
-#endif
-#ifndef OPENSSL_NO_AES
-#define MAX_BLOCK_SIZE 128
-#else
-#define MAX_BLOCK_SIZE 64
-#endif
         unsigned char DES_iv[8];
-        unsigned char iv[2 * MAX_BLOCK_SIZE / 8];
+        unsigned char iv[2 * 16];
 #ifndef OPENSSL_NO_DES
         static DES_cblock key = {0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0};
         static DES_cblock key2 = {0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12};
@@ -1049,14 +1008,13 @@ speed_main(int argc, char **argv)
 #define D_EVP           21
 #define D_SHA256        22
 #define D_SHA512        23
-#define D_WHIRLPOOL     24
-#define D_IGE_128_AES   25
-#define D_IGE_192_AES   26
-#define D_IGE_256_AES   27
-#define D_GHASH         28
-#define D_AES_128_GCM   29
-#define D_AES_256_GCM   30
-#define D_CHACHA20_POLY1305     31
+#define D_IGE_128_AES   24
+#define D_IGE_192_AES   25
+#define D_IGE_256_AES   26
+#define D_GHASH         27
+#define D_AES_128_GCM   28
+#define D_AES_256_GCM   29
+#define D_CHACHA20_POLY1305     30
         double d = 0.0;
         long c[ALGOR_NUM][SIZE_NUM];
 #define R_DSA_512       0
@@ -1275,11 +1233,6 @@ speed_main(int argc, char **argv)
                 else
 #endif
 #endif
-#ifndef OPENSSL_NO_WHIRLPOOL
-                if (strcmp(*argv, "whirlpool") == 0)
-                        doit[D_WHIRLPOOL] = 1;
-                else
-#endif
 #ifndef OPENSSL_NO_RIPEMD
                 if (strcmp(*argv, "ripemd") == 0)
                         doit[D_RMD160] = 1;
@@ -1462,16 +1415,12 @@ speed_main(int argc, char **argv)
 #ifndef OPENSSL_NO_SHA512
                         BIO_printf(bio_err, "sha512   ");
 #endif
-#ifndef OPENSSL_NO_WHIRLPOOL
-                        BIO_printf(bio_err, "whirlpool");
-#endif
 #ifndef OPENSSL_NO_RIPEMD160
                         BIO_printf(bio_err, "rmd160");
 #endif
 #if !defined(OPENSSL_NO_MD2) || \
     !defined(OPENSSL_NO_MD4) || !defined(OPENSSL_NO_MD5) || \
-    !defined(OPENSSL_NO_SHA1) || !defined(OPENSSL_NO_RIPEMD160) || \
-    !defined(OPENSSL_NO_WHIRLPOOL)
+    !defined(OPENSSL_NO_SHA1) || !defined(OPENSSL_NO_RIPEMD160)
                         BIO_printf(bio_err, "\n");
 #endif
 
@@ -1602,8 +1551,8 @@ speed_main(int argc, char **argv)
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
         Camellia_set_key(key16, 128, &camellia_ks1);
-        Camellia_set_key(ckey24, 192, &camellia_ks2);
-        Camellia_set_key(ckey32, 256, &camellia_ks3);
+        Camellia_set_key(key24, 192, &camellia_ks2);
+        Camellia_set_key(key32, 256, &camellia_ks3);
 #endif
 #ifndef OPENSSL_NO_IDEA
         idea_set_encrypt_key(key16, &idea_ks);
@@ -1634,10 +1583,10 @@ speed_main(int argc, char **argv)
         if (doit[D_MD4]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_MD4], c[D_MD4][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_MD4][j]); count++)
-                                EVP_Digest(&(buf[0]), (unsigned long) lengths[j], &(md4[0]), NULL, EVP_md4(), NULL);
-                        d = Time_F(STOP);
+                                EVP_Digest(&(buf[0]), (unsigned long) lengths[j], md, NULL, EVP_md4(), NULL);
+                        d = time_f(STOP);
                         print_result(D_MD4, j, count, d);
                 }
         }
@@ -1647,10 +1596,10 @@ speed_main(int argc, char **argv)
         if (doit[D_MD5]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_MD5], c[D_MD5][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_MD5][j]); count++)
-                                EVP_Digest(&(buf[0]), (unsigned long) lengths[j], &(md5[0]), NULL, EVP_get_digestbyname("md5"), NULL);
-                        d = Time_F(STOP);
+                                EVP_Digest(&(buf[0]), (unsigned long) lengths[j], md, NULL, EVP_get_digestbyname("md5"), NULL);
+                        d = time_f(STOP);
                         print_result(D_MD5, j, count, d);
                 }
         }
@@ -1670,7 +1619,7 @@ speed_main(int argc, char **argv)
 
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_HMAC], c[D_HMAC][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_HMAC][j]); count++) {
                                 if (!HMAC_Init_ex(hctx, NULL, 0, NULL, NULL)) {
                                         HMAC_CTX_free(hctx);
@@ -1680,12 +1629,12 @@ speed_main(int argc, char **argv)
                                         HMAC_CTX_free(hctx);
                                         goto end;
                                 }
-                                if (!HMAC_Final(hctx, &(hmac[0]), NULL)) {
+                                if (!HMAC_Final(hctx, md, NULL)) {
                                         HMAC_CTX_free(hctx);
                                         goto end;
                                 }
                         }
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_HMAC, j, count, d);
                 }
                 HMAC_CTX_free(hctx);
@@ -1695,10 +1644,10 @@ speed_main(int argc, char **argv)
         if (doit[D_SHA1]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_SHA1], c[D_SHA1][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_SHA1][j]); count++)
-                                EVP_Digest(buf, (unsigned long) lengths[j], &(sha[0]), NULL, EVP_sha1(), NULL);
-                        d = Time_F(STOP);
+                                EVP_Digest(buf, (unsigned long) lengths[j], md, NULL, EVP_sha1(), NULL);
+                        d = time_f(STOP);
                         print_result(D_SHA1, j, count, d);
                 }
         }
@@ -1706,10 +1655,10 @@ speed_main(int argc, char **argv)
         if (doit[D_SHA256]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_SHA256], c[D_SHA256][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_SHA256][j]); count++)
-                                SHA256(buf, lengths[j], sha256);
-                        d = Time_F(STOP);
+                                SHA256(buf, lengths[j], md);
+                        d = time_f(STOP);
                         print_result(D_SHA256, j, count, d);
                 }
         }
@@ -1719,37 +1668,24 @@ speed_main(int argc, char **argv)
         if (doit[D_SHA512]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_SHA512], c[D_SHA512][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_SHA512][j]); count++)
-                                SHA512(buf, lengths[j], sha512);
-                        d = Time_F(STOP);
+                                SHA512(buf, lengths[j], md);
+                        d = time_f(STOP);
                         print_result(D_SHA512, j, count, d);
                 }
         }
 #endif
 #endif
 
-#ifndef OPENSSL_NO_WHIRLPOOL
-        if (doit[D_WHIRLPOOL]) {
-                for (j = 0; j < SIZE_NUM; j++) {
-                        print_message(names[D_WHIRLPOOL], c[D_WHIRLPOOL][j], lengths[j]);
-                        Time_F(START);
-                        for (count = 0, run = 1; COND(c[D_WHIRLPOOL][j]); count++)
-                                WHIRLPOOL(buf, lengths[j], whirlpool);
-                        d = Time_F(STOP);
-                        print_result(D_WHIRLPOOL, j, count, d);
-                }
-        }
-#endif
-
 #ifndef OPENSSL_NO_RIPEMD
         if (doit[D_RMD160]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_RMD160], c[D_RMD160][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_RMD160][j]); count++)
-                                EVP_Digest(buf, (unsigned long) lengths[j], &(rmd160[0]), NULL, EVP_ripemd160(), NULL);
-                        d = Time_F(STOP);
+                                EVP_Digest(buf, (unsigned long) lengths[j], md, NULL, EVP_ripemd160(), NULL);
+                        d = time_f(STOP);
                         print_result(D_RMD160, j, count, d);
                 }
         }
@@ -1758,11 +1694,11 @@ speed_main(int argc, char **argv)
         if (doit[D_RC4]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_RC4], c[D_RC4][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_RC4][j]); count++)
                                 RC4(&rc4_ks, (unsigned int) lengths[j],
                                     buf, buf);
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_RC4, j, count, d);
                 }
         }
@@ -1771,23 +1707,23 @@ speed_main(int argc, char **argv)
         if (doit[D_CBC_DES]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_CBC_DES], c[D_CBC_DES][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_CBC_DES][j]); count++)
                                 DES_ncbc_encrypt(buf, buf, lengths[j], &sch,
                                     &DES_iv, DES_ENCRYPT);
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_CBC_DES, j, count, d);
                 }
         }
         if (doit[D_EDE3_DES]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_EDE3_DES], c[D_EDE3_DES][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_EDE3_DES][j]); count++)
                                 DES_ede3_cbc_encrypt(buf, buf, lengths[j],
                                     &sch, &sch2, &sch3,
                                     &DES_iv, DES_ENCRYPT);
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_EDE3_DES, j, count, d);
                 }
         }
@@ -1796,72 +1732,72 @@ speed_main(int argc, char **argv)
         if (doit[D_CBC_128_AES]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_CBC_128_AES], c[D_CBC_128_AES][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_CBC_128_AES][j]); count++)
                                 AES_cbc_encrypt(buf, buf,
                                     (unsigned long) lengths[j], &aes_ks1,
                                     iv, AES_ENCRYPT);
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_CBC_128_AES, j, count, d);
                 }
         }
         if (doit[D_CBC_192_AES]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_CBC_192_AES], c[D_CBC_192_AES][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_CBC_192_AES][j]); count++)
                                 AES_cbc_encrypt(buf, buf,
                                     (unsigned long) lengths[j], &aes_ks2,
                                     iv, AES_ENCRYPT);
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_CBC_192_AES, j, count, d);
                 }
         }
         if (doit[D_CBC_256_AES]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_CBC_256_AES], c[D_CBC_256_AES][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_CBC_256_AES][j]); count++)
                                 AES_cbc_encrypt(buf, buf,
                                     (unsigned long) lengths[j], &aes_ks3,
                                     iv, AES_ENCRYPT);
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_CBC_256_AES, j, count, d);
                 }
         }
         if (doit[D_IGE_128_AES]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_IGE_128_AES], c[D_IGE_128_AES][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_IGE_128_AES][j]); count++)
                                 AES_ige_encrypt(buf, buf2,
                                     (unsigned long) lengths[j], &aes_ks1,
                                     iv, AES_ENCRYPT);
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_IGE_128_AES, j, count, d);
                 }
         }
         if (doit[D_IGE_192_AES]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_IGE_192_AES], c[D_IGE_192_AES][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_IGE_192_AES][j]); count++)
                                 AES_ige_encrypt(buf, buf2,
                                     (unsigned long) lengths[j], &aes_ks2,
                                     iv, AES_ENCRYPT);
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_IGE_192_AES, j, count, d);
                 }
         }
         if (doit[D_IGE_256_AES]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_IGE_256_AES], c[D_IGE_256_AES][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_IGE_256_AES][j]); count++)
                                 AES_ige_encrypt(buf, buf2,
                                     (unsigned long) lengths[j], &aes_ks3,
                                     iv, AES_ENCRYPT);
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_IGE_256_AES, j, count, d);
                 }
         }
@@ -1871,10 +1807,10 @@ speed_main(int argc, char **argv)
 
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_GHASH], c[D_GHASH][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_GHASH][j]); count++)
                                 CRYPTO_gcm128_aad(ctx, buf, lengths[j]);
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_GHASH, j, count, d);
                 }
                 CRYPTO_gcm128_release(ctx);
@@ -1897,11 +1833,11 @@ speed_main(int argc, char **argv)
 
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_AES_128_GCM],c[D_AES_128_GCM][j],lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_AES_128_GCM][j]); count++)
                                 EVP_AEAD_CTX_seal(ctx, buf, &buf_len, BUFSIZE, nonce,
                                     nonce_len, buf, lengths[j], NULL, 0);
-                        d=Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_AES_128_GCM,j,count,d);
                 }
                 EVP_AEAD_CTX_free(ctx);
@@ -1925,11 +1861,11 @@ speed_main(int argc, char **argv)
 
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_AES_256_GCM],c[D_AES_256_GCM][j],lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_AES_256_GCM][j]); count++)
                                 EVP_AEAD_CTX_seal(ctx, buf, &buf_len, BUFSIZE, nonce,
                                     nonce_len, buf, lengths[j], NULL, 0);
-                        d=Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_AES_256_GCM, j, count, d);
                 }
                 EVP_AEAD_CTX_free(ctx);
@@ -1955,11 +1891,11 @@ speed_main(int argc, char **argv)
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_CHACHA20_POLY1305],
                             c[D_CHACHA20_POLY1305][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_CHACHA20_POLY1305][j]); count++)
                                 EVP_AEAD_CTX_seal(ctx, buf, &buf_len, BUFSIZE, nonce,
                                     nonce_len, buf, lengths[j], NULL, 0);
-                        d=Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_CHACHA20_POLY1305, j, count, d);
                 }
                 EVP_AEAD_CTX_free(ctx);
@@ -1969,36 +1905,36 @@ speed_main(int argc, char **argv)
         if (doit[D_CBC_128_CML]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_CBC_128_CML], c[D_CBC_128_CML][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_CBC_128_CML][j]); count++)
                                 Camellia_cbc_encrypt(buf, buf,
                                     (unsigned long) lengths[j], &camellia_ks1,
                                     iv, CAMELLIA_ENCRYPT);
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_CBC_128_CML, j, count, d);
                 }
         }
         if (doit[D_CBC_192_CML]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_CBC_192_CML], c[D_CBC_192_CML][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_CBC_192_CML][j]); count++)
                                 Camellia_cbc_encrypt(buf, buf,
                                     (unsigned long) lengths[j], &camellia_ks2,
                                     iv, CAMELLIA_ENCRYPT);
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_CBC_192_CML, j, count, d);
                 }
         }
         if (doit[D_CBC_256_CML]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_CBC_256_CML], c[D_CBC_256_CML][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_CBC_256_CML][j]); count++)
                                 Camellia_cbc_encrypt(buf, buf,
                                     (unsigned long) lengths[j], &camellia_ks3,
                                     iv, CAMELLIA_ENCRYPT);
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_CBC_256_CML, j, count, d);
                 }
         }
@@ -2007,12 +1943,12 @@ speed_main(int argc, char **argv)
         if (doit[D_CBC_IDEA]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_CBC_IDEA], c[D_CBC_IDEA][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_CBC_IDEA][j]); count++)
                                 idea_cbc_encrypt(buf, buf,
                                     (unsigned long) lengths[j], &idea_ks,
                                     iv, IDEA_ENCRYPT);
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_CBC_IDEA, j, count, d);
                 }
         }
@@ -2021,12 +1957,12 @@ speed_main(int argc, char **argv)
         if (doit[D_CBC_RC2]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_CBC_RC2], c[D_CBC_RC2][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_CBC_RC2][j]); count++)
                                 RC2_cbc_encrypt(buf, buf,
                                     (unsigned long) lengths[j], &rc2_ks,
                                     iv, RC2_ENCRYPT);
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_CBC_RC2, j, count, d);
                 }
         }
@@ -2035,12 +1971,12 @@ speed_main(int argc, char **argv)
         if (doit[D_CBC_BF]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_CBC_BF], c[D_CBC_BF][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_CBC_BF][j]); count++)
                                 BF_cbc_encrypt(buf, buf,
                                     (unsigned long) lengths[j], &bf_ks,
                                     iv, BF_ENCRYPT);
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_CBC_BF, j, count, d);
                 }
         }
@@ -2049,12 +1985,12 @@ speed_main(int argc, char **argv)
         if (doit[D_CBC_CAST]) {
                 for (j = 0; j < SIZE_NUM; j++) {
                         print_message(names[D_CBC_CAST], c[D_CBC_CAST][j], lengths[j]);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(c[D_CBC_CAST][j]); count++)
                                 CAST_cbc_encrypt(buf, buf,
                                     (unsigned long) lengths[j], &cast_ks,
                                     iv, CAST_ENCRYPT);
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         print_result(D_CBC_CAST, j, count, d);
                 }
         }
@@ -2087,7 +2023,7 @@ speed_main(int argc, char **argv)
                                         EVP_EncryptInit_ex(ctx, evp_cipher, NULL, key16, iv);
                                 EVP_CIPHER_CTX_set_padding(ctx, 0);
 
-                                Time_F(START);
+                                time_f(START);
                                 if (decrypt)
                                         for (count = 0, run = 1; COND(save_count * 4 * lengths[0] / lengths[j]); count++)
                                                 EVP_DecryptUpdate(ctx, buf, &outl, buf, lengths[j]);
@@ -2098,7 +2034,7 @@ speed_main(int argc, char **argv)
                                         EVP_DecryptFinal_ex(ctx, buf, &outl);
                                 else
                                         EVP_EncryptFinal_ex(ctx, buf, &outl);
-                                d = Time_F(STOP);
+                                d = time_f(STOP);
                                 EVP_CIPHER_CTX_free(ctx);
                         }
                         if (evp_md) {
@@ -2106,11 +2042,11 @@ speed_main(int argc, char **argv)
                                 print_message(names[D_EVP], save_count,
                                     lengths[j]);
 
-                                Time_F(START);
+                                time_f(START);
                                 for (count = 0, run = 1; COND(save_count * 4 * lengths[0] / lengths[j]); count++)
                                         EVP_Digest(buf, lengths[j], &(md[0]), NULL, evp_md, NULL);
 
-                                d = Time_F(STOP);
+                                d = time_f(STOP);
                         }
                         print_result(D_EVP, j, count, d);
                 }
@@ -2130,7 +2066,7 @@ speed_main(int argc, char **argv)
                             rsa_c[j][0], rsa_bits[j],
                             RSA_SECONDS);
 /*                      RSA_blinding_on(rsa_key[j],NULL); */
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(rsa_c[j][0]); count++) {
                                 ret = RSA_sign(NID_md5_sha1, buf, 36, buf2,
                                     &rsa_num, rsa_key[j]);
@@ -2142,7 +2078,7 @@ speed_main(int argc, char **argv)
                                         break;
                                 }
                         }
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         BIO_printf(bio_err, mr ? "+R1:%ld:%d:%.2f\n"
                             : "%ld %d bit private RSA in %.2fs\n",
                             count, rsa_bits[j], d);
@@ -2159,7 +2095,7 @@ speed_main(int argc, char **argv)
                         pkey_print_message("public", "rsa",
                             rsa_c[j][1], rsa_bits[j],
                             RSA_SECONDS);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(rsa_c[j][1]); count++) {
                                 ret = RSA_verify(NID_md5_sha1, buf, 36, buf2,
                                     rsa_num, rsa_key[j]);
@@ -2171,7 +2107,7 @@ speed_main(int argc, char **argv)
                                         break;
                                 }
                         }
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         BIO_printf(bio_err, mr ? "+R2:%ld:%d:%.2f\n"
                             : "%ld %d bit public RSA in %.2fs\n",
                             count, rsa_bits[j], d);
@@ -2204,7 +2140,7 @@ speed_main(int argc, char **argv)
                         pkey_print_message("sign", "dsa",
                             dsa_c[j][0], dsa_bits[j],
                             DSA_SECONDS);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(dsa_c[j][0]); count++) {
                                 ret = DSA_sign(EVP_PKEY_DSA, buf, 20, buf2,
                                     &kk, dsa_key[j]);
@@ -2216,7 +2152,7 @@ speed_main(int argc, char **argv)
                                         break;
                                 }
                         }
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         BIO_printf(bio_err, mr ? "+R3:%ld:%d:%.2f\n"
                             : "%ld %d bit DSA signs in %.2fs\n",
                             count, dsa_bits[j], d);
@@ -2234,7 +2170,7 @@ speed_main(int argc, char **argv)
                         pkey_print_message("verify", "dsa",
                             dsa_c[j][1], dsa_bits[j],
                             DSA_SECONDS);
-                        Time_F(START);
+                        time_f(START);
                         for (count = 0, run = 1; COND(dsa_c[j][1]); count++) {
                                 ret = DSA_verify(EVP_PKEY_DSA, buf, 20, buf2,
                                     kk, dsa_key[j]);
@@ -2246,7 +2182,7 @@ speed_main(int argc, char **argv)
                                         break;
                                 }
                         }
-                        d = Time_F(STOP);
+                        d = time_f(STOP);
                         BIO_printf(bio_err, mr ? "+R4:%ld:%d:%.2f\n"
                             : "%ld %d bit DSA verify in %.2fs\n",
                             count, dsa_bits[j], d);
@@ -2287,7 +2223,7 @@ speed_main(int argc, char **argv)
                                     test_curves_bits[j],
                                     ECDSA_SECONDS);
 
-                                Time_F(START);
+                                time_f(START);
                                 for (count = 0, run = 1; COND(ecdsa_c[j][0]);
                                     count++) {
                                         ret = ECDSA_sign(0, buf, 20,
@@ -2300,7 +2236,7 @@ speed_main(int argc, char **argv)
                                                 break;
                                         }
                                 }
-                                d = Time_F(STOP);
+                                d = time_f(STOP);
 
                                 BIO_printf(bio_err, mr ? "+R5:%ld:%d:%.2f\n" :
                                     "%ld %d bit ECDSA signs in %.2fs \n",
@@ -2321,7 +2257,7 @@ speed_main(int argc, char **argv)
                                     ecdsa_c[j][1],
                                     test_curves_bits[j],
                                     ECDSA_SECONDS);
-                                Time_F(START);
+                                time_f(START);
                                 for (count = 0, run = 1; COND(ecdsa_c[j][1]); count++) {
                                         ret = ECDSA_verify(0, buf, 20, ecdsasig, ecdsasiglen, ecdsa[j]);
                                         if (ret != 1) {
@@ -2331,7 +2267,7 @@ speed_main(int argc, char **argv)
                                                 break;
                                         }
                                 }
-                                d = Time_F(STOP);
+                                d = time_f(STOP);
                                 BIO_printf(bio_err, mr ? "+R6:%ld:%d:%.2f\n"
                                     : "%ld %d bit ECDSA verify in %.2fs\n",
                                     count, test_curves_bits[j], d);
@@ -2408,7 +2344,7 @@ speed_main(int argc, char **argv)
                                             ecdh_c[j][0],
                                             test_curves_bits[j],
                                             ECDH_SECONDS);
-                                        Time_F(START);
+                                        time_f(START);
                                         for (count = 0, run = 1;
                                              COND(ecdh_c[j][0]); count++) {
                                                 ECDH_compute_key(secret_a,
@@ -2416,7 +2352,7 @@ speed_main(int argc, char **argv)
                                                     EC_KEY_get0_public_key(ecdh_b[j]),
                                                     ecdh_a[j], kdf);
                                         }
-                                        d = Time_F(STOP);
+                                        d = time_f(STOP);
                                         BIO_printf(bio_err, mr
                                             ? "+R7:%ld:%d:%.2f\n"
                                             : "%ld %d-bit ECDH ops in %.2fs\n",