From baffbd8858147f45788e81a53ae00b66cf734b92 Mon Sep 17 00:00:00 2001 From: tb Date: Mon, 15 Apr 2024 16:49:13 +0000 Subject: [PATCH] Remove workarounds for unprototyped symbols --- regress/lib/libcrypto/symbols/symbols.awk | 72 +---------------------- 1 file changed, 1 insertion(+), 71 deletions(-) diff --git a/regress/lib/libcrypto/symbols/symbols.awk b/regress/lib/libcrypto/symbols/symbols.awk index 5ad46778154..dec111b0b8f 100644 --- a/regress/lib/libcrypto/symbols/symbols.awk +++ b/regress/lib/libcrypto/symbols/symbols.awk @@ -1,4 +1,4 @@ -# $OpenBSD: symbols.awk,v 1.10 2024/04/10 16:12:10 tb Exp $ +# $OpenBSD: symbols.awk,v 1.11 2024/04/15 16:49:13 tb Exp $ # Copyright (c) 2018,2020 Theo Buehler # @@ -20,38 +20,6 @@ BEGIN { printf("#include \"include_headers.c\"\n\n") } -/^DHparams_it$/ || -/^DSA_SIG_it$/ || -/^ECDSA_SIG_it$/ || -/^ECPARAMETERS_it$/ || -/^ECPKPARAMETERS_it$/ || -/^EC_PRIVATEKEY_it$/ || -/^ESS_CERT_ID_it$/ || -/^ESS_ISSUER_SERIAL_it$/ || -/^ESS_SIGNING_CERT_it$/ || -/^NETSCAPE_ENCRYPTED_PKEY_it$/ || -/^NETSCAPE_PKEY_it$/ || -/^TS_ACCURACY_it$/ || -/^TS_MSG_IMPRINT_it$/ || -/^TS_REQ_it$/ || -/^TS_RESP_it$/ || -/^TS_STATUS_INFO_it$/ || -/^TS_TST_INFO_it$/ || -/^X509_ATTRIBUTE_SET_it$/ || -/^X509_NAME_ENTRIES_it$/ || -/^X509_NAME_INTERNAL_it$/ || -/^X9_62_CHARACTERISTIC_TWO_it$/ || -/^X9_62_CURVE_it$/ || -/^X9_62_FIELDID_it$/ || -/^X9_62_PENTANOMIAL_it$/ { - printf("extern ASN1_ITEM %s;\n", $0) -} - -# internal function used in libtls -/^ASN1_time_tm_clamp_notafter$/ { - printf("extern int ASN1_time_tm_clamp_notafter(struct tm *);\n") -} - # These are machdep. /^OPENSSL_cpuid_setup$/ || /^OPENSSL_cpu_caps$/ { @@ -59,44 +27,6 @@ BEGIN { next } -/^OPENSSL_strcasecmp$/ { - printf("extern int %s(const char *, const char *);\n", $0) -} - -/^OPENSSL_strncasecmp$/ { - printf("extern int %s(const char *, const char *, size_t);\n", $0) -} - -/^BIO_CONNECT_free$/ || -/^ECPARAMETERS_free$/ || -/^ECPKPARAMETERS_free$/ || -/^EC_PRIVATEKEY_free$/ || -/^X9_62_CHARACTERISTIC_TWO_free$/ || -/^X9_62_PENTANOMIAL_free$/ { - printf("extern void %s(void *);\n", $0) -} - -/^BIO_CONNECT_new$/ || -/^ECPARAMETERS_new$/ || -/^ECPKPARAMETERS_new$/ || -/^EC_PRIVATEKEY_new$/ || -/^X9_62_CHARACTERISTIC_TWO_new$/ || -/^X9_62_PENTANOMIAL_new$/ { - printf("extern void *%s(void);\n", $0) -} - -/^d2i_ECPKPARAMETERS$/ || -/^d2i_EC_PRIVATEKEY$/ { - printf("extern void *%s", $0) - printf("(void *, const unsigned char *, const unsigned char *);\n") -} - -/^i2d_ECPKPARAMETERS$/ || -/^i2d_EC_PRIVATEKEY$/ { - printf("extern int %s", $0) - printf("(const void *, unsigned char **);\n") -} - { symbols[$0] = $0 -- 2.20.1