diff options
| author | David Benjamin <davidben@google.com> | 2017-08-10 16:37:17 -0400 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-08-11 08:15:58 +0200 |
| commit | f26f6d258f9310c6e65750e46fbe4a9e6d786aac (patch) | |
| tree | b7be7961edc817839d4496b6adecba24b861fb2d | |
| parent | 4ebe24dfea0c9f93cbfaee66b52a0670e66124d8 (diff) | |
openssl: remove CONST_ASN1_BIT_STRING.
Just making the pointer as const works for the pre-1.1.0 path too.
Closes #1759
| -rw-r--r-- | lib/vtls/openssl.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index 40bb2dde4..42b4e9a14 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -111,7 +111,6 @@ #define HAVE_OPAQUE_EVP_PKEY 1 /* since 1.1.0 -pre3 */ #define HAVE_OPAQUE_RSA_DSA_DH 1 /* since 1.1.0 -pre5 */ #define CONST_EXTS const -#define CONST_ASN1_BIT_STRING const #define HAVE_ERR_REMOVE_THREAD_STATE_DEPRECATED 1 #else /* For OpenSSL before 1.1.0 */ @@ -119,7 +118,6 @@ #define X509_get0_notBefore(x) X509_get_notBefore(x) #define X509_get0_notAfter(x) X509_get_notAfter(x) #define CONST_EXTS /* nope */ -#define CONST_ASN1_BIT_STRING /* nope */ #ifdef LIBRESSL_VERSION_NUMBER static unsigned long OpenSSL_version_num(void) { @@ -2560,7 +2558,7 @@ static CURLcode get_cert_chain(struct connectdata *conn, EVP_PKEY *pubkey=NULL; int j; char *ptr; - CONST_ASN1_BIT_STRING ASN1_BIT_STRING *psig = NULL; + const ASN1_BIT_STRING *psig = NULL; X509_NAME_print_ex(mem, X509_get_subject_name(x), 0, XN_FLAG_ONELINE); push_certinfo("Subject", i); |