From 69147ea8445a511462c02e8ac88d4f75fec3fa1b Mon Sep 17 00:00:00 2001 From: tb <> Date: Sat, 12 Jul 2025 20:22:40 +0000 Subject: Merge the two functions from x_pkey.c into pem_info.c It looks like those can be unexported. --- src/lib/libcrypto/Makefile | 3 +- src/lib/libcrypto/asn1/x_pkey.c | 124 --------------------------------------- src/lib/libcrypto/pem/pem_info.c | 60 ++++++++++++++++++- 3 files changed, 60 insertions(+), 127 deletions(-) delete mode 100644 src/lib/libcrypto/asn1/x_pkey.c (limited to 'src') diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile index 53a95af9bb..b51103712c 100644 --- a/src/lib/libcrypto/Makefile +++ b/src/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.239 2025/07/12 19:57:13 tb Exp $ +# $OpenBSD: Makefile,v 1.240 2025/07/12 20:22:40 tb Exp $ LIB= crypto LIBREBUILD=y @@ -121,7 +121,6 @@ SRCS+= x_crl.c SRCS+= x_exten.c SRCS+= x_long.c SRCS+= x_name.c -SRCS+= x_pkey.c SRCS+= x_pubkey.c SRCS+= x_req.c SRCS+= x_sig.c diff --git a/src/lib/libcrypto/asn1/x_pkey.c b/src/lib/libcrypto/asn1/x_pkey.c deleted file mode 100644 index 4f72d6092e..0000000000 --- a/src/lib/libcrypto/asn1/x_pkey.c +++ /dev/null @@ -1,124 +0,0 @@ -/* $OpenBSD: x_pkey.c,v 1.25 2025/05/10 05:54:38 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 -#include - -#include -#include -#include - -#include "err_local.h" - -X509_PKEY * -X509_PKEY_new(void) -{ - X509_PKEY *ret = NULL; - - if ((ret = malloc(sizeof(X509_PKEY))) == NULL) { - ASN1error(ERR_R_MALLOC_FAILURE); - goto err; - } - ret->version = 0; - if ((ret->enc_algor = X509_ALGOR_new()) == NULL) { - ASN1error(ERR_R_MALLOC_FAILURE); - goto err; - } - if ((ret->enc_pkey = ASN1_OCTET_STRING_new()) == NULL) { - ASN1error(ERR_R_MALLOC_FAILURE); - goto err; - } - ret->dec_pkey = NULL; - ret->key_length = 0; - ret->key_data = NULL; - ret->key_free = 0; - ret->cipher.cipher = NULL; - memset(ret->cipher.iv, 0, EVP_MAX_IV_LENGTH); - ret->references = 1; - return (ret); - - err: - if (ret) { - X509_ALGOR_free(ret->enc_algor); - free(ret); - } - return NULL; -} -LCRYPTO_ALIAS(X509_PKEY_new); - -void -X509_PKEY_free(X509_PKEY *x) -{ - int i; - - if (x == NULL) - return; - - i = CRYPTO_add(&x->references, -1, CRYPTO_LOCK_X509_PKEY); - if (i > 0) - return; - - if (x->enc_algor != NULL) - X509_ALGOR_free(x->enc_algor); - ASN1_OCTET_STRING_free(x->enc_pkey); - EVP_PKEY_free(x->dec_pkey); - if ((x->key_data != NULL) && (x->key_free)) - free(x->key_data); - free(x); -} -LCRYPTO_ALIAS(X509_PKEY_free); diff --git a/src/lib/libcrypto/pem/pem_info.c b/src/lib/libcrypto/pem/pem_info.c index e1a264f4c5..4f2be892d1 100644 --- a/src/lib/libcrypto/pem/pem_info.c +++ b/src/lib/libcrypto/pem/pem_info.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pem_info.c,v 1.31 2025/07/12 19:57:13 tb Exp $ */ +/* $OpenBSD: pem_info.c,v 1.32 2025/07/12 20:22:40 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -77,6 +77,64 @@ #include "err_local.h" #include "evp_local.h" +X509_PKEY * +X509_PKEY_new(void) +{ + X509_PKEY *ret = NULL; + + if ((ret = malloc(sizeof(X509_PKEY))) == NULL) { + ASN1error(ERR_R_MALLOC_FAILURE); + goto err; + } + ret->version = 0; + if ((ret->enc_algor = X509_ALGOR_new()) == NULL) { + ASN1error(ERR_R_MALLOC_FAILURE); + goto err; + } + if ((ret->enc_pkey = ASN1_OCTET_STRING_new()) == NULL) { + ASN1error(ERR_R_MALLOC_FAILURE); + goto err; + } + ret->dec_pkey = NULL; + ret->key_length = 0; + ret->key_data = NULL; + ret->key_free = 0; + ret->cipher.cipher = NULL; + memset(ret->cipher.iv, 0, EVP_MAX_IV_LENGTH); + ret->references = 1; + return (ret); + + err: + if (ret) { + X509_ALGOR_free(ret->enc_algor); + free(ret); + } + return NULL; +} +LCRYPTO_ALIAS(X509_PKEY_new); + +void +X509_PKEY_free(X509_PKEY *x) +{ + int i; + + if (x == NULL) + return; + + i = CRYPTO_add(&x->references, -1, CRYPTO_LOCK_X509_PKEY); + if (i > 0) + return; + + if (x->enc_algor != NULL) + X509_ALGOR_free(x->enc_algor); + ASN1_OCTET_STRING_free(x->enc_pkey); + EVP_PKEY_free(x->dec_pkey); + if ((x->key_data != NULL) && (x->key_free)) + free(x->key_data); + free(x); +} +LCRYPTO_ALIAS(X509_PKEY_free); + X509_INFO * X509_INFO_new(void) { -- cgit v1.2.3-55-g6feb