Add a pkcs8_private_key similiar to x509_subject_public_key

1 files changed, 2 insertions, 6 deletions

diff --git a/src/pubkey/pk_codecs/pkcs8.cpp b/src/pubkey/pk_codecs/pkcs8.cpp
index d0954df39..099d52ffa 100644
--- a/src/pubkey/pk_codecs/pkcs8.cpp
+++ b/src/pubkey/pk_codecs/pkcs8.cpp
@@ -138,18 +138,14 @@ SecureVector<byte> PKCS8_decode(DataSource& source, const User_Interface& ui,
 */
 void encode(const Private_Key& key, Pipe& pipe, X509_Encoding encoding)
    {
-   std::auto_ptr<PKCS8_Encoder> encoder(key.pkcs8_encoder());
-   if(!encoder.get())
-      throw Encoding_Error("PKCS8::encode: Key does not support encoding");
-
    const u32bit PKCS8_VERSION = 0;
 
    SecureVector<byte> contents =
       DER_Encoder()
          .start_cons(SEQUENCE)
             .encode(PKCS8_VERSION)
-            .encode(encoder->alg_id())
-            .encode(encoder->key_bits(), OCTET_STRING)
+            .encode(key.algorithm_identifier())
+            .encode(key.pkcs8_private_key(), OCTET_STRING)
          .end_cons()
       .get_contents();