aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>1999-12-23 02:02:42 +0000
committerDr. Stephen Henson <steve@openssl.org>1999-12-23 02:02:42 +0000
commit525f51f6c98751de4db3b81789044d32e3686cda (patch)
tree6dd7f1baa5eb540c8e98a6401c5bd57709f1a1e9 /util
parent78baa17ad04922f996514f24f3823b9b8d4ec434 (diff)
downloadopenssl-525f51f6c98751de4db3b81789044d32e3686cda.zip
openssl-525f51f6c98751de4db3b81789044d32e3686cda.tar.gz
openssl-525f51f6c98751de4db3b81789044d32e3686cda.tar.bz2
Add PKCS#8 utility functions and add PBE options.
Diffstat (limited to 'util')
-rwxr-xr-xutil/libeay.num12
-rw-r--r--util/mkerr.pl2
2 files changed, 13 insertions, 1 deletions
diff --git a/util/libeay.num b/util/libeay.num
index 1c371fd..3c2c06b 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2137,3 +2137,15 @@ CRYPTO_set_mem_debug_functions 2161
CRYPTO_pop_info 2162
CRYPTO_push_info_ 2163
CRYPTO_set_mem_debug_options 2164
+PEM_write_PKCS8PrivateKey_nid 2165
+PEM_write_bio_PKCS8PrivateKey_nid 2166
+d2i_PKCS8PrivateKey_bio 2167
+ASN1_NULL_free 2168
+d2i_ASN1_NULL 2169
+ASN1_NULL_new 2170
+i2d_PKCS8PrivateKey_bio 2171
+i2d_PKCS8PrivateKey_fp 2172
+i2d_ASN1_NULL 2173
+i2d_PKCS8PrivateKey_nid_fp 2174
+d2i_PKCS8PrivateKey_fp 2175
+i2d_PKCS8PrivateKey_nid_bio 2176
diff --git a/util/mkerr.pl b/util/mkerr.pl
index 4b3bccb..ebc059e 100644
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -450,7 +450,7 @@ void ERR_load_${lib}_strings(void)
#ifdef ${lib}_LIB_NAME
${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code,0,0);
ERR_load_strings(0,${lib}_lib_name);
-#endif;
+#endif
}
}