From d8116bd100cd9a4c1e502db89ddc6042bdb71643 Mon Sep 17 00:00:00 2001 From: tb <> Date: Sat, 12 Jul 2025 19:57:13 +0000 Subject: Merge the two functions from x_info.c into pem_info.c X509_INFO_new() isn't used directly outside of this file, so this is a bit tidier. --- src/lib/libcrypto/Makefile | 3 +- src/lib/libcrypto/asn1/x_info.c | 97 ---------------------------------------- src/lib/libcrypto/pem/pem_info.c | 36 ++++++++++++++- 3 files changed, 36 insertions(+), 100 deletions(-) delete mode 100644 src/lib/libcrypto/asn1/x_info.c (limited to 'src/lib') diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile index a33a209ef7..53a95af9bb 100644 --- a/src/lib/libcrypto/Makefile +++ b/src/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.238 2025/06/27 17:26:57 jsing Exp $ +# $OpenBSD: Makefile,v 1.239 2025/07/12 19:57:13 tb Exp $ LIB= crypto LIBREBUILD=y @@ -119,7 +119,6 @@ SRCS+= x_attrib.c SRCS+= x_bignum.c SRCS+= x_crl.c SRCS+= x_exten.c -SRCS+= x_info.c SRCS+= x_long.c SRCS+= x_name.c SRCS+= x_pkey.c diff --git a/src/lib/libcrypto/asn1/x_info.c b/src/lib/libcrypto/asn1/x_info.c deleted file mode 100644 index e8b2c368a6..0000000000 --- a/src/lib/libcrypto/asn1/x_info.c +++ /dev/null @@ -1,97 +0,0 @@ -/* $OpenBSD: x_info.c,v 1.23 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 "err_local.h" - -X509_INFO * -X509_INFO_new(void) -{ - X509_INFO *ret; - - if ((ret = calloc(1, sizeof(X509_INFO))) == NULL) { - ASN1error(ERR_R_MALLOC_FAILURE); - return NULL; - } - ret->references = 1; - - return ret; -} -LCRYPTO_ALIAS(X509_INFO_new); - -void -X509_INFO_free(X509_INFO *x) -{ - if (x == NULL) - return; - - if (CRYPTO_add(&x->references, -1, CRYPTO_LOCK_X509_INFO) > 0) - return; - - X509_free(x->x509); - X509_CRL_free(x->crl); - X509_PKEY_free(x->x_pkey); - free(x->enc_data); - - free(x); -} -LCRYPTO_ALIAS(X509_INFO_free); diff --git a/src/lib/libcrypto/pem/pem_info.c b/src/lib/libcrypto/pem/pem_info.c index 5848703c4e..e1a264f4c5 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.30 2025/07/12 19:54:58 tb Exp $ */ +/* $OpenBSD: pem_info.c,v 1.31 2025/07/12 19:57:13 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -64,6 +64,7 @@ #include #include +#include #include #include #include @@ -76,6 +77,39 @@ #include "err_local.h" #include "evp_local.h" +X509_INFO * +X509_INFO_new(void) +{ + X509_INFO *ret; + + if ((ret = calloc(1, sizeof(X509_INFO))) == NULL) { + ASN1error(ERR_R_MALLOC_FAILURE); + return NULL; + } + ret->references = 1; + + return ret; +} +LCRYPTO_ALIAS(X509_INFO_new); + +void +X509_INFO_free(X509_INFO *x) +{ + if (x == NULL) + return; + + if (CRYPTO_add(&x->references, -1, CRYPTO_LOCK_X509_INFO) > 0) + return; + + X509_free(x->x509); + X509_CRL_free(x->crl); + X509_PKEY_free(x->x_pkey); + free(x->enc_data); + + free(x); +} +LCRYPTO_ALIAS(X509_INFO_free); + STACK_OF(X509_INFO) * PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u) -- cgit v1.2.3-55-g6feb