summaryrefslogtreecommitdiffstats
path: root/crypto/pem/pem_all.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>1999-06-04 23:33:48 +0000
committerDr. Stephen Henson <steve@openssl.org>1999-06-04 23:33:48 +0000
commitb0c6fb8064f129ba94aa9e1f479750a20b2bdee2 (patch)
tree1d5fe0a9348ffd6a1d79f0887a23c9ac4a0ac922 /crypto/pem/pem_all.c
parentef8335d900ee5af9d83237ad29d6904a3bb69290 (diff)
The rest of the PKCS#5, PKCS#8 patch I forgot before :-)
Diffstat (limited to 'crypto/pem/pem_all.c')
-rw-r--r--crypto/pem/pem_all.c33
1 files changed, 33 insertions, 0 deletions
diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c
index 0775155fb0..bb3ce5128b 100644
--- a/crypto/pem/pem_all.c
+++ b/crypto/pem/pem_all.c
@@ -402,3 +402,36 @@ int PEM_write_bio_NETSCAPE_CERT_SEQUENCE(BIO *bp, NETSCAPE_CERT_SEQUENCE *x)
PEM_STRING_X509,bp, (char *)x, NULL,NULL,0,NULL));
}
+
+/* The PKCS8 functions */
+
+#ifndef NO_FP_API
+X509_SIG *PEM_read_PKCS8(FILE *fp,
+ X509_SIG **x, pem_password_cb *cb)
+ {
+ return((X509_SIG *) PEM_ASN1_read((char *(*)())d2i_X509_SIG,
+ PEM_STRING_PKCS8,fp,(char **)x,cb));
+ }
+#endif
+
+X509_SIG *PEM_read_bio_PKCS8(BIO *bp,
+ X509_SIG **x, pem_password_cb *cb)
+ {
+ return((X509_SIG *)
+ PEM_ASN1_read_bio((char *(*)())d2i_X509_SIG,
+ PEM_STRING_PKCS8,bp,(char **)x,cb));
+ }
+
+#ifndef NO_FP_API
+int PEM_write_PKCS8(FILE *fp, X509_SIG *x)
+ {
+ return(PEM_ASN1_write((int (*)())i2d_X509_SIG,
+ PEM_STRING_PKCS8,fp, (char *)x, NULL,NULL,0,NULL));
+ }
+#endif
+
+int PEM_write_bio_PKCS8(BIO *bp, X509_SIG *x)
+ {
+ return(PEM_ASN1_write_bio((int (*)())i2d_X509_SIG,
+ PEM_STRING_PKCS8,bp, (char *)x, NULL,NULL,0,NULL));
+ }