diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcrypto/Makefile | 3 | ||||
| -rw-r--r-- | lib/libcrypto/evp/evp_names.c | 18 | ||||
| -rw-r--r-- | lib/libcrypto/evp/names.c | 77 |
3 files changed, 18 insertions, 80 deletions
diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile index 75ab43c1321..474c4531006 100644 --- a/lib/libcrypto/Makefile +++ b/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.164 2024/01/13 11:18:52 tb Exp $ +# $OpenBSD: Makefile,v 1.165 2024/01/13 12:15:27 tb Exp $ LIB= crypto LIBREBUILD=y @@ -387,7 +387,6 @@ SRCS+= m_sigver.c SRCS+= m_sm3.c SRCS+= m_streebog.c SRCS+= m_wp.c -SRCS+= names.c SRCS+= p5_crpt.c SRCS+= p5_crpt2.c SRCS+= p_legacy.c diff --git a/lib/libcrypto/evp/evp_names.c b/lib/libcrypto/evp/evp_names.c index 26e1df2f879..b09f71b4c4f 100644 --- a/lib/libcrypto/evp/evp_names.c +++ b/lib/libcrypto/evp/evp_names.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_names.c,v 1.5 2024/01/13 12:13:17 tb Exp $ */ +/* $OpenBSD: evp_names.c,v 1.6 2024/01/13 12:15:27 tb Exp $ */ /* * Copyright (c) 2023 Theo Buehler <tb@openbsd.org> * @@ -1771,3 +1771,19 @@ void EVP_cleanup(void) { } + +/* + * XXX - Remove all the garbage below in the next bump. + */ + +int +EVP_add_cipher(const EVP_CIPHER *c) +{ + return 1; +} + +int +EVP_add_digest(const EVP_MD *md) +{ + return 1; +} diff --git a/lib/libcrypto/evp/names.c b/lib/libcrypto/evp/names.c deleted file mode 100644 index 7b5f6bad6c3..00000000000 --- a/lib/libcrypto/evp/names.c +++ /dev/null @@ -1,77 +0,0 @@ -/* $OpenBSD: names.c,v 1.30 2024/01/13 12:13:17 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 <openssl/evp.h> -#include <openssl/objects.h> -#include <openssl/x509.h> - -#include "evp_local.h" - -int -EVP_add_cipher(const EVP_CIPHER *c) -{ - return 1; -} - -int -EVP_add_digest(const EVP_MD *md) -{ - return 1; -} |