Compile fix for OpenSSL on Mac and Windows

Compile fix for OpenSSL on Mac and Windows.

OSCertHandle is not defined to OpenSSL's X509
on Mac/Windows.

BUG=None
TEST=None

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=276678

[haavardm, 2014-06-11 13:46:30]

Small compile fix. Ryan please review.

[wtc, 2014-06-11 16:50:40]

Review comments on patch set 2:

https://codereview.chromium.org/329143002/diff/20001/net/socket/ssl_server_so...
File net/socket/ssl_server_socket_openssl.cc (right):

https://codereview.chromium.org/329143002/diff/20001/net/socket/ssl_server_so...
net/socket/ssl_server_socket_openssl.cc:633: X509* cert = d2i_X509(NULL,
&der_string_array, der_string.length());

Nit: the |cert_| member is of the X509Certificate type. So it is a little
confusing to have a similarly named |cert| variable of a different type. I
suggest renaming this variable |x509|.

https://codereview.chromium.org/329143002/diff/20001/net/socket/ssl_server_so...
net/socket/ssl_server_socket_openssl.cc:638: if (SSL_use_certificate(ssl_, cert)
!= 1) {

Does |ssl_| own |cert| if this SSL_use_certificate call succeeds?

[haavardm, 2014-06-11 18:09:27]

PTAL

https://codereview.chromium.org/329143002/diff/20001/net/socket/ssl_server_so...
File net/socket/ssl_server_socket_openssl.cc (right):

https://codereview.chromium.org/329143002/diff/20001/net/socket/ssl_server_so...
net/socket/ssl_server_socket_openssl.cc:633: X509* cert = d2i_X509(NULL,
&der_string_array, der_string.length());
On 2014/06/11 16:50:39, wtc wrote:
> 
> Nit: the |cert_| member is of the X509Certificate type. So it is a little
> confusing to have a similarly named |cert| variable of a different type. I
> suggest renaming this variable |x509|.

Done.

https://codereview.chromium.org/329143002/diff/20001/net/socket/ssl_server_so...
net/socket/ssl_server_socket_openssl.cc:638: if (SSL_use_certificate(ssl_, cert)
!= 1) {
On 2014/06/11 16:50:39, wtc wrote:
> 
> Does |ssl_| own |cert| if this SSL_use_certificate call succeeds?

It counts up the reference counting and will free when done with it if it is the
only one with a reference.

I realized though, that d2i_X509 returns a certificate with reference count 1,
so it needs to be free'd independently of the success of SSL_use_certificate.
X509_free counts down the reference count and frees if it reaches 0.

[wtc, 2014-06-11 23:44:05]

Patch set 3 LGTM.

https://codereview.chromium.org/329143002/diff/40001/net/socket/ssl_server_so...
File net/socket/ssl_server_socket_openssl.cc (right):

https://codereview.chromium.org/329143002/diff/40001/net/socket/ssl_server_so...
net/socket/ssl_server_socket_openssl.cc:634: x509(d2i_X509(NULL,
&der_string_array, der_string.length()));

This line should be indented with four spaces.

https://codereview.chromium.org/329143002/diff/40001/net/socket/ssl_server_so...
net/socket/ssl_server_socket_openssl.cc:638: // On success, SSL_use_certificate
counts up the reference count on cert.

1. Nit: cert => |x509|

2. Nit: counts up => increments

Or we can say "acquires a reference to |x509|".

[haavardm, 2014-06-12 07:59:45]

The CQ bit was checked by haavardm@opera.com

[commit-bot: I haz the power, 2014-06-12 08:03:57]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/haavardm@opera.com/329143002/60001

[commit-bot: I haz the power, 2014-06-12 14:37:02]

Change committed as 276678