Merge p_open and p_seal into p_legacy

discussed with jsing

4 files changed, 104 insertions, 247 deletions

diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index d584019e14..6329d309e7 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.158 2023/12/20 13:46:05 tb Exp $
+# $OpenBSD: Makefile,v 1.159 2023/12/20 13:52:17 tb Exp $
 
 LIB=    crypto
 LIBREBUILD=y
@@ -394,8 +394,6 @@ SRCS+= p5_crpt.c
 SRCS+= p5_crpt2.c
 SRCS+= p_legacy.c
 SRCS+= p_lib.c
-SRCS+= p_open.c
-SRCS+= p_seal.c
 SRCS+= p_sign.c
 SRCS+= p_verify.c
 SRCS+= pmeth_fn.c
diff --git a/src/lib/libcrypto/evp/p_legacy.c b/src/lib/libcrypto/evp/p_legacy.c
index a88393a849..f73a6a9dae 100644
--- a/src/lib/libcrypto/evp/p_legacy.c
+++ b/src/lib/libcrypto/evp/p_legacy.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: p_legacy.c,v 1.1 2023/12/20 13:46:05 tb Exp $ */
+/*      $OpenBSD: p_legacy.c,v 1.2 2023/12/20 13:52:17 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,6 +56,8 @@
  * [including the GNU Public Licence.]
  */
 
+#include <stdlib.h>
+
 #include <openssl/evp.h>
 #include <openssl/err.h>
 
@@ -88,3 +90,103 @@ EVP_PKEY_encrypt_old(unsigned char *to, const unsigned char *from, int from_len,
         return RSA_public_encrypt(from_len, from, to, pkey->pkey.rsa,
             RSA_PKCS1_PADDING);
 }
+
+int
+EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
+    const unsigned char *ek, int ekl, const unsigned char *iv, EVP_PKEY *priv)
+{
+        unsigned char *key = NULL;
+        int i, size = 0, ret = 0;
+
+        if (type) {
+                EVP_CIPHER_CTX_init(ctx);
+                if (!EVP_DecryptInit_ex(ctx, type, NULL, NULL, NULL))
+                        return 0;
+        }
+
+        if (!priv)
+                return 1;
+
+        if (priv->type != EVP_PKEY_RSA) {
+                EVPerror(EVP_R_PUBLIC_KEY_NOT_RSA);
+                goto err;
+        }
+
+        size = RSA_size(priv->pkey.rsa);
+        key = malloc(size + 2);
+        if (key == NULL) {
+                /* ERROR */
+                EVPerror(ERR_R_MALLOC_FAILURE);
+                goto err;
+        }
+
+        i = EVP_PKEY_decrypt_old(key, ek, ekl, priv);
+        if ((i <= 0) || !EVP_CIPHER_CTX_set_key_length(ctx, i)) {
+                /* ERROR */
+                goto err;
+        }
+        if (!EVP_DecryptInit_ex(ctx, NULL, NULL, key, iv))
+                goto err;
+
+        ret = 1;
+
+err:
+        freezero(key, size);
+        return (ret);
+}
+
+int
+EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
+{
+        int i;
+
+        i = EVP_DecryptFinal_ex(ctx, out, outl);
+        if (i)
+                i = EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, NULL);
+        return (i);
+}
+
+int
+EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, unsigned char **ek,
+    int *ekl, unsigned char *iv, EVP_PKEY **pubk, int npubk)
+{
+        unsigned char key[EVP_MAX_KEY_LENGTH];
+        int i, iv_len;
+
+        if (type) {
+                EVP_CIPHER_CTX_init(ctx);
+                if (!EVP_EncryptInit_ex(ctx, type, NULL, NULL, NULL))
+                        return 0;
+        }
+        if ((npubk <= 0) || !pubk)
+                return 1;
+        if (EVP_CIPHER_CTX_rand_key(ctx, key) <= 0)
+                return 0;
+        /* XXX - upper bound? */
+        if ((iv_len = EVP_CIPHER_CTX_iv_length(ctx)) < 0)
+                return 0;
+        if (iv_len > 0)
+                arc4random_buf(iv, iv_len);
+
+        if (!EVP_EncryptInit_ex(ctx, NULL, NULL, key, iv))
+                return 0;
+
+        for (i = 0; i < npubk; i++) {
+                ekl[i] = EVP_PKEY_encrypt_old(ek[i], key,
+                    EVP_CIPHER_CTX_key_length(ctx), pubk[i]);
+                if (ekl[i] <= 0)
+                        return (-1);
+        }
+        return (npubk);
+}
+
+int
+EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
+{
+        int i;
+
+        i = EVP_EncryptFinal_ex(ctx, out, outl);
+        if (i)
+                i = EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, NULL);
+        return i;
+}
diff --git a/src/lib/libcrypto/evp/p_open.c b/src/lib/libcrypto/evp/p_open.c
deleted file mode 100644
index d18548e3f2..0000000000
--- a/src/lib/libcrypto/evp/p_open.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* $OpenBSD: p_open.c,v 1.23 2023/07/07 19:37:54 beck 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 <stdio.h>
-#include <string.h>
-
-#include <openssl/opensslconf.h>
-
-#ifndef OPENSSL_NO_RSA
-
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/rsa.h>
-#include <openssl/x509.h>
-
-#include "evp_local.h"
-
-int
-EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
-    const unsigned char *ek, int ekl, const unsigned char *iv, EVP_PKEY *priv)
-{
-        unsigned char *key = NULL;
-        int i, size = 0, ret = 0;
-
-        if (type) {
-                EVP_CIPHER_CTX_init(ctx);
-                if (!EVP_DecryptInit_ex(ctx, type, NULL, NULL, NULL))
-                        return 0;
-        }
-
-        if (!priv)
-                return 1;
-
-        if (priv->type != EVP_PKEY_RSA) {
-                EVPerror(EVP_R_PUBLIC_KEY_NOT_RSA);
-                goto err;
-        }
-
-        size = RSA_size(priv->pkey.rsa);
-        key = malloc(size + 2);
-        if (key == NULL) {
-                /* ERROR */
-                EVPerror(ERR_R_MALLOC_FAILURE);
-                goto err;
-        }
-
-        i = EVP_PKEY_decrypt_old(key, ek, ekl, priv);
-        if ((i <= 0) || !EVP_CIPHER_CTX_set_key_length(ctx, i)) {
-                /* ERROR */
-                goto err;
-        }
-        if (!EVP_DecryptInit_ex(ctx, NULL, NULL, key, iv))
-                goto err;
-
-        ret = 1;
-
-err:
-        freezero(key, size);
-        return (ret);
-}
-
-int
-EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
-{
-        int i;
-
-        i = EVP_DecryptFinal_ex(ctx, out, outl);
-        if (i)
-                i = EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, NULL);
-        return (i);
-}
-#endif
diff --git a/src/lib/libcrypto/evp/p_seal.c b/src/lib/libcrypto/evp/p_seal.c
deleted file mode 100644
index e7b0e6f232..0000000000
--- a/src/lib/libcrypto/evp/p_seal.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* $OpenBSD: p_seal.c,v 1.18 2023/12/20 10:15:30 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 <stdio.h>
-#include <stdlib.h>
-
-#include <openssl/opensslconf.h>
-
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-#ifndef OPENSSL_NO_RSA
-#include <openssl/rsa.h>
-#endif
-
-int
-EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, unsigned char **ek,
-    int *ekl, unsigned char *iv, EVP_PKEY **pubk, int npubk)
-{
-        unsigned char key[EVP_MAX_KEY_LENGTH];
-        int i, iv_len;
-
-        if (type) {
-                EVP_CIPHER_CTX_init(ctx);
-                if (!EVP_EncryptInit_ex(ctx, type, NULL, NULL, NULL))
-                        return 0;
-        }
-        if ((npubk <= 0) || !pubk)
-                return 1;
-        if (EVP_CIPHER_CTX_rand_key(ctx, key) <= 0)
-                return 0;
-        /* XXX - upper bound? */
-        if ((iv_len = EVP_CIPHER_CTX_iv_length(ctx)) < 0)
-                return 0;
-        if (iv_len > 0)
-                arc4random_buf(iv, iv_len);
-
-        if (!EVP_EncryptInit_ex(ctx, NULL, NULL, key, iv))
-                return 0;
-
-        for (i = 0; i < npubk; i++) {
-                ekl[i] = EVP_PKEY_encrypt_old(ek[i], key,
-                    EVP_CIPHER_CTX_key_length(ctx), pubk[i]);
-                if (ekl[i] <= 0)
-                        return (-1);
-        }
-        return (npubk);
-}
-
-int
-EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
-{
-        int i;
-
-        i = EVP_EncryptFinal_ex(ctx, out, outl);
-        if (i)
-                i = EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, NULL);
-        return i;
-}