sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-16 01:21:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

[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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/crypto/clientcert.c
View File

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