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/scepclient/scepclient.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/scepclient/scepclient.c')
-rw-r--r-- | src/scepclient/scepclient.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/scepclient/scepclient.c b/src/scepclient/scepclient.c index 385f6f328..2952b0591 100644 --- a/src/scepclient/scepclient.c +++ b/src/scepclient/scepclient.c @@ -398,7 +398,7 @@ int main(int argc, char **argv) transID = chunk_empty; fingerprint = chunk_empty; encoding = chunk_empty; - pkcs10_encoding = chunk_empty; + pkcs10_encoding = chunk_empty; issuerAndSubject = chunk_empty; challengePassword = chunk_empty; getCertInitial = chunk_empty; @@ -900,7 +900,7 @@ int main(int argc, char **argv) DBG(DBG_CONTROL, DBG_log("building pkcs1 object:") ) - if (!private_key->get_encoding(private_key, KEY_PRIV_ASN1_DER, &pkcs1) || + if (!private_key->get_encoding(private_key, PRIVKEY_ASN1_DER, &pkcs1) || !chunk_write(pkcs1, path, "pkcs1", 0066, force)) { exit_scepclient("could not write pkcs1 file '%s'", path); @@ -964,7 +964,7 @@ int main(int argc, char **argv) */ { char *path = concatenate_paths(CA_CERT_PATH, file_in_cacert_enc); - + x509_ca_enc = lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_X509, BUILD_FROM_FILE, path, BUILD_END); if (!x509_ca_enc) |