@@ -386,7 +386,19 @@ show_available_ciphers(void)

 #else

     for (int nid = 0; nid < 10000; ++nid)

     {

+#if defined(LIBRESSL_VERSION_NUMBER)

+        /* OpenBSD/LibreSSL reimplemented EVP_get_cipherbyname and broke

+         * calling EVP_get_cipherbynid with an invalid nid in the process

+         * so that it would segfault. */

+        const EVP_CIPHER *cipher = NULL;

+        const char *name = OBJ_nid2sn(nid);

+        if (name)

+        {

+            cipher = EVP_get_cipherbyname(name);

+        }

+#else  /* if defined(LIBRESSL_VERSION_NUMBER) */

         const EVP_CIPHER *cipher = EVP_get_cipherbynid(nid);

+#endif

         /* We cast the const away so we can keep the function prototype

          * compatible with EVP_CIPHER_do_all_provided */

         collect_ciphers((EVP_CIPHER *) cipher, &cipher_list);

@@ -440,7 +452,19 @@ show_available_digests(void)

 #else

     for (int nid = 0; nid < 10000; ++nid)

     {

+        /* OpenBSD/LibreSSL reimplemented EVP_get_digestbyname and broke

+         * calling EVP_get_digestbynid with an invalid nid in the process

+         * so that it would segfault. */

+#ifdef LIBRESSL_VERSION_NUMBER

+        const EVP_MD *digest = NULL;

+        const char *name = OBJ_nid2sn(nid);

+        if (name)

+        {

+            digest = EVP_get_digestbyname(name);

+        }

+#else  /* ifdef LIBRESSL_VERSION_NUMBER */

         const EVP_MD *digest = EVP_get_digestbynid(nid);

+#endif

         if (digest)

         {

             /* We cast the const away so we can keep the function prototype

@@ -448,7 +472,7 @@ show_available_digests(void)

             print_digest((EVP_MD *)digest, NULL);

         }

     }

-#endif

+#endif /* if OPENSSL_VERSION_NUMBER >= 0x30000000L */

     printf("\n");

 }