PEM encoding for OpenSSL RSA and EC public and private keys
authorAndreas Steffen <andreas.steffen@strongswan.org>
Sun, 4 Apr 2010 21:59:24 +0000 (23:59 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Sun, 4 Apr 2010 21:59:24 +0000 (23:59 +0200)
src/libstrongswan/plugins/openssl/openssl_ec_private_key.c
src/libstrongswan/plugins/openssl/openssl_ec_public_key.c
src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c
src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c
src/libstrongswan/plugins/pem/pem_encoder.c

index 89ced5a..508370e 100644 (file)
@@ -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;
index f37c736..55bcb31 100644 (file)
@@ -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;
index 0568b6e..01c1a7a 100644 (file)
@@ -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;
index 422262b..6228a07 100644 (file)
@@ -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:
                {
index 65073f5..428341a 100644 (file)
@@ -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;
        }