diff options
| author | Martin Willi <martin@strongswan.org> | 2009-08-17 14:11:39 +0200 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2009-08-26 11:23:51 +0200 |
| commit | 3addf4e937dd8f3f436df42d1f513e74dceb372c (patch) | |
| tree | 62118b28c8e50de95dda8015182bf69843310db0 /src | |
| parent | caa00e7ab7daa6cd00d9669f9eb9a077363588cd (diff) | |
| download | strongswan-3addf4e937dd8f3f436df42d1f513e74dceb372c.tar.bz2 strongswan-3addf4e937dd8f3f436df42d1f513e74dceb372c.tar.xz | |
renamed BUILD_BLOB_RFC_3110 to BUILD_BLOB_DNSKEY, we potentially support other key types
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstrongswan/credentials/builder.c | 2 | ||||
| -rw-r--r-- | src/libstrongswan/credentials/builder.h | 4 | ||||
| -rw-r--r-- | src/libstrongswan/credentials/credential_factory.c | 2 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c | 2 | ||||
| -rw-r--r-- | src/pluto/dnskey.c | 2 | ||||
| -rw-r--r-- | src/pluto/keys.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/libstrongswan/credentials/builder.c b/src/libstrongswan/credentials/builder.c index 8151f14b3..c21236883 100644 --- a/src/libstrongswan/credentials/builder.c +++ b/src/libstrongswan/credentials/builder.c @@ -21,7 +21,7 @@ ENUM(builder_part_names, BUILD_FROM_FILE, BUILD_END, "BUILD_BLOB_ASN1_DER", "BUILD_BLOB_PEM", "BUILD_BLOB_PGP", - "BUILD_BLOB_RFC_3110", + "BUILD_BLOB_DNSKEY", "BUILD_PASSPHRASE", "BUILD_PASSPHRASE_CALLBACK", "BUILD_KEY_SIZE", diff --git a/src/libstrongswan/credentials/builder.h b/src/libstrongswan/credentials/builder.h index 17fc77680..1854740e6 100644 --- a/src/libstrongswan/credentials/builder.h +++ b/src/libstrongswan/credentials/builder.h @@ -48,8 +48,8 @@ enum builder_part_t { BUILD_BLOB_PEM, /** OpenPGP key blob, chunk_t */ BUILD_BLOB_PGP, - /** RFC 3110 DNS public key blob, chunk_t */ - BUILD_BLOB_RFC_3110, + /** DNS public key blob (RFC 4034, RSA specifc RFC 3110), chunk_t */ + BUILD_BLOB_DNSKEY, /** passphrase for e.g. PEM decryption, chunk_t */ BUILD_PASSPHRASE, /** passphrase callback, chunk_t(*fn)(void *user, int try), void *user. diff --git a/src/libstrongswan/credentials/credential_factory.c b/src/libstrongswan/credentials/credential_factory.c index 7574a0b7a..776cde2eb 100644 --- a/src/libstrongswan/credentials/credential_factory.c +++ b/src/libstrongswan/credentials/credential_factory.c @@ -166,7 +166,7 @@ static void* create(private_credential_factory_t *this, credential_type_t type, case BUILD_BLOB_PEM: case BUILD_BLOB_ASN1_DER: case BUILD_BLOB_PGP: - case BUILD_BLOB_RFC_3110: + case BUILD_BLOB_DNSKEY: case BUILD_PASSPHRASE: case BUILD_SERIAL: case BUILD_RSA_MODULUS: diff --git a/src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c b/src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c index 3c1b512e4..a5337858c 100644 --- a/src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c +++ b/src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c @@ -829,7 +829,7 @@ static void add(private_builder_t *this, builder_part_t part, ...) va_end(args); return; } - case BUILD_BLOB_RFC_3110: + case BUILD_BLOB_DNSKEY: { va_start(args, part); chunk = va_arg(args, chunk_t); diff --git a/src/pluto/dnskey.c b/src/pluto/dnskey.c index ed901ade5..ea8419825 100644 --- a/src/pluto/dnskey.c +++ b/src/pluto/dnskey.c @@ -436,7 +436,7 @@ process_txt_rr_body(u_char *str } rfc3110_chunk = chunk_create(buf, sz); key = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_RSA, - BUILD_BLOB_RFC_3110, rfc3110_chunk, + BUILD_BLOB_DNSKEY, rfc3110_chunk, BUILD_END); if (key == NULL) { diff --git a/src/pluto/keys.c b/src/pluto/keys.c index 516872e8e..31190340d 100644 --- a/src/pluto/keys.c +++ b/src/pluto/keys.c @@ -1296,7 +1296,7 @@ bool add_public_key(const struct id *id, enum dns_auth_level dns_auth_level, { case PUBKEY_ALG_RSA: key = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_RSA, - BUILD_BLOB_RFC_3110, rfc3110_key, + BUILD_BLOB_DNSKEY, rfc3110_key, BUILD_END); if (key == NULL) { |