backports: rename *-asn1.[ch] to *.asn1.[ch]

linux-stable 4fa8bc949de11c99ee2433c602d43f87c452f4f2 renamed
*-asn1.[ch] files to *.asn1.[ch]. Make the corresponding change
for backports.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

10 files changed, 9 insertions, 9 deletions

diff --git a/backport/compat/Makefile b/backport/compat/Makefile
index ac70aaf8..12c4121f 100644
--- a/backport/compat/Makefile
+++ b/backport/compat/Makefile
@@ -41,11 +41,11 @@ compat-$(CPTCFG_KERNEL_4_12) += backport-4.12.o
 compat-$(CPTCFG_BPAUTO_CRYPTO_SKCIPHER) += crypto-skcipher.o
 
 compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/verify.o
-compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/pkcs7-asn1.o
+compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/pkcs7.asn1.o
 compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/pkcs7_verify.o
 compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/pkcs7_parser.o
-compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/x509-asn1.o
-compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/x509_akid-asn1.o
+compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/x509.asn1.o
+compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/x509_akid.asn1.o
 compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/x509_cert_parser.o
 compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/x509_public_key.o
 compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/pkcs7_trust.o
@@ -58,7 +58,7 @@ compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/md_wrap.o
 compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/sha256.o
 compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/oid.o
 compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/asn1parse.o
-compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/rsapubkey-asn1.o
+compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/rsapubkey.asn1.o
 
 $(obj)/lib-oid_registry.o: $(obj)/oid_registry_data.c
 
diff --git a/backport/compat/verification/pkcs7-asn1.c b/backport/compat/verification/pkcs7.asn1.c
index 9073fd94..d8c91f5b 100644
--- a/backport/compat/verification/pkcs7-asn1.c
+++ b/backport/compat/verification/pkcs7.asn1.c
@@ -4,7 +4,7 @@
  * ASN.1 parser for pkcs7
  */
 #include <linux/asn1_ber_bytecode.h>
-#include "pkcs7-asn1.h"
+#include "pkcs7.asn1.h"
 
 enum pkcs7_actions {
 	ACT_pkcs7_check_content_type = 0,
diff --git a/backport/compat/verification/pkcs7-asn1.h b/backport/compat/verification/pkcs7.asn1.h
index b34e160f..b34e160f 100644
--- a/backport/compat/verification/pkcs7-asn1.h
+++ b/backport/compat/verification/pkcs7.asn1.h
diff --git a/backport/compat/verification/public_key.c b/backport/compat/verification/public_key.c
index 10d1672a..83a69357 100644
--- a/backport/compat/verification/public_key.c
+++ b/backport/compat/verification/public_key.c
@@ -18,7 +18,7 @@
 #include <linux/scatterlist.h>
 #include <linux/asn1_decoder.h>
 #include <crypto/public_key.h>
-#include "rsapubkey-asn1.h"
+#include "rsapubkey.asn1.h"
 #include "mbedtls/rsa.h"
 #include "mbedtls/md.h"
 
diff --git a/backport/compat/verification/rsapubkey-asn1.c b/backport/compat/verification/rsapubkey.asn1.c
index 84ab7f4e..6bb1994e 100644
--- a/backport/compat/verification/rsapubkey-asn1.c
+++ b/backport/compat/verification/rsapubkey.asn1.c
@@ -4,7 +4,7 @@
  * ASN.1 parser for rsapubkey
  */
 #include <linux/asn1_ber_bytecode.h>
-#include "rsapubkey-asn1.h"
+#include "rsapubkey.asn1.h"
 
 enum rsapubkey_actions {
 	ACT_rsa_get_e = 0,
diff --git a/backport/compat/verification/rsapubkey-asn1.h b/backport/compat/verification/rsapubkey.asn1.h
index 81a82d40..81a82d40 100644
--- a/backport/compat/verification/rsapubkey-asn1.h
+++ b/backport/compat/verification/rsapubkey.asn1.h
diff --git a/backport/compat/verification/x509-asn1.c b/backport/compat/verification/x509.asn1.c
index 89aaa662..316c10e3 100644
--- a/backport/compat/verification/x509-asn1.c
+++ b/backport/compat/verification/x509.asn1.c
@@ -4,7 +4,7 @@
  * ASN.1 parser for x509
  */
 #include <linux/asn1_ber_bytecode.h>
-#include "x509-asn1.h"
+#include "x509.asn1.h"
 
 enum x509_actions {
 	ACT_x509_extract_key_data = 0,
diff --git a/backport/compat/verification/x509-asn1.h b/backport/compat/verification/x509.asn1.h
index 4f32a25d..4f32a25d 100644
--- a/backport/compat/verification/x509-asn1.h
+++ b/backport/compat/verification/x509.asn1.h
diff --git a/backport/compat/verification/x509_akid-asn1.c b/backport/compat/verification/x509_akid.asn1.c
index dd3c6c2e..10f4802a 100644
--- a/backport/compat/verification/x509_akid-asn1.c
+++ b/backport/compat/verification/x509_akid.asn1.c
@@ -4,7 +4,7 @@
  * ASN.1 parser for x509_akid
  */
 #include <linux/asn1_ber_bytecode.h>
-#include "x509_akid-asn1.h"
+#include "x509_akid.asn1.h"
 
 enum x509_akid_actions {
 	ACT_x509_akid_note_kid = 0,
diff --git a/backport/compat/verification/x509_akid-asn1.h b/backport/compat/verification/x509_akid.asn1.h
index 92914da5..92914da5 100644
--- a/backport/compat/verification/x509_akid-asn1.h
+++ b/backport/compat/verification/x509_akid.asn1.h