mirror of https://github.com/python/cpython
Merged revisions 78596 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r78596 | victor.stinner | 2010-03-02 23:44:42 +0100 (mar., 02 mars 2010) | 4 lines Issue #2973: Fix gcc warning on the 2nd argument of ASN1_item_d2i() and method->d2i(): OpenSSL API changed in OpenSSL 0.9.6m. Patch written by Daniel Black. ........
This commit is contained in:
parent
698a18aa9e
commit
7124a41da2
|
@ -658,7 +658,12 @@ _get_peer_alt_names (X509 *certificate) {
|
|||
char buf[2048];
|
||||
char *vptr;
|
||||
int len;
|
||||
/* Issue #2973: ASN1_item_d2i() API changed in OpenSSL 0.9.6m */
|
||||
#if OPENSSL_VERSION_NUMBER >= 0x009060dfL
|
||||
const unsigned char *p;
|
||||
#else
|
||||
unsigned char *p;
|
||||
#endif
|
||||
|
||||
if (certificate == NULL)
|
||||
return peer_alt_names;
|
||||
|
|
Loading…
Reference in New Issue