diff options
author | Rob Stradling <rob@comodo.com> | 2014-02-19 13:12:46 +0000 |
---|---|---|
committer | Rob Stradling <rob@comodo.com> | 2014-02-19 13:12:46 +0000 |
commit | b263f2124607c42a1013b6b342341196b2bdec8d (patch) | |
tree | bf2187bbb4537f3842bd40559edad07d269823aa /apps | |
parent | dcfe8df148d225aa15fdd0eba486a028ad4b06dc (diff) | |
download | openssl-b263f2124607c42a1013b6b342341196b2bdec8d.tar.gz |
Move the SCT List extension parser into libssl.
Add the extension parser in the s_client, ocsp and x509 apps.
Diffstat (limited to 'apps')
-rw-r--r-- | apps/ocsp.c | 2 | ||||
-rw-r--r-- | apps/s_client.c | 3 | ||||
-rw-r--r-- | apps/x509.c | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/apps/ocsp.c b/apps/ocsp.c index ccf2f0f949..05db842cd9 100644 --- a/apps/ocsp.c +++ b/apps/ocsp.c @@ -174,6 +174,7 @@ int MAIN(int argc, char **argv) goto end; SSL_load_error_strings(); OpenSSL_add_ssl_algorithms(); + X509V3_EXT_add_rfc6962(); args = argv + 1; reqnames = sk_OPENSSL_STRING_new_null(); ids = sk_OCSP_CERTID_new_null(); @@ -970,6 +971,7 @@ end: OPENSSL_free(path); } + X509V3_EXT_cleanup(); OPENSSL_EXIT(ret); } diff --git a/apps/s_client.c b/apps/s_client.c index af88ffdaad..f85309f900 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -713,6 +713,8 @@ static char *jpake_secret = NULL; c_msg=0; c_showcerts=0; + X509V3_EXT_add_rfc6962(); + if (bio_err == NULL) bio_err=BIO_new_fp(stderr,BIO_NOCLOSE); @@ -2193,6 +2195,7 @@ end: BIO_free(bio_c_msg); bio_c_msg=NULL; } + X509V3_EXT_cleanup(); apps_shutdown(); OPENSSL_EXIT(ret); } diff --git a/apps/x509.c b/apps/x509.c index 1b612d17d4..db0ab1a6e9 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -73,6 +73,7 @@ #include <openssl/x509v3.h> #include <openssl/objects.h> #include <openssl/pem.h> +#include <openssl/ssl.h> #ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> #endif @@ -224,6 +225,8 @@ int MAIN(int argc, char **argv) apps_startup(); + X509V3_EXT_add_rfc6962(); + if (bio_err == NULL) bio_err=BIO_new_fp(stderr,BIO_NOCLOSE); @@ -1155,6 +1158,7 @@ end: sk_ASN1_OBJECT_pop_free(trust, ASN1_OBJECT_free); sk_ASN1_OBJECT_pop_free(reject, ASN1_OBJECT_free); if (passin) OPENSSL_free(passin); + X509V3_EXT_cleanup(); apps_shutdown(); OPENSSL_EXIT(ret); } |