First of several reorganisations to

[openssl.git] / crypto / pkcs12 / p12_add.c

diff --git a/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c
index e87b081fbabda6f5c36181093a1810ed4d1ec0fa..1909f285065dc7f402b296f1f25451b8416e9806 100644 (file)
--- a/crypto/pkcs12/p12_add.c
+++ b/crypto/pkcs12/p12_add.c
@@ -195,48 +195,6 @@ STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass, i
                                   p7->d.encrypted->enc_data->enc_data, 1);
 }
 
-X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher,
-                        const char *pass, int passlen,
-                        unsigned char *salt, int saltlen, int iter,
-                                               PKCS8_PRIV_KEY_INFO *p8inf)
-{
-       X509_SIG *p8;
-       X509_ALGOR *pbe;
-
-       if (!(p8 = X509_SIG_new())) {
-               PKCS12err(PKCS12_F_PKCS8_ENCRYPT, ERR_R_MALLOC_FAILURE);
-               goto err;
-       }
-
-       if(pbe_nid == -1) pbe = PKCS5_pbe2_set(cipher, iter, salt, saltlen);
-       else pbe = PKCS5_pbe_set(pbe_nid, iter, salt, saltlen);
-       if(!pbe) {
-               PKCS12err(PKCS12_F_PKCS8_ENCRYPT, ERR_R_ASN1_LIB);
-               goto err;
-       }
-       X509_ALGOR_free(p8->algor);
-       p8->algor = pbe;
-       M_ASN1_OCTET_STRING_free(p8->digest);
-       p8->digest = PKCS12_item_i2d_encrypt(pbe, ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO),
-                                       pass, passlen, p8inf, 1);
-       if(!p8->digest) {
-               PKCS12err(PKCS12_F_PKCS8_ENCRYPT, PKCS12_R_ENCRYPT_ERROR);
-               goto err;
-       }
-
-       return p8;
-
-       err:
-       X509_SIG_free(p8);
-       return NULL;
-}
-
-PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(X509_SIG *p8, const char *pass, int passlen)
-{
-       return PKCS12_item_decrypt_d2i(p8->algor, ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO), pass,
-                                       passlen, p8->digest, 1);
-}
-
 PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(PKCS12_SAFEBAG *bag, const char *pass,
                                                                int passlen)
 {