diff options
| author | Martin Willi <martin@revosec.ch> | 2010-07-13 11:28:04 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2010-07-13 11:29:35 +0200 |
| commit | da9724e6d0fe82db4191a2d15919b365f0f210b0 (patch) | |
| tree | 1c36b8e3771a0ba0faa4ef8c80df93b43b9a87b5 /src/pki/pki.c | |
| parent | 24d327ab4dd1dde77572b23794e958684d363a40 (diff) | |
| download | strongswan-da9724e6d0fe82db4191a2d15919b365f0f210b0.tar.bz2 strongswan-da9724e6d0fe82db4191a2d15919b365f0f210b0.tar.xz | |
Renamed key_encod{ing,der}_t and constants, prepare for generic credential encoding
Diffstat (limited to 'src/pki/pki.c')
| -rw-r--r-- | src/pki/pki.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pki/pki.c b/src/pki/pki.c index 0912d5051..49174047d 100644 --- a/src/pki/pki.c +++ b/src/pki/pki.c @@ -21,20 +21,20 @@ /** * Convert a form string to a encoding type */ -bool get_form(char *form, key_encoding_type_t *type, bool pub) +bool get_form(char *form, cred_encoding_type_t *type, bool pub) { if (streq(form, "der")) { /* der encoded keys usually contain the complete SubjectPublicKeyInfo */ - *type = pub ? KEY_PUB_SPKI_ASN1_DER : KEY_PRIV_ASN1_DER; + *type = pub ? PUBKEY_SPKI_ASN1_DER : PRIVKEY_ASN1_DER; } else if (streq(form, "pem")) { - *type = pub ? KEY_PUB_PEM : KEY_PRIV_PEM; + *type = pub ? PUBKEY_PEM : PRIVKEY_PEM; } else if (streq(form, "pgp")) { - *type = pub ? KEY_PUB_PGP : KEY_PRIV_PGP; + *type = pub ? PUBKEY_PGP : PRIVKEY_PGP; } else { |