summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWan-Teh Chang <wtc@google.com>2015-12-09 11:02:00 -0800
committerWan-Teh Chang <wtc@google.com>2015-12-09 11:02:00 -0800
commit0d71e3de7cab8c314f85d0557046d337199286f6 (patch)
tree1711aca9746b299e12b7852252d51be241d4171e
parent27b7eed22e67425da81ff78f81c5827707a94824 (diff)
downloadnss-hg-0d71e3de7cab8c314f85d0557046d337199286f6.tar.gz
Bug 944175: Fix nits in conditional expression formatting and error
messages. r=ekr
-rw-r--r--lib/ssl/sslsock.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/sslsock.c b/lib/ssl/sslsock.c
index f446f37cd..8ffecadb6 100644
--- a/lib/ssl/sslsock.c
+++ b/lib/ssl/sslsock.c
@@ -1944,9 +1944,9 @@ SSL_ReconfigFD(PRFileDesc *model, PRFileDesc *fd)
if (ss->signedCertTimestamps[i].data) {
SECITEM_FreeItem(&ss->signedCertTimestamps[i], PR_FALSE);
}
- if (SECSuccess != SECITEM_CopyItem(NULL,
+ if (SECITEM_CopyItem(NULL,
&ss->signedCertTimestamps[i],
- &sm->signedCertTimestamps[i])) {
+ &sm->signedCertTimestamps[i]) != SECSuccess) {
goto loser;
}
}
@@ -2540,7 +2540,7 @@ SSL_SetStapledOCSPResponses(PRFileDesc *fd, const SECItemArray *responses,
}
if ( kea <= 0 || kea >= kt_kea_size) {
- SSL_DBG(("%d: SSL[%d]: invalid key in SSL_SetStapledOCSPResponses",
+ SSL_DBG(("%d: SSL[%d]: invalid key type in SSL_SetStapledOCSPResponses",
SSL_GETPID(), fd));
return SECFailure;
}
@@ -2568,7 +2568,7 @@ SSL_SetSignedCertTimestamps(PRFileDesc *fd, const SECItem *scts, SSLKEAType kea)
}
if (kea <= 0 || kea >= kt_kea_size) {
- SSL_DBG(("%d: SSL[%d]: invalid key in SSL_SetSignedCertTimestamps",
+ SSL_DBG(("%d: SSL[%d]: invalid key type in SSL_SetSignedCertTimestamps",
SSL_GETPID(), fd));
return SECFailure;
}