david/ipxe
david/ipxe
Archived
1
0
Fork 0
Code

[crypto] Rename KEY= to PRIVKEY= and "key" to "privkey"

Browse Source 
The setting name "key" conflicts with the setting name "key" already
in use by the 802.11 code.  Resolve the conflict by renaming the newer
setting to "privkey".

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2012-05-22 01:09:34 +01:00
parent 7fa1f41f7d
commit 4fa1a2b4fe
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Makefile.housekeeping
View File

@ -608,36 +608,39 @@ CFLAGS_clientcert += $(if $(CERT),-DCERTIFICATE="\"$(CERT_INC)\"")
# (Single-element) list of client private keys # (Single-element) list of client private keys
# #
KEY_LIST := $(BIN)/.private_key.list ifdef KEY
ifeq ($(wildcard $(KEY_LIST)),) PRIVKEY := $(KEY) # Maintain backwards compatibility
KEY_OLD := <invalid> endif
PRIVKEY_LIST := $(BIN)/.private_key.list
ifeq ($(wildcard $(PRIVKEY_LIST)),)
PRIVKEY_OLD := <invalid>
else else
KEY_OLD := $(shell cat $(KEY_LIST)) PRIVKEY_OLD := $(shell cat $(PRIVKEY_LIST))
endif endif
ifneq ($(KEY_OLD),$(KEY)) ifneq ($(PRIVKEY_OLD),$(PRIVKEY))
$(shell $(ECHO) "$(KEY)" > $(KEY_LIST)) $(shell $(ECHO) "$(PRIVKEY)" > $(PRIVKEY_LIST))
endif endif
$(KEY_LIST) : $(PRIVKEY_LIST) :
VERYCLEANUP += $(KEY_LIST) VERYCLEANUP += $(PRIVKEY_LIST)
# Embedded client private key # Embedded client private key
# #
KEY_INC := $(BIN)/.private_key.der PRIVKEY_INC := $(BIN)/.private_key.der
ifdef KEY ifdef PRIVKEY
$(KEY_INC) : $(KEY) $(KEY_LIST) $(PRIVKEY_INC) : $(PRIVKEY) $(PRIVKEY_LIST)
$(Q)$(OPENSSL) rsa -in $< -outform DER -out $@ $(Q)$(OPENSSL) rsa -in $< -outform DER -out $@
clientcert_DEPS += $(KEY_INC) clientcert_DEPS += $(PRIVKEY_INC)
endif endif
CLEANUP += $(KEY_INC) CLEANUP += $(PRIVKEY_INC)
clientcert_DEPS += $(KEY_LIST) clientcert_DEPS += $(PRIVKEY_LIST)
CFLAGS_clientcert += $(if $(KEY),-DPRIVATE_KEY="\"$(KEY_INC)\"") CFLAGS_clientcert += $(if $(PRIVKEY),-DPRIVATE_KEY="\"$(PRIVKEY_INC)\"")
# These files use .incbin inline assembly to include a binary file. # These files use .incbin inline assembly to include a binary file.
# Unfortunately ccache does not detect this dependency and caches # Unfortunately ccache does not detect this dependency and caches

6
src/crypto/clientcert.c
View File

@ -99,8 +99,8 @@ static struct setting cert_setting __setting ( SETTING_CRYPTO ) = {
}; };
/** Client private key setting */ /** Client private key setting */
static struct setting key_setting __setting ( SETTING_CRYPTO ) = { static struct setting privkey_setting __setting ( SETTING_CRYPTO ) = {
.name = "key", .name = "privkey",
.description = "Client private key", .description = "Client private key",
.tag = DHCP_EB_KEY, .tag = DHCP_EB_KEY,
.type = &setting_type_hex, .type = &setting_type_hex,
@ -146,7 +146,7 @@ static int clientcert_apply_settings ( void ) {
/* Fetch new client private key, if any */ /* Fetch new client private key, if any */
free ( key ); free ( key );
len = fetch_setting_copy ( NULL, &key_setting, &key ); len = fetch_setting_copy ( NULL, &privkey_setting, &key );
if ( len < 0 ) { if ( len < 0 ) {
rc = len; rc = len;
DBGC ( &client_certificate, "CLIENTCERT cannot fetch " DBGC ( &client_certificate, "CLIENTCERT cannot fetch "