diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-11-21 22:28:31 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-11-21 22:28:31 +0000 |
| commit | 52664f5081939c96c5867fd02278f7575f1cab2d (patch) | |
| tree | f2a5a01dcf50d2f54aa8114adf8ed59867754ed6 /crypto/pem/pem.h | |
| parent | a716d727347d6cd81534327901b509c6f5763f83 (diff) | |
Transparent support for PKCS#8 private keys in RSA/DSA.
New universal public key format.
Fix CRL+cert load problem in by_file.c
Make verify report errors when loading files or dirs
Diffstat (limited to 'crypto/pem/pem.h')
| -rw-r--r-- | crypto/pem/pem.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h index ce2c1a3596..9260a11b8a 100644 --- a/crypto/pem/pem.h +++ b/crypto/pem/pem.h @@ -108,6 +108,7 @@ extern "C" { #define PEM_STRING_X509_REQ "CERTIFICATE REQUEST" #define PEM_STRING_X509_CRL "X509 CRL" #define PEM_STRING_EVP_PKEY "ANY PRIVATE KEY" +#define PEM_STRING_PUBLIC "PUBLIC KEY" #define PEM_STRING_RSA "RSA PRIVATE KEY" #define PEM_STRING_RSA_PUBLIC "RSA PUBLIC KEY" #define PEM_STRING_DSA "DSA PRIVATE KEY" @@ -549,6 +550,7 @@ DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO) DECLARE_PEM_rw_cb(RSAPrivateKey, RSA) DECLARE_PEM_rw(RSAPublicKey, RSA) +DECLARE_PEM_rw(RSA_PUBKEY, RSA) #endif @@ -556,7 +558,7 @@ DECLARE_PEM_rw(RSAPublicKey, RSA) DECLARE_PEM_rw_cb(DSAPrivateKey, DSA) -DECLARE_PEM_rw(DSAPublicKey, DSA) +DECLARE_PEM_rw(DSA_PUBKEY, DSA) DECLARE_PEM_rw(DSAparams, DSA) @@ -570,6 +572,8 @@ DECLARE_PEM_rw(DHparams, DH) DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY) +DECLARE_PEM_rw(PUBKEY, EVP_PKEY); + int PEM_write_bio_PKCS8PrivateKey(BIO *, EVP_PKEY *, const EVP_CIPHER *, char *, int, pem_password_cb *, void *); int PEM_write_PKCS8PrivateKey(FILE *fp,EVP_PKEY *x,const EVP_CIPHER *enc, |