x509storeissuer update

.github/workflows/test.yml

@@ -33,7 +33,7 @@ jobs:
     - name: "Config openssl build"
       working-directory: "./openssl"
       run: |
-        ./config --prefix="$PWD/dist"
+        ./config no-apps no-tests --prefix="$PWD/dist"
     - name: "Build openssl"
       working-directory: "./openssl"
       run: |
@@ -85,7 +85,7 @@ jobs:
     - name: "Config openssl build"
       working-directory: "./openssl"
       run: |
-        ./config --prefix="$PWD/dist"
+        ./config no-apps no-tests --prefix="$PWD/dist"
     - name: "Build openssl"
       working-directory: "./openssl"
       run: |
@@ -143,7 +143,7 @@ jobs:
         shutdown_vm: false
         run: |
           cd openssl
-          ./config --prefix="$PWD/dist"
+          ./config no-apps no-tests --prefix="$PWD/dist"
     - name: "Build openssl"
       uses: "cross-platform-actions/action@fe0167d8082ac584754ef3ffb567fded22642c7d" #v0.27.0
       with:
@@ -214,7 +214,7 @@ jobs:
       shell: cmd
       run: |
         call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-        perl Configure no-makedepend
+        perl Configure no-makedepend no-apps no-tests
     - name: "Build openssl"
       working-directory: ".\\openssl"
       shell: cmd
@@ -257,7 +257,7 @@ jobs:
     - name: "Config openssl build"
       working-directory: "./openssl"
       run: |
-        ./config --prefix="$PWD/dist"
+        ./config no-apps no-tests --prefix="$PWD/dist"
     - name: "Build openssl"
       working-directory: "./openssl"
       run: |

source/CMakeLists.txt

@@ -117,6 +117,12 @@ if(WIN32)
     target_sources(perf PRIVATE perflib/getopt.c perflib/basename.c perflib/err.c)
 endif()
 
+if(WIN32)
+    set(libm_dep)
+else()
+    set(libm_dep PUBLIC m)
+endif()
+
 target_include_directories(perf PUBLIC "${PROJECT_SOURCE_DIR}")
 target_link_libraries(perf PUBLIC OpenSSL::SSL OpenSSL::Crypto)
 
@@ -154,17 +160,13 @@ add_executable(rsasign rsasign.c)
 target_link_libraries(rsasign PRIVATE perf)
 
 add_executable(x509storeissuer x509storeissuer.c)
-target_link_libraries(x509storeissuer PRIVATE perf)
+target_link_libraries(x509storeissuer ${libm_dep} PRIVATE perf)
 
 add_executable(rwlocks rwlocks.c)
 target_link_libraries(rwlocks PRIVATE perf)
 
 add_executable(pkeyread pkeyread.c)
-if(WIN32)
-    target_link_libraries(pkeyread PRIVATE perf)
-else()
-    target_link_libraries(pkeyread PUBLIC m PRIVATE perf)
-endif()
+target_link_libraries(pkeyread ${libm_dep} PRIVATE perf)
 
 add_executable(evp_setpeer evp_setpeer.c)
 target_link_libraries(evp_setpeer PRIVATE perf)

source/evp_fetch.c

@@ -61,7 +61,7 @@
 size_t *counts;
 OSSL_TIME max_time;
 
-int err = 0;
+int error = 0;
 int pq = 0;
 
 static int threadcount;
@@ -194,7 +194,7 @@ void do_fetch(size_t num)
             fetch_alg = exclusive_fetch_alg;
         }
 
-        if (err == 1)
+        if (error == 1)
             return;
 
         switch (j) {
@@ -203,7 +203,7 @@ void do_fetch(size_t num)
                                       fetch_entries[j].propq);
             if (md == NULL) {
                 fprintf(stderr, "Failed to fetch %s\n", fetch_alg);
-                err = 1;
+                error = 1;
                 return;
             }
             EVP_MD_free(md);
@@ -214,7 +214,7 @@ void do_fetch(size_t num)
                                                fetch_entries[j].propq);
             if (cph == NULL) {
                 fprintf(stderr, "Failed to fetch %s\n", fetch_alg);
-                err = 1;
+                error = 1;
                 return;
             }
             EVP_CIPHER_free(cph);
@@ -225,7 +225,7 @@ void do_fetch(size_t num)
                                          fetch_entries[j].propq);
             if (kdf == NULL) {
                 fprintf(stderr, "Failed to fetch %s\n", fetch_alg);
-                err = 1;
+                error = 1;
                 return;
             }
             EVP_KDF_free(kdf);
@@ -236,7 +236,7 @@ void do_fetch(size_t num)
                                          fetch_entries[j].propq);
             if (mac == NULL) {
                 fprintf(stderr, "Failed to fetch %s\n", fetch_alg);
-                err = 1;
+                error = 1;
                 return;
             }
             EVP_MAC_free(mac);
@@ -247,7 +247,7 @@ void do_fetch(size_t num)
                                            fetch_entries[j].propq);
             if (rnd == NULL) {
                 fprintf(stderr, "Failed to fetch %s\n", fetch_alg);
-                err = 1;
+                error = 1;
                 return;
             }
             EVP_RAND_free(rnd);
@@ -258,7 +258,7 @@ void do_fetch(size_t num)
                                          fetch_entries[j].propq);
             if (kem == NULL) {
                 fprintf(stderr, "Failed to fetch %s\n", fetch_alg);
-                err = 1;
+                error = 1;
                 return;
             }
             EVP_KEM_free(kem);
@@ -269,14 +269,14 @@ void do_fetch(size_t num)
                                                      fetch_entries[j].propq);
             if (sig == NULL) {
                 fprintf(stderr, "Failed to fetch %s\n", fetch_alg);
-                err = 1;
+                error = 1;
                 return;
             }
             EVP_SIGNATURE_free(sig);
             break;
         }
         default:
-            err = 1;
+            error = 1;
             return;
         }
         counts[num]++;
@@ -372,7 +372,7 @@ int main(int argc, char *argv[])
         goto out;
     }
 
-    if (err) {
+    if (error) {
         printf("Error during test\n");
         goto out;
     }

source/evp_setpeer.c

@@ -24,7 +24,7 @@
 
 #define RUN_TIME 5
 
-int err = 0;
+int error = 0;
 
 size_t num_calls;
 static int threadcount;
@@ -42,13 +42,13 @@ void do_setpeer(size_t num)
 
     pkey_ctx = EVP_PKEY_CTX_new(pkey, NULL);
     if (pkey_ctx == NULL) {
-        err = 1;
+        error = 1;
         printf("Failed to create pkey_ctx\n");
         return;
     }
 
     if (EVP_PKEY_derive_init(pkey_ctx) <= 0) {
-        err = 1;
+        error = 1;
         printf("Failed to init pkey_ctx\n");
         EVP_PKEY_CTX_free(pkey_ctx);
         return;
@@ -58,7 +58,7 @@ void do_setpeer(size_t num)
 
     do {
         if (EVP_PKEY_derive_set_peer(pkey_ctx, pkey) <= 0) {
-            err = 1;
+            error = 1;
             break;
         }
         counts[num]++;
@@ -97,7 +97,7 @@ static double get_avcalltime(void)
 
 static void report_result(int key_id, int terse)
 {
-    if (err) {
+    if (error) {
         fprintf(stderr, "Error during test of %s\n",
                 sample_names[key_id]);
         exit(EXIT_FAILURE);
@@ -228,7 +228,7 @@ int main(int argc, char *argv[])
         EVP_PKEY_free(pkey);
     }
 
-    if (err) {
+    if (error) {
         printf("Error during test\n");
         goto out;
     }

source/handshake.c

@@ -25,7 +25,7 @@
 
 #define RUN_TIME 5
 
-int err = 0;
+int error = 0;
 
 typedef enum {
   INIT_LIB_CTX,
@@ -102,7 +102,7 @@ static void do_handshake(size_t num)
     } while (time.t < max_time.t);
 
     if (!ret)
-        err = 1;
+        error = 1;
 }
 
 static void do_handshake_ossl_lib_ctx_per_thread(size_t num)
@@ -117,7 +117,7 @@ static void do_handshake_ossl_lib_ctx_per_thread(size_t num)
     libctx = OSSL_LIB_CTX_new();
     if (libctx == NULL) {
         fprintf(stderr, "%s:%d: Failed to create ossl lib context\n", __FILE__, __LINE__);
-        err = 1;
+        error = 1;
         return;
     }
 
@@ -132,7 +132,7 @@ static void do_handshake_ossl_lib_ctx_per_thread(size_t num)
                                                   privkey)) {
                 ERR_print_errors_fp(stderr);
                 fprintf(stderr, "%s:%d: Failed to create SSL_CTX pair\n", __FILE__, __LINE__);
-                err = 1;
+                error = 1;
                 return;
             }
         }
@@ -157,7 +157,7 @@ static void do_handshake_ossl_lib_ctx_per_thread(size_t num)
     SSL_CTX_free(lcctx);
 
     if (!ret)
-        err = 1;
+        error = 1;
 
     OSSL_LIB_CTX_free(libctx);
 }
@@ -187,7 +187,7 @@ static void do_handshake_ctx_pool(size_t num)
                                               privkey)) {
             ERR_print_errors_fp(stderr);
             fprintf(stderr, "%s:%d: Failed to create SSL_CTX pair\n", __FILE__, __LINE__);
-            err = 1;
+            error = 1;
             return;
         }
     }
@@ -203,7 +203,7 @@ static void do_handshake_ctx_pool(size_t num)
                                                   privkey)) {
                 ERR_print_errors_fp(stderr);
                 fprintf(stderr, "%s:%d: Failed to create SSL_CTX pair\n", __FILE__, __LINE__);
-                err = 1;
+                error = 1;
                 return;
             }
         }
@@ -230,7 +230,7 @@ static void do_handshake_ctx_pool(size_t num)
     }
 
     if (!ret)
-        err = 1;
+        error = 1;
 }
 
 static void free_ctx_pool()
@@ -482,7 +482,7 @@ int main(int argc, char * const argv[])
         goto err;
     };
 
-    if (err) {
+    if (error) {
         printf("Error during test\n");
         goto err;
     }

source/newrawkey.c

@@ -37,7 +37,7 @@ enum {
 } algorithm = ALGO_X25519;
 const char *alg_name = "X25519";
 
-int err = 0;
+int error = 0;
 
 static unsigned char key_x25519[32] = {
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
@@ -377,7 +377,7 @@ void do_newrawkey(size_t num)
                                            sizeof(key_data));
 #endif
         if (pkey == NULL)
-            err = 1;
+            error = 1;
         else
             EVP_PKEY_free(pkey);
         counts[num]++;
@@ -451,7 +451,7 @@ int main(int argc, char *argv[])
         goto out;
     }
 
-    if (err) {
+    if (error) {
         printf("Error during test\n");
         goto out;
     }

source/perflib/err.c

@@ -7,6 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,6 +23,20 @@ vwarnx(const char *fmt, va_list ap)
     putc('\n', stderr);
 }
 
+void
+vwarn(const char *fmt, va_list ap)
+{
+    int saved_errno = errno;
+
+    if (progname != NULL)
+        fprintf(stderr, "%s: ", progname);
+    vfprintf(stderr, fmt, ap);
+    fprintf(stderr, ": ");
+
+    errno = saved_errno;
+    perror(NULL);
+}
+
 void
 errx(int status, const char *fmt, ...)
 {
@@ -33,6 +48,17 @@ errx(int status, const char *fmt, ...)
     exit(status);
 }
 
+void
+err(int status, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    vwarn(fmt, ap);
+    va_end(ap);
+    exit(status);
+}
+
 void
 warnx(const char *fmt, ...)
 {
@@ -42,3 +68,13 @@ warnx(const char *fmt, ...)
     vwarnx(fmt, ap);
     va_end(ap);
 }
+
+void
+warn(const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    vwarn(fmt, ap);
+    va_end(ap);
+}