From: tb <tb@openbsd.org>
Date: Wed, 10 Apr 2024 16:12:10 +0000 (+0000)
Subject: symbols test: Remove a few things that are long gone
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6501488b448aa7c09c43e1353e01ff1cd5ea3327;p=openbsd

symbols test: Remove a few things that are long gone
---

diff --git a/regress/lib/libcrypto/symbols/symbols.awk b/regress/lib/libcrypto/symbols/symbols.awk
index de41d05294b..5ad46778154 100644
--- a/regress/lib/libcrypto/symbols/symbols.awk
+++ b/regress/lib/libcrypto/symbols/symbols.awk
@@ -1,4 +1,4 @@
-# $OpenBSD: symbols.awk,v 1.9 2024/03/29 02:30:25 jsing Exp $
+# $OpenBSD: symbols.awk,v 1.10 2024/04/10 16:12:10 tb Exp $
 
 # Copyright (c) 2018,2020 Theo Buehler <tb@openbsd.org>
 #
@@ -52,15 +52,9 @@ BEGIN {
 	printf("extern int ASN1_time_tm_clamp_notafter(struct tm *);\n")
 }
 
-/^OBJ_bsearch_$/ {
-	printf("const void *OBJ_bsearch_(const void *key, const void *base, int num,\n")
-	printf("    int size, int (*cmp)(const void *, const void *));\n")
-}
-
-# These are machdep (at least cpuid_setup and ia32cap_P are internal on amd64).
+# These are machdep.
 /^OPENSSL_cpuid_setup$/						||
-/^OPENSSL_cpu_caps$/						||
-/^OPENSSL_ia32cap_P$/ {
+/^OPENSSL_cpu_caps$/ {
 	printf("/* skipped %s */\n", $0)
 	next
 }
@@ -77,8 +71,6 @@ BEGIN {
 /^ECPARAMETERS_free$/						||
 /^ECPKPARAMETERS_free$/						||
 /^EC_PRIVATEKEY_free$/						||
-/^NETSCAPE_ENCRYPTED_PKEY_free$/				||
-/^NETSCAPE_PKEY_free$/						||
 /^X9_62_CHARACTERISTIC_TWO_free$/				||
 /^X9_62_PENTANOMIAL_free$/ {
 	printf("extern void %s(void *);\n", $0)
@@ -88,25 +80,19 @@ BEGIN {
 /^ECPARAMETERS_new$/						||
 /^ECPKPARAMETERS_new$/						||
 /^EC_PRIVATEKEY_new$/						||
-/^NETSCAPE_ENCRYPTED_PKEY_new$/					||
-/^NETSCAPE_PKEY_new$/						||
 /^X9_62_CHARACTERISTIC_TWO_new$/				||
 /^X9_62_PENTANOMIAL_new$/ {
 	printf("extern void *%s(void);\n", $0)
 }
 
 /^d2i_ECPKPARAMETERS$/						||
-/^d2i_EC_PRIVATEKEY$/						||
-/^d2i_NETSCAPE_ENCRYPTED_PKEY$/					||
-/^d2i_NETSCAPE_PKEY$/ {
+/^d2i_EC_PRIVATEKEY$/ {
 	printf("extern void *%s", $0)
 	printf("(void *, const unsigned char *, const unsigned char *);\n")
 }
 
 /^i2d_ECPKPARAMETERS$/						||
-/^i2d_EC_PRIVATEKEY$/						||
-/^i2d_NETSCAPE_ENCRYPTED_PKEY$/					||
-/^i2d_NETSCAPE_PKEY$/ {
+/^i2d_EC_PRIVATEKEY$/ {
 	printf("extern int %s", $0)
 	printf("(const void *, unsigned char **);\n")
 }