diff options
| author | Michael Brown | 2012-05-22 02:09:34 +0200 |
|---|---|---|
| committer | Michael Brown | 2012-05-22 02:13:43 +0200 |
| commit | 4fa1a2b4fe7f49b46c44fb3985984efd7dec212d (patch) | |
| tree | bc741636a3c4ddfab7fa6690effc3294b263d757 /src/crypto | |
| parent | [crypto] Require OCSP check if certificate provides an OCSP URI (diff) | |
| download | ipxe-4fa1a2b4fe7f49b46c44fb3985984efd7dec212d.tar.gz ipxe-4fa1a2b4fe7f49b46c44fb3985984efd7dec212d.tar.xz ipxe-4fa1a2b4fe7f49b46c44fb3985984efd7dec212d.zip | |
[crypto] Rename KEY= to PRIVKEY= and "key" to "privkey"
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>
Diffstat (limited to 'src/crypto')
| -rw-r--r-- | src/crypto/clientcert.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/crypto/clientcert.c b/src/crypto/clientcert.c index 159a3f4e..01ab2e38 100644 --- a/src/crypto/clientcert.c +++ b/src/crypto/clientcert.c @@ -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 " |