Support for client certs in ssl_server_socket.

net/ssl/openssl_ssl_util.h

Index: net/ssl/openssl_ssl_util.h
diff --git a/net/ssl/openssl_ssl_util.h b/net/ssl/openssl_ssl_util.h
index 6c886cc1c9cf5d29325f9f62a858eeea9c8ef03e..e582239fdf466764c41a3e49407d5338b2cb884d 100644
--- a/net/ssl/openssl_ssl_util.h
+++ b/net/ssl/openssl_ssl_util.h
@@ -5,7 +5,9 @@
 #ifndef NET_SSL_OPENSSL_SSL_UTIL_H_
 #define NET_SSL_OPENSSL_SSL_UTIL_H_
 
+#include "net/cert/x509_certificate.h"
 #include "net/log/net_log.h"
+#include "net/ssl/scoped_openssl_types.h"
 
 namespace crypto {
 class OpenSSLErrStackTracer;
@@ -67,6 +69,26 @@ NetLog::ParametersCallback CreateNetLogOpenSSLErrorCallback(
     int ssl_error,
     const OpenSSLErrorInfo& error_info);
 
+void FreeX509Stack(STACK_OF(X509) * ptr);
+void FreeX509NameStack(STACK_OF(X509_NAME) * ptr);
+
+using ScopedX509Name = crypto::ScopedOpenSSL<X509_NAME, X509_NAME_free>;

[davidben, 2015/12/14 23:56:50]

Nit: For consistency with other scopers, lets call this ScopedX509_NAME.

[ryanchung, 2015/12/16 22:40:02]

Done.

+using ScopedX509Stack = crypto::ScopedOpenSSL<STACK_OF(X509), FreeX509Stack>;
+using ScopedX509NameStack =
+    crypto::ScopedOpenSSL<STACK_OF(X509_NAME), FreeX509NameStack>;

[davidben, 2015/12/14 23:56:50]

I'd put these in net/ssl/scoped_openssl_types.h

[ryanchung, 2015/12/16 22:40:02]

Done.

+
+// Used for encoding the |connection_status| field of an SSLInfo object.
+int EncodeSSLConnectionStatus(int cipher_suite, int compression, int version);

[davidben, 2015/12/14 23:56:50]

This isn't really OpenSSL-specific. It'd go better in
net/ssl/ssl_connection_status_flags.h. But even then, there's already
SSLConnectionStatusSetCipherSuite and SSLConnectionStatusSetVersion.

And TLS compression doesn't exist anymore. You can drop code for that.

[ryanchung, 2015/12/16 22:40:02]

Done. Dropped.

+
+// Returns the net SSL version number (see ssl_connection_status_flags.h) for
+// this SSL connection.
+int GetNetSSLVersion(SSL* ssl);

[davidben, 2015/12/14 23:56:50]

#include <openssl/ssl.h>

[ryanchung, 2015/12/16 22:40:02]

Done.

+
+ScopedX509 OSCertHandleToOpenSSL(X509Certificate::OSCertHandle os_handle);
+
+ScopedX509Stack OSCertHandlesToOpenSSL(
+    const X509Certificate::OSCertHandles& os_handles);
+
 }  // namespace net
 
 #endif  // NET_SSL_OPENSSL_SSL_UTIL_H_