Fold cversion.c into crypto_legacy.c

discussed with jsing

3 files changed, 57 insertions, 119 deletions

diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index 8630687370..ccc5e0b5c6 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.219 2024/11/05 10:59:42 tb Exp $
+# $OpenBSD: Makefile,v 1.220 2024/11/05 11:02:58 tb Exp $
 
 LIB=    crypto
 LIBREBUILD=y
@@ -61,7 +61,6 @@ SRCS+= crypto_ex_data.c
 SRCS+= crypto_init.c
 SRCS+= crypto_legacy.c
 SRCS+= crypto_lock.c
-SRCS+= cversion.c
 SRCS+= malloc-wrapper.c
 SRCS+= mem_clr.c
 SRCS+= mem_dbg.c
diff --git a/src/lib/libcrypto/crypto_legacy.c b/src/lib/libcrypto/crypto_legacy.c
index 5b3ed67304..65ca9b5f9a 100644
--- a/src/lib/libcrypto/crypto_legacy.c
+++ b/src/lib/libcrypto/crypto_legacy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crypto_legacy.c,v 1.1 2024/11/05 10:59:42 tb Exp $ */
+/* $OpenBSD: crypto_legacy.c,v 1.2 2024/11/05 11:02:58 tb Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -125,6 +125,7 @@
 #include <openssl/crypto.h>
 
 #include "crypto_internal.h"
+#include "crypto_local.h"
 #include "x86_arch.h"
 
 /* Machine independent capabilities. */
@@ -369,3 +370,57 @@ CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len)
         return x;
 }
 LCRYPTO_ALIAS(CRYPTO_memcmp);
+
+const char *
+SSLeay_version(int t)
+{
+        switch (t) {
+        case SSLEAY_VERSION:
+                return OPENSSL_VERSION_TEXT;
+        case SSLEAY_BUILT_ON:
+                return "built on: date not available";
+        case SSLEAY_CFLAGS:
+                return "compiler: information not available";
+        case SSLEAY_PLATFORM:
+                return "platform: information not available";
+        case SSLEAY_DIR:
+                return "OPENSSLDIR: \"" OPENSSLDIR "\"";
+        }
+        return "not available";
+}
+LCRYPTO_ALIAS(SSLeay_version);
+
+unsigned long
+SSLeay(void)
+{
+        return SSLEAY_VERSION_NUMBER;
+}
+LCRYPTO_ALIAS(SSLeay);
+
+const char *
+OpenSSL_version(int t)
+{
+        switch (t) {
+        case OPENSSL_VERSION:
+                return OPENSSL_VERSION_TEXT;
+        case OPENSSL_BUILT_ON:
+                return "built on: date not available";
+        case OPENSSL_CFLAGS:
+                return "compiler: information not available";
+        case OPENSSL_PLATFORM:
+                return "platform: information not available";
+        case OPENSSL_DIR:
+                return "OPENSSLDIR: \"" OPENSSLDIR "\"";
+        case OPENSSL_ENGINES_DIR:
+                return "ENGINESDIR: N/A";
+        }
+        return "not available";
+}
+LCRYPTO_ALIAS(OpenSSL_version);
+
+unsigned long
+OpenSSL_version_num(void)
+{
+        return SSLeay();
+}
+LCRYPTO_ALIAS(OpenSSL_version_num);
diff --git a/src/lib/libcrypto/cversion.c b/src/lib/libcrypto/cversion.c
deleted file mode 100644
index 2992bd2e05..0000000000
--- a/src/lib/libcrypto/cversion.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* $OpenBSD: cversion.c,v 1.21 2024/11/05 09:35:40 tb Exp $ */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <openssl/crypto.h>
-#include <openssl/opensslv.h>
-
-#include "crypto_local.h"
-
-const char *
-SSLeay_version(int t)
-{
-        switch (t) {
-        case SSLEAY_VERSION:
-                return OPENSSL_VERSION_TEXT;
-        case SSLEAY_BUILT_ON:
-                return "built on: date not available";
-        case SSLEAY_CFLAGS:
-                return "compiler: information not available";
-        case SSLEAY_PLATFORM:
-                return "platform: information not available";
-        case SSLEAY_DIR:
-                return "OPENSSLDIR: \"" OPENSSLDIR "\"";
-        }
-        return "not available";
-}
-LCRYPTO_ALIAS(SSLeay_version);
-
-unsigned long
-SSLeay(void)
-{
-        return SSLEAY_VERSION_NUMBER;
-}
-LCRYPTO_ALIAS(SSLeay);
-
-const char *
-OpenSSL_version(int t)
-{
-        switch (t) {
-        case OPENSSL_VERSION:
-                return OPENSSL_VERSION_TEXT;
-        case OPENSSL_BUILT_ON:
-                return "built on: date not available";
-        case OPENSSL_CFLAGS:
-                return "compiler: information not available";
-        case OPENSSL_PLATFORM:
-                return "platform: information not available";
-        case OPENSSL_DIR:
-                return "OPENSSLDIR: \"" OPENSSLDIR "\"";
-        case OPENSSL_ENGINES_DIR:
-                return "ENGINESDIR: N/A";
-        }
-        return "not available";
-}
-LCRYPTO_ALIAS(OpenSSL_version);
-
-unsigned long
-OpenSSL_version_num(void)
-{
-        return SSLeay();
-}
-LCRYPTO_ALIAS(OpenSSL_version_num);