Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / base / openssladapter.cc

diff --git a/src/third_party/webrtc/base/openssladapter.cc b/src/third_party/webrtc/base/openssladapter.cc
index 3618aad..68a1fcb 100644 (file)
--- a/src/third_party/webrtc/base/openssladapter.cc
+++ b/src/third_party/webrtc/base/openssladapter.cc
@@ -24,6 +24,7 @@
 #include <openssl/err.h>
 #include <openssl/opensslv.h>
 #include <openssl/rand.h>
+#include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
 #if HAVE_CONFIG_H
@@ -694,7 +695,10 @@ bool OpenSSLAdapter::VerifyServerName(SSL* ssl, const char* host,
       }
 
       STACK_OF(CONF_VALUE)* value = meth->i2v(meth, ext_str, NULL);
-      for (int j = 0; j < sk_CONF_VALUE_num(value); ++j) {
+
+      // Cast to size_t to be compilable for both OpenSSL and BoringSSL.
+      for (size_t j = 0; j < static_cast<size_t>(sk_CONF_VALUE_num(value));
+           ++j) {
         CONF_VALUE* nval = sk_CONF_VALUE_value(value, j);
         // The value for nval can contain wildcards
         if (!strcmp(nval->name, "DNS") && string_match(host, nval->value)) {
@@ -718,7 +722,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,