PEM encoding for OpenSSL RSA and EC public and private keys

diff --git a/src/libstrongswan/plugins/openssl/openssl_ec_private_key.c b/src/libstrongswan/plugins/openssl/openssl_ec_private_key.c
index 89ced5a9a5f19675e7386af7e20f766fe62f0813..508370e0a69092819c43fd213a9db4631b0cafe1 100644 (file)
--- a/src/libstrongswan/plugins/openssl/openssl_ec_private_key.c
+++ b/src/libstrongswan/plugins/openssl/openssl_ec_private_key.c
@@ -233,11 +233,24 @@ static bool get_encoding(private_openssl_ec_private_key_t *this,
        switch (type)
        {
                case KEY_PRIV_ASN1_DER:
+               case KEY_PRIV_PEM:
                {
+                       bool success = TRUE;
+
                        *encoding = chunk_alloc(i2d_ECPrivateKey(this->ec, NULL));
                        p = encoding->ptr;
                        i2d_ECPrivateKey(this->ec, &p);
-                       return TRUE;
+
+                       if (type == KEY_PRIV_PEM)
+                       {
+                               chunk_t asn1_encoding = *encoding;
+
+                               success = lib->encoding->encode(lib->encoding, KEY_PRIV_PEM,
+                                                               NULL, encoding, KEY_PART_ECDSA_PRIV_ASN1_DER,
+                                                               asn1_encoding, KEY_PART_END);
+                               chunk_clear(&asn1_encoding);
+                       }                                       
+                       return success;
                }
                default:
                        return FALSE;

diff --git a/src/libstrongswan/plugins/openssl/openssl_ec_public_key.c b/src/libstrongswan/plugins/openssl/openssl_ec_public_key.c
index f37c736b1f3371d6ec25d0c2fe26bacc8feb0268..55bcb3165550f90120b546cf95b72bb1ffe9fe97 100644 (file)
--- a/src/libstrongswan/plugins/openssl/openssl_ec_public_key.c
+++ b/src/libstrongswan/plugins/openssl/openssl_ec_public_key.c
@@ -248,11 +248,24 @@ static bool get_encoding(private_openssl_ec_public_key_t *this,
        switch (type)
        {
                case KEY_PUB_SPKI_ASN1_DER:
+               case KEY_PUB_PEM:
                {
+                       bool success = TRUE;
+
                        *encoding = chunk_alloc(i2d_EC_PUBKEY(this->ec, NULL));
                        p = encoding->ptr;
                        i2d_EC_PUBKEY(this->ec, &p);
-                       return TRUE;
+
+                       if (type == KEY_PUB_PEM)
+                       {
+                               chunk_t asn1_encoding = *encoding;
+
+                               success = lib->encoding->encode(lib->encoding, KEY_PUB_PEM,
+                                                               NULL, encoding, KEY_PART_ECDSA_PUB_ASN1_DER,
+                                                               asn1_encoding, KEY_PART_END);
+                               chunk_clear(&asn1_encoding);
+                       }                                       
+                       return success;
                }
                default:
                        return FALSE;

diff --git a/src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c b/src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c
index 0568b6e17396b5de648a6222a42445e24805b150..01c1a7ab5762e4dc9f13a7c16a78ec36608e45dc 100644 (file)
--- a/src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c
+++ b/src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c
@@ -226,11 +226,24 @@ static bool get_encoding(private_openssl_rsa_private_key_t *this,
        switch (type)
        {
                case KEY_PRIV_ASN1_DER:
+               case KEY_PRIV_PEM:
                {
+                       bool success = TRUE;
+
                        *encoding = chunk_alloc(i2d_RSAPrivateKey(this->rsa, NULL));
                        p = encoding->ptr;
                        i2d_RSAPrivateKey(this->rsa, &p);
-                       return TRUE;
+
+                       if (type == KEY_PRIV_PEM)
+                       {
+                               chunk_t asn1_encoding = *encoding;
+
+                               success = lib->encoding->encode(lib->encoding, KEY_PRIV_PEM,
+                                                               NULL, encoding, KEY_PART_RSA_PRIV_ASN1_DER,
+                                                               asn1_encoding, KEY_PART_END);
+                               chunk_clear(&asn1_encoding);
+                       }                                       
+                       return success;
                }
                default:
                        return FALSE;

diff --git a/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c b/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c
index 422262b19726e410e991885f4cb46d41fc259e00..6228a07f1c473e1fba2dac7e9fc8bb0de9057780 100644 (file)
--- a/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c
+++ b/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c
@@ -231,11 +231,24 @@ static bool get_encoding(private_openssl_rsa_public_key_t *this,
        switch (type)
        {
                case KEY_PUB_SPKI_ASN1_DER:
+               case KEY_PUB_PEM:
                {
+                       bool success = TRUE;
+
                        *encoding = chunk_alloc(i2d_RSA_PUBKEY(this->rsa, NULL));
                        p = encoding->ptr;
                        i2d_RSA_PUBKEY(this->rsa, &p);
-                       return TRUE;
+
+                       if (type == KEY_PUB_PEM)
+                       {
+                               chunk_t asn1_encoding = *encoding;
+
+                               success = lib->encoding->encode(lib->encoding, KEY_PUB_PEM,
+                                                               NULL, encoding, KEY_PART_RSA_PUB_ASN1_DER,
+                                                               asn1_encoding, KEY_PART_END);
+                               chunk_clear(&asn1_encoding);
+                       }                                       
+                       return success;
                }
                case KEY_PUB_ASN1_DER:
                {

diff --git a/src/libstrongswan/plugins/pem/pem_encoder.c b/src/libstrongswan/plugins/pem/pem_encoder.c
index 65073f50c4e6fd0d0aa76b40d47d2111ebcdaee5..428341aeaaec3f2aeacf231e67b3bdf2af870600 100644 (file)
--- a/src/libstrongswan/plugins/pem/pem_encoder.c
+++ b/src/libstrongswan/plugins/pem/pem_encoder.c
@@ -31,21 +31,29 @@ bool pem_encoder_encode(key_encoding_type_t type, chunk_t *encoding,
        switch (type)
        {
                case KEY_PUB_PEM:
-                       if (!key_encoding_args(args, KEY_PART_RSA_PUB_ASN1_DER,
+                       if (key_encoding_args(args, KEY_PART_RSA_PUB_ASN1_DER,
+                                                                  &asn1, KEY_PART_END) ||
+                               key_encoding_args(args, KEY_PART_ECDSA_PUB_ASN1_DER,
                                                                   &asn1, KEY_PART_END))
                        {
-                               return FALSE;
+                               label ="PUBLIC KEY";
+                               break;
                        }
-                       label ="PUBLIC KEY";
-                       break;
+                       return FALSE;
                case KEY_PRIV_PEM:
-                       if (!key_encoding_args(args, KEY_PART_RSA_PRIV_ASN1_DER,
+                       if (key_encoding_args(args, KEY_PART_RSA_PRIV_ASN1_DER,
                                                                   &asn1, KEY_PART_END))
                        {
-                               return FALSE;
+                               label ="RSA PRIVATE KEY";
+                               break;
                        }
-                       label ="RSA PRIVATE KEY";
-                       break;
+                       if (key_encoding_args(args, KEY_PART_ECDSA_PRIV_ASN1_DER,
+                                                                  &asn1, KEY_PART_END))
+                       {
+                               label ="EC PRIVATE KEY";
+                               break;
+                       }
+                       return FALSE;
                default:
                        return FALSE;
        }