Merge branch 'master' of git.strongswan.org:strongswan
authorAndreas Steffen <andi@brisbane.(none)>
Fri, 26 Nov 2010 13:07:18 +0000 (14:07 +0100)
committerAndreas Steffen <andi@brisbane.(none)>
Fri, 26 Nov 2010 13:07:18 +0000 (14:07 +0100)
src/libcharon/plugins/sql/sql_cred.c

index 12f4ab0..aad813e 100644 (file)
@@ -62,7 +62,7 @@ static bool private_enumerator_enumerate(private_enumerator_t *this,
        while (this->inner->enumerate(this->inner, &type, &blob))
        {
                this->current = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, type,
-                                                                                  BUILD_BLOB_ASN1_DER, blob,
+                                                                                  BUILD_BLOB_PEM, blob,
                                                                                   BUILD_END);
                if (this->current)
                {
@@ -148,7 +148,7 @@ static bool cert_enumerator_enumerate(cert_enumerator_t *this,
        while (this->inner->enumerate(this->inner, &type, &blob))
        {
                this->current = lib->creds->create(lib->creds, CRED_CERTIFICATE, type,
-                                                                                  BUILD_BLOB_ASN1_DER, blob,
+                                                                                  BUILD_BLOB_PEM, blob,
                                                                                   BUILD_END);
                if (this->current)
                {