diff options
author | Dr. Stephen Henson <steve@openssl.org> | 1999-03-29 17:50:26 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 1999-03-29 17:50:26 +0000 |
commit | ee0508d4114e2b2291953a7d4c81a09b624b8821 (patch) | |
tree | 080fa161b394826423a96d45262a36c80641490a /crypto/evp | |
parent | 7c0f3d09b32ee1882ee309b660e82bc3077f42db (diff) | |
download | openssl-ee0508d4114e2b2291953a7d4c81a09b624b8821.tar.gz |
Include pkcs12 program as part of openssl. This completes most of the PKCS#12
integration.
Diffstat (limited to 'crypto/evp')
-rw-r--r-- | crypto/evp/evp_pbe.c | 5 | ||||
-rw-r--r-- | crypto/evp/names.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c index e1ebb66357..a905573dec 100644 --- a/crypto/evp/evp_pbe.c +++ b/crypto/evp/evp_pbe.c @@ -174,3 +174,8 @@ EVP_PBE_KEYGEN *keygen; sk_push (pbe_algs, (char *)pbe_tmp); return 1; } + +void EVP_PBE_cleanup() +{ + sk_pop_free(pbe_algs, FreeFunc); +} diff --git a/crypto/evp/names.c b/crypto/evp/names.c index 4cc715606e..6bf37100de 100644 --- a/crypto/evp/names.c +++ b/crypto/evp/names.c @@ -60,6 +60,7 @@ #include "cryptlib.h" #include "evp.h" #include "objects.h" +#include "x509.h" int EVP_add_cipher(c) EVP_CIPHER *c; @@ -117,4 +118,5 @@ void EVP_cleanup() { OBJ_NAME_cleanup(OBJ_NAME_TYPE_CIPHER_METH); OBJ_NAME_cleanup(OBJ_NAME_TYPE_MD_METH); + EVP_PBE_cleanup(); } |