1 files changed, 44 insertions, 2 deletions

diff --git a/src/regress/lib/libssl/interop/util.c b/src/regress/lib/libssl/interop/util.c
index 3f1c221d51..b012d73193 100644
--- a/src/regress/lib/libssl/interop/util.c
+++ b/src/regress/lib/libssl/interop/util.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: util.c,v 1.1.1.1 2018/11/07 01:08:49 bluhm Exp $      */
+/*      $OpenBSD: util.c,v 1.2 2018/11/07 06:29:26 bluhm Exp $  */
 /*
  * Copyright (c) 2018 Alexander Bluhm <bluhm@openbsd.org>
  *
@@ -24,13 +24,55 @@
 
 #include <openssl/err.h>
 #include <openssl/ssl.h>
+#include <openssl/opensslv.h>
+#include <openssl/crypto.h>
 
 #include "util.h"
 
 void
+print_version(void)
+{
+#ifdef OPENSSL_VERSION_NUMBER
+        printf("OPENSSL_VERSION_NUMBER: %#08lx\n", OPENSSL_VERSION_NUMBER);
+#endif
+#ifdef LIBRESSL_VERSION_NUMBER
+        printf("LIBRESSL_VERSION_NUMBER: %#08lx\n", LIBRESSL_VERSION_NUMBER);
+#endif
+#ifdef LIBRESSL_VERSION_TEXT
+        printf("LIBRESSL_VERSION_TEXT: %s\n", LIBRESSL_VERSION_TEXT);
+#endif
+#if OPENSSL_VERSION_NUMBER >= 0x1010000f
+        printf("OpenSSL_version_num: %#08lx\n", OpenSSL_version_num());
+        printf("OpenSSL_version OPENSSL_VERSION: %s\n",
+            OpenSSL_version(OPENSSL_VERSION));
+        printf("OpenSSL_version OPENSSL_CFLAGS: %s\n",
+            OpenSSL_version(OPENSSL_CFLAGS));
+        printf("OpenSSL_version OPENSSL_BUILT_ON: %s\n",
+            OpenSSL_version(OPENSSL_BUILT_ON));
+        printf("OpenSSL_version OPENSSL_PLATFORM: %s\n",
+            OpenSSL_version(OPENSSL_PLATFORM));
+        printf("OpenSSL_version OPENSSL_DIR: %s\n",
+            OpenSSL_version(OPENSSL_DIR));
+        printf("OpenSSL_version OPENSSL_ENGINES_DIR: %s\n",
+            OpenSSL_version(OPENSSL_ENGINES_DIR));
+#endif
+        printf("SSLeay: %#08lx\n", SSLeay());
+        printf("SSLeay_version SSLEAY_VERSION: %s\n",
+            SSLeay_version(SSLEAY_VERSION));
+        printf("SSLeay_version SSLEAY_CFLAGS: %s\n",
+            SSLeay_version(SSLEAY_CFLAGS));
+        printf("SSLeay_version SSLEAY_BUILT_ON: %s\n",
+            SSLeay_version(SSLEAY_BUILT_ON));
+        printf("SSLeay_version SSLEAY_PLATFORM: %s\n",
+            SSLeay_version(SSLEAY_PLATFORM));
+        printf("SSLeay_version SSLEAY_DIR: %s\n",
+            SSLeay_version(SSLEAY_DIR));
+}
+
+void
 print_ciphers(STACK_OF(SSL_CIPHER) *cstack)
 {
-        SSL_CIPHER *cipher;
+        const SSL_CIPHER *cipher;
         int i;
 
         for (i = 0; (cipher = sk_SSL_CIPHER_value(cstack, i)) != NULL; i++)