From d5a0506e847e55d8f9145d5e548e98302f264e22 Mon Sep 17 00:00:00 2001 From: "henrike@webrtc.org" Date: Mon, 30 Jun 2014 20:38:56 +0000 Subject: [PATCH] Use X509_NAME, not struct X509_name_st. Also include openssl/x509.h explicitly since we're using functions and types from it. BUG=none R=henrike@webrtc.org, wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/12859004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6569 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/base/openssladapter.cc | 3 ++- webrtc/base/openssladapter.cc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/talk/base/openssladapter.cc b/talk/base/openssladapter.cc index 9e6fe72c24..7e27fe3b19 100644 --- a/talk/base/openssladapter.cc +++ b/talk/base/openssladapter.cc @@ -41,6 +41,7 @@ #include #include #include +#include #include #if HAVE_CONFIG_H @@ -735,7 +736,7 @@ bool OpenSSLAdapter::VerifyServerName(SSL* ssl, const char* host, } char data[256]; - X509_name_st* subject; + X509_NAME* subject; if (!ok && ((subject = X509_get_subject_name(certificate)) != NULL) && (X509_NAME_get_text_by_NID(subject, NID_commonName, diff --git a/webrtc/base/openssladapter.cc b/webrtc/base/openssladapter.cc index 3618aadaae..601b4afcbc 100644 --- a/webrtc/base/openssladapter.cc +++ b/webrtc/base/openssladapter.cc @@ -24,6 +24,7 @@ #include #include #include +#include #include #if HAVE_CONFIG_H @@ -718,7 +719,7 @@ bool OpenSSLAdapter::VerifyServerName(SSL* ssl, const char* host, } char data[256]; - X509_name_st* subject; + X509_NAME* subject; if (!ok && ((subject = X509_get_subject_name(certificate)) != NULL) && (X509_NAME_get_text_by_NID(subject, NID_commonName,