moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

openssl: remove CONST_ASN1_BIT_STRING.

Browse Source 
Just making the pointer as const works for the pre-1.1.0 path too.

Closes #1759
This commit is contained in:
David Benjamin 2017-08-10 16:37:17 -04:00 committed by Daniel Stenberg
parent 4ebe24dfea
commit f26f6d258f
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/vtls/openssl.c
View File

@ -111,7 +111,6 @@
#define HAVE_OPAQUE_EVP_PKEY 1 /* since 1.1.0 -pre3 */ #define HAVE_OPAQUE_EVP_PKEY 1 /* since 1.1.0 -pre3 */
#define HAVE_OPAQUE_RSA_DSA_DH 1 /* since 1.1.0 -pre5 */ #define HAVE_OPAQUE_RSA_DSA_DH 1 /* since 1.1.0 -pre5 */
#define CONST_EXTS const #define CONST_EXTS const
#define CONST_ASN1_BIT_STRING const
#define HAVE_ERR_REMOVE_THREAD_STATE_DEPRECATED 1 #define HAVE_ERR_REMOVE_THREAD_STATE_DEPRECATED 1
#else #else
/* For OpenSSL before 1.1.0 */ /* For OpenSSL before 1.1.0 */
@ -119,7 +118,6 @@
#define X509_get0_notBefore(x) X509_get_notBefore(x) #define X509_get0_notBefore(x) X509_get_notBefore(x)
#define X509_get0_notAfter(x) X509_get_notAfter(x) #define X509_get0_notAfter(x) X509_get_notAfter(x)
#define CONST_EXTS /* nope */ #define CONST_EXTS /* nope */
#define CONST_ASN1_BIT_STRING /* nope */
#ifdef LIBRESSL_VERSION_NUMBER #ifdef LIBRESSL_VERSION_NUMBER
static unsigned long OpenSSL_version_num(void) static unsigned long OpenSSL_version_num(void)
{ {
@ -2560,7 +2558,7 @@ static CURLcode get_cert_chain(struct connectdata *conn,
EVP_PKEY *pubkey=NULL; EVP_PKEY *pubkey=NULL;
int j; int j;
char *ptr; 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); X509_NAME_print_ex(mem, X509_get_subject_name(x), 0, XN_FLAG_ONELINE);
push_certinfo("Subject", i); push_certinfo("Subject", i);