diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2016-11-02 12:35:46 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2016-11-02 13:02:13 +0100 |
| commit | 2f3adf9513b1579ae17489d45d032b962bba885a (patch) | |
| tree | 5cb07cda203bdbed8e6416c62c9c4e29dffa3c4d /src | |
| parent | f15eedb3a390dcbe441cd77231c3449ff941d189 (diff) | |
| download | libgit2-2f3adf9513b1579ae17489d45d032b962bba885a.tar.gz | |
openssl: use ASN1_STRING_get0_data when compiling against 1.1
For older versions we can fall back on the deprecated ASN1_STRING_data.
Diffstat (limited to 'src')
| -rw-r--r-- | src/openssl_stream.c | 4 | ||||
| -rw-r--r-- | src/openssl_stream.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/openssl_stream.c b/src/openssl_stream.c index 80c6b9828..826c0a537 100644 --- a/src/openssl_stream.c +++ b/src/openssl_stream.c @@ -357,7 +357,7 @@ static int verify_server_cert(SSL *ssl, const char *host) num = sk_GENERAL_NAME_num(alts); for (i = 0; i < num && matched != 1; i++) { const GENERAL_NAME *gn = sk_GENERAL_NAME_value(alts, i); - const char *name = (char *) ASN1_STRING_data(gn->d.ia5); + const char *name = (char *) ASN1_STRING_get0_data(gn->d.ia5); size_t namelen = (size_t) ASN1_STRING_length(gn->d.ia5); /* Skip any names of a type we're not looking for */ @@ -412,7 +412,7 @@ static int verify_server_cert(SSL *ssl, const char *host) if (size > 0) { peer_cn = OPENSSL_malloc(size + 1); GITERR_CHECK_ALLOC(peer_cn); - memcpy(peer_cn, ASN1_STRING_data(str), size); + memcpy(peer_cn, ASN1_STRING_get0_data(str), size); peer_cn[size] = '\0'; } else { goto cert_fail_name; diff --git a/src/openssl_stream.h b/src/openssl_stream.h index 509e40428..e8ce5d91b 100644 --- a/src/openssl_stream.h +++ b/src/openssl_stream.h @@ -108,6 +108,11 @@ GIT_INLINE(void*) BIO_get_data(BIO *a) return a->ptr; } +GIT_INLINE(const unsigned char *) ASN1_STRING_get0_data(const ASN1_STRING *x) +{ + return ASN1_STRING_data((ASN1_STRING *)x); +} + # endif #endif |