diff options
author | Dr. Stephen Henson <steve@openssl.org> | 1999-11-26 00:27:07 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 1999-11-26 00:27:07 +0000 |
commit | d4cec6a13dfb2c1d1ddf66dff499aaf21bbbf002 (patch) | |
tree | 4ee543a5413ad1df09e71f97cb69dfe2b48c12da /crypto/pem | |
parent | 1126239111a89c52d301c3439d20dc0fd61649c2 (diff) | |
download | openssl-d4cec6a13dfb2c1d1ddf66dff499aaf21bbbf002.tar.gz |
New options to the -verify program which can be used for chain verification.
Extend the X509_PURPOSE structure to include shortnames for purposed and default
trust ids.
Still need some extendable trust checking code and integration with the SSL and
S/MIME code.
Diffstat (limited to 'crypto/pem')
-rw-r--r-- | crypto/pem/pem.h | 2 | ||||
-rw-r--r-- | crypto/pem/pem_all.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h index 9260a11b8a..8ae1e9acc7 100644 --- a/crypto/pem/pem.h +++ b/crypto/pem/pem.h @@ -572,7 +572,7 @@ DECLARE_PEM_rw(DHparams, DH) DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY) -DECLARE_PEM_rw(PUBKEY, 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 *); diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c index 93f5d7ba79..c6d8835bf9 100644 --- a/crypto/pem/pem_all.c +++ b/crypto/pem/pem_all.c @@ -194,4 +194,4 @@ IMPLEMENT_PEM_rw(DHparams, DH, PEM_STRING_DHPARAMS, DHparams) IMPLEMENT_PEM_read(PrivateKey, EVP_PKEY, PEM_STRING_EVP_PKEY, PrivateKey) IMPLEMENT_PEM_write_cb(PrivateKey, EVP_PKEY, ((x->type == EVP_PKEY_DSA)?PEM_STRING_DSA:PEM_STRING_RSA), PrivateKey) -IMPLEMENT_PEM_rw(PUBKEY, EVP_PKEY, PEM_STRING_PUBLIC, PUBKEY); +IMPLEMENT_PEM_rw(PUBKEY, EVP_PKEY, PEM_STRING_PUBLIC, PUBKEY) |