Delete include/openssl/asn1_mac.h

See https://github.com/openssl/openssl/discussions/26886

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26900)

diff --git a/.gitignore b/.gitignore
index aaf09dcae90ad17e9442ae99022e29fd5589c88b..015ed4295cf4adf90468f21bbaf536f44b5c59a0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -239,7 +239,6 @@ providers/common/include/prov/der_ml_dsa.h
 
 # Files created on other branches that are not held in git, and are not
 # needed on this branch
-/include/openssl/asn1_mac.h
 /include/openssl/des_old.h
 /include/openssl/fips.h
 /include/openssl/fips_rand.h

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 91e2646580857546c149f7929e4ba3084fcfe3f8..e85763ccf8351df33880ac4aeae61751f8132cee 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -1338,8 +1338,7 @@ errors:
            include/internal/asn1.h
            include/internal/sslconf.h );
    my @cryptoskipheaders = ( @sslheaders_tmpl,
-       qw( include/openssl/asn1_mac.h
-           include/openssl/conf_api.h
+       qw( include/openssl/conf_api.h
            include/openssl/ebcdic.h
            include/openssl/opensslconf.h
            include/openssl/symhacks.h ) );

diff --git a/include/openssl/asn1_mac.h b/include/openssl/asn1_mac.h
deleted file mode 100644 (file)
index fdcb983..0000000
--- a/include/openssl/asn1_mac.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the Apache License 2.0 (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#error "This file is obsolete; please update your software."

diff --git a/test/build.info b/test/build.info
index 8cab6deb15b8a00f2f6d7547bba2677dace64789..9d9be6b642e99cd6e34b69144ed1a75d824e7b0a 100644 (file)
--- a/test/build.info
+++ b/test/build.info
@@ -1288,8 +1288,7 @@ ENDIF
    use File::Basename;
    use OpenSSL::Glob;
 
-   my @nogo_headers = ( "asn1_mac.h",
-                        "opensslconf.h",
+   my @nogo_headers = ( "opensslconf.h",
                         "__decc_include_prologue.h",
                         "__decc_include_epilogue.h" );
    my @nogo_headers_re = ( qr/.*err\.h/ );