Index: net/third_party/nss/ssl/ssl3con.c |
diff --git a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con.c |
index 3ca4577fc1312a39c98fba2fe040d633711d4e05..506044750c6306ecef59d8bc217f2c048011f68f 100644 |
--- a/net/third_party/nss/ssl/ssl3con.c |
+++ b/net/third_party/nss/ssl/ssl3con.c |
@@ -6041,9 +6041,7 @@ ssl3_HandleCertificateRequest(sslSocket *ss, SSL3Opaque *b, PRUint32 length) |
ss->ssl3.hs.ws = wait_hello_done; |
#ifdef NSS_PLATFORM_CLIENT_AUTH |
- if (ss->getPlatformClientAuthData == NULL) { |
- rv = SECFailure; /* force it to send a no_certificate alert */ |
- } else { |
+ if (ss->getPlatformClientAuthData != NULL) { |
/* XXX Should pass cert_types in this call!! */ |
rv = (SECStatus)(*ss->getPlatformClientAuthData)( |
ss->getPlatformClientAuthDataArg, |
@@ -6052,8 +6050,8 @@ ssl3_HandleCertificateRequest(sslSocket *ss, SSL3Opaque *b, PRUint32 length) |
(void**)&ss->ssl3.platformClientKey, |
&ss->ssl3.clientCertificate, |
&ss->ssl3.clientPrivateKey); |
- } |
-#else |
+ } else |
+#endif |
if (ss->getClientAuthData == NULL) { |
rv = SECFailure; /* force it to send a no_certificate alert */ |
} else { |
@@ -6063,7 +6061,7 @@ ssl3_HandleCertificateRequest(sslSocket *ss, SSL3Opaque *b, PRUint32 length) |
&ss->ssl3.clientCertificate, |
&ss->ssl3.clientPrivateKey); |
} |
-#endif /* NSS_PLATFORM_CLIENT_AUTH */ |
+ |
switch (rv) { |
case SECWouldBlock: /* getClientAuthData has put up a dialog box. */ |
ssl3_SetAlwaysBlock(ss); |