Commit 4fa8bc94 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

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



Our convention is to distinguish file types by suffixes with a period
as a separator.

*-asn1.[ch] is a different pattern from other generated sources such
as *.lex.c, *.tab.[ch], *.dtb.S, etc.  More confusing, files with
'-asn1.[ch]' are generated files, but '_asn1.[ch]' are checked-in
files:
  net/netfilter/nf_conntrack_h323_asn1.c
  include/linux/netfilter/nf_conntrack_h323_asn1.h
  include/linux/sunrpc/gss_asn1.h

Rename generated files to *.asn1.[ch] for consistency.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 3ca3273e

.gitignore

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#

.*

*.a

*-asn1.[ch]

*.asn1.[ch]

*.bin

*.bz2

*.c.[012]*.*

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1616,7 +1616,7 @@ clean: $(clean-dirs) 
		-o -name '*.su'  \

		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \

		-o -name '*.lex.c' -o -name '*.tab.[ch]' \

		-o -name '*-asn1.[ch]' \

		-o -name '*.asn1.[ch]' \

		-o -name '*.symtypes' -o -name 'modules.order' \

		-o -name modules.builtin -o -name '.tmp_*.o.*' \

		-o -name .cache.mk \

crypto/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -35,12 +35,12 @@ dh_generic-y := dh.o 
dh_generic-y += dh_helper.o

obj-$(CONFIG_CRYPTO_DH) += dh_generic.o



$(obj)/rsapubkey-asn1.o: $(obj)/rsapubkey-asn1.c $(obj)/rsapubkey-asn1.h

$(obj)/rsaprivkey-asn1.o: $(obj)/rsaprivkey-asn1.c $(obj)/rsaprivkey-asn1.h

$(obj)/rsa_helper.o: $(obj)/rsapubkey-asn1.h $(obj)/rsaprivkey-asn1.h

$(obj)/rsapubkey.asn1.o: $(obj)/rsapubkey.asn1.c $(obj)/rsapubkey.asn1.h

$(obj)/rsaprivkey.asn1.o: $(obj)/rsaprivkey.asn1.c $(obj)/rsaprivkey.asn1.h

$(obj)/rsa_helper.o: $(obj)/rsapubkey.asn1.h $(obj)/rsaprivkey.asn1.h



rsa_generic-y := rsapubkey-asn1.o

rsa_generic-y += rsaprivkey-asn1.o

rsa_generic-y := rsapubkey.asn1.o

rsa_generic-y += rsaprivkey.asn1.o

rsa_generic-y += rsa.o

rsa_generic-y += rsa_helper.o

rsa_generic-y += rsa-pkcs1pad.o

crypto/asymmetric_keys/Makefile

+12 −12
Original line number Diff line number Diff line
@@ -17,30 +17,30 @@ obj-$(CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE) += public_key.o 
#

obj-$(CONFIG_X509_CERTIFICATE_PARSER) += x509_key_parser.o

x509_key_parser-y := \

	x509-asn1.o \

	x509_akid-asn1.o \

	x509.asn1.o \

	x509_akid.asn1.o \

	x509_cert_parser.o \

	x509_public_key.o



$(obj)/x509_cert_parser.o: \

	$(obj)/x509-asn1.h \

	$(obj)/x509_akid-asn1.h

	$(obj)/x509.asn1.h \

	$(obj)/x509_akid.asn1.h



$(obj)/x509-asn1.o: $(obj)/x509-asn1.c $(obj)/x509-asn1.h

$(obj)/x509_akid-asn1.o: $(obj)/x509_akid-asn1.c $(obj)/x509_akid-asn1.h

$(obj)/x509.asn1.o: $(obj)/x509.asn1.c $(obj)/x509.asn1.h

$(obj)/x509_akid.asn1.o: $(obj)/x509_akid.asn1.c $(obj)/x509_akid.asn1.h



#

# PKCS#7 message handling

#

obj-$(CONFIG_PKCS7_MESSAGE_PARSER) += pkcs7_message.o

pkcs7_message-y := \

	pkcs7-asn1.o \

	pkcs7.asn1.o \

	pkcs7_parser.o \

	pkcs7_trust.o \

	pkcs7_verify.o



$(obj)/pkcs7_parser.o: $(obj)/pkcs7-asn1.h

$(obj)/pkcs7-asn1.o: $(obj)/pkcs7-asn1.c $(obj)/pkcs7-asn1.h

$(obj)/pkcs7_parser.o: $(obj)/pkcs7.asn1.h

$(obj)/pkcs7.asn1.o: $(obj)/pkcs7.asn1.c $(obj)/pkcs7.asn1.h



#

# PKCS#7 parser testing key
@@ -57,7 +57,7 @@ obj-$(CONFIG_SIGNED_PE_FILE_VERIFICATION) += verify_signed_pefile.o 
verify_signed_pefile-y := \

	verify_pefile.o \

	mscode_parser.o \

	mscode-asn1.o

	mscode.asn1.o



$(obj)/mscode_parser.o: $(obj)/mscode-asn1.h $(obj)/mscode-asn1.h

$(obj)/mscode-asn1.o: $(obj)/mscode-asn1.c $(obj)/mscode-asn1.h
 
$(obj)/mscode_parser.o: $(obj)/mscode.asn1.h $(obj)/mscode.asn1.h

$(obj)/mscode.asn1.o: $(obj)/mscode.asn1.c $(obj)/mscode.asn1.h

crypto/asymmetric_keys/mscode_parser.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/oid_registry.h>

#include <crypto/pkcs7.h>

#include "verify_pefile.h"

#include "mscode-asn1.h"

#include "mscode.asn1.h"



/*

 * Parse a Microsoft Individual Code Signing blob

CRA Git | Maintained and supported by SUSTech CRA and CCSE