Fold p_dec.c and p_enc.c into a new p_legacy.c

discussed with jsing

3 files changed, 16 insertions, 81 deletions

diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile
index d97358900dd..d584019e143 100644
--- a/lib/libcrypto/Makefile
+++ b/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.157 2023/12/20 06:28:04 tb Exp $
+# $OpenBSD: Makefile,v 1.158 2023/12/20 13:46:05 tb Exp $
 
 LIB=	crypto
 LIBREBUILD=y
@@ -392,8 +392,7 @@ SRCS+= m_wp.c
 SRCS+= names.c
 SRCS+= p5_crpt.c
 SRCS+= p5_crpt2.c
-SRCS+= p_dec.c
-SRCS+= p_enc.c
+SRCS+= p_legacy.c
 SRCS+= p_lib.c
 SRCS+= p_open.c
 SRCS+= p_seal.c
diff --git a/lib/libcrypto/evp/p_enc.c b/lib/libcrypto/evp/p_enc.c
deleted file mode 100644
index 549ac897afe..00000000000
--- a/lib/libcrypto/evp/p_enc.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* $OpenBSD: p_enc.c,v 1.17 2023/12/20 13:34:47 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/err.h>
-#include <openssl/evp.h>
-
-#include <openssl/rsa.h>
-
-#include "evp_local.h"
-
-int
-EVP_PKEY_encrypt_old(unsigned char *to, const unsigned char *from, int from_len,
-    EVP_PKEY *pkey)
-{
-	if (pkey->type != EVP_PKEY_RSA) {
-		EVPerror(EVP_R_PUBLIC_KEY_NOT_RSA);
-		return 0;
-	}
-
-	return RSA_public_encrypt(from_len, from, to, pkey->pkey.rsa,
-	    RSA_PKCS1_PADDING);
-}
diff --git a/lib/libcrypto/evp/p_dec.c b/lib/libcrypto/evp/p_legacy.c
index 78a5ab48232..a88393a8491 100644
--- a/lib/libcrypto/evp/p_dec.c
+++ b/lib/libcrypto/evp/p_legacy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p_dec.c,v 1.17 2023/12/20 13:34:47 tb Exp $ */
+/*	$OpenBSD: p_legacy.c,v 1.1 2023/12/20 13:46:05 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -75,3 +75,16 @@ EVP_PKEY_decrypt_old(unsigned char *to, const unsigned char *from, int from_len,
 	return RSA_private_decrypt(from_len, from, to, pkey->pkey.rsa,
 	    RSA_PKCS1_PADDING);
 }
+
+int
+EVP_PKEY_encrypt_old(unsigned char *to, const unsigned char *from, int from_len,
+    EVP_PKEY *pkey)
+{
+	if (pkey->type != EVP_PKEY_RSA) {
+		EVPerror(EVP_R_PUBLIC_KEY_NOT_RSA);
+		return 0;
+	}
+
+	return RSA_public_encrypt(from_len, from, to, pkey->pkey.rsa,
+	    RSA_PKCS1_PADDING);
+}