mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 04:14:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace ASN1_STRING_data with ASN1_STRING_get0_data

Browse Source 
This is a slightly modified version of the patch from Jelle van der Waa
( @jelly ) so full credit to him.
This commit is contained in:
Jakub Zelenka 2017-06-04 18:08:51 +01:00
parent 585c9f3c4b
commit 3704947696
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ext/openssl/openssl.c
View File

@ -653,6 +653,11 @@ int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key)
return 1; return 1;
} }
static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
{
return M_ASN1_STRING_data(asn1);
}
#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined (LIBRESSL_VERSION_NUMBER) #if OPENSSL_VERSION_NUMBER < 0x10002000L || defined (LIBRESSL_VERSION_NUMBER)
static int X509_get_signature_nid(const X509 *x) static int X509_get_signature_nid(const X509 *x)
@ -811,9 +816,9 @@ static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int s
} }
for (i = 0; i < X509_NAME_entry_count(name); i++) { for (i = 0; i < X509_NAME_entry_count(name); i++) {
unsigned char *to_add = NULL; const unsigned char *to_add = NULL;
int to_add_len = 0; int to_add_len = 0;
int needs_free = 0; unsigned char *to_add_buf = NULL;
ne = X509_NAME_get_entry(name, i); ne = X509_NAME_get_entry(name, i);
obj = X509_NAME_ENTRY_get_object(ne); obj = X509_NAME_ENTRY_get_object(ne);
@ -828,32 +833,34 @@ static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int s
str = X509_NAME_ENTRY_get_data(ne); str = X509_NAME_ENTRY_get_data(ne);
if (ASN1_STRING_type(str) != V_ASN1_UTF8STRING) { if (ASN1_STRING_type(str) != V_ASN1_UTF8STRING) {
/* ASN1_STRING_to_UTF8(3): The converted data is copied into a newly allocated buffer */ /* ASN1_STRING_to_UTF8(3): The converted data is copied into a newly allocated buffer */
to_add_len = ASN1_STRING_to_UTF8(&to_add, str); to_add_len = ASN1_STRING_to_UTF8(&to_add_buf, str);
needs_free = 1; to_add = to_add_buf;
} else { } else {
/* ASN1_STRING_data(3): Since this is an internal pointer it should not be freed or modified in any way */ /* ASN1_STRING_get0_data(3): Since this is an internal pointer it should not be freed or modified in any way */
to_add = ASN1_STRING_data(str); to_add = ASN1_STRING_get0_data(str);
to_add_len = ASN1_STRING_length(str); to_add_len = ASN1_STRING_length(str);
} }
if (to_add_len != -1) { if (to_add_len != -1) {
if ((data = zend_hash_str_find(Z_ARRVAL(subitem), sname, strlen(sname))) != NULL) { if ((data = zend_hash_str_find(Z_ARRVAL(subitem), sname, strlen(sname))) != NULL) {
if (Z_TYPE_P(data) == IS_ARRAY) { if (Z_TYPE_P(data) == IS_ARRAY) {
add_next_index_stringl(data, (char *)to_add, to_add_len); add_next_index_stringl(data, (const char *)to_add, to_add_len);
} else if (Z_TYPE_P(data) == IS_STRING) { } else if (Z_TYPE_P(data) == IS_STRING) {
array_init(&tmp); array_init(&tmp);
add_next_index_str(&tmp, zend_string_copy(Z_STR_P(data))); add_next_index_str(&tmp, zend_string_copy(Z_STR_P(data)));
add_next_index_stringl(&tmp, (char *)to_add, to_add_len); add_next_index_stringl(&tmp, (const char *)to_add, to_add_len);
zend_hash_str_update(Z_ARRVAL(subitem), sname, strlen(sname), &tmp); zend_hash_str_update(Z_ARRVAL(subitem), sname, strlen(sname), &tmp);
} }
} else { } else {
/* it might be better to expand it and pass zval from ZVAL_STRING
* to zend_symtable_str_update so we do not silently drop const
* but we need a test to cover this part first */
add_assoc_stringl(&subitem, sname, (char *)to_add, to_add_len); add_assoc_stringl(&subitem, sname, (char *)to_add, to_add_len);
} }
} }
if (needs_free) { if (to_add_buf != NULL) {
/* ASN1_STRING_to_UTF8(3): The buffer out should be freed using free(3) */ OPENSSL_free(to_add_buf);
OPENSSL_free(to_add);
} }
} }
@ -892,7 +899,7 @@ static time_t asn1_time_to_time_t(ASN1_UTCTIME * timestr) /* {{{ */
timestr_len = (size_t)ASN1_STRING_length(timestr); timestr_len = (size_t)ASN1_STRING_length(timestr);
if (timestr_len != strlen((const char*)ASN1_STRING_data(timestr))) { if (timestr_len != strlen((const char *)ASN1_STRING_get0_data(timestr))) {
php_error_docref(NULL, E_WARNING, "illegal length in timestamp"); php_error_docref(NULL, E_WARNING, "illegal length in timestamp");
return (time_t)-1; return (time_t)-1;
} }
@ -907,7 +914,7 @@ static time_t asn1_time_to_time_t(ASN1_UTCTIME * timestr) /* {{{ */
return (time_t)-1; return (time_t)-1;
} }
strbuf = estrdup((char *)ASN1_STRING_data(timestr)); strbuf = estrdup((const char *)ASN1_STRING_get0_data(timestr));
memset(&thetime, 0, sizeof(thetime)); memset(&thetime, 0, sizeof(thetime));
@ -1945,7 +1952,7 @@ PHP_FUNCTION(openssl_spki_export_challenge)
goto cleanup; goto cleanup;
} }
RETVAL_STRING((char *) ASN1_STRING_data(spki->spkac->challenge)); RETVAL_STRING((const char *)ASN1_STRING_get0_data(spki->spkac->challenge));
goto cleanup; goto cleanup;
cleanup: cleanup:
@ -2126,19 +2133,19 @@ static int openssl_x509v3_subjectAltName(BIO *bio, X509_EXTENSION *extension)
case GEN_EMAIL: case GEN_EMAIL:
BIO_puts(bio, "email:"); BIO_puts(bio, "email:");
as = name->d.rfc822Name; as = name->d.rfc822Name;
BIO_write(bio, ASN1_STRING_data(as), BIO_write(bio, ASN1_STRING_get0_data(as),
ASN1_STRING_length(as)); ASN1_STRING_length(as));
break; break;
case GEN_DNS: case GEN_DNS:
BIO_puts(bio, "DNS:"); BIO_puts(bio, "DNS:");
as = name->d.dNSName; as = name->d.dNSName;
BIO_write(bio, ASN1_STRING_data(as), BIO_write(bio, ASN1_STRING_get0_data(as),
ASN1_STRING_length(as)); ASN1_STRING_length(as));
break; break;
case GEN_URI: case GEN_URI:
BIO_puts(bio, "URI:"); BIO_puts(bio, "URI:");
as = name->d.uniformResourceIdentifier; as = name->d.uniformResourceIdentifier;
BIO_write(bio, ASN1_STRING_data(as), BIO_write(bio, ASN1_STRING_get0_data(as),
ASN1_STRING_length(as)); ASN1_STRING_length(as));
break; break;
default: default: