projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fc237de
)
Fix a code inconsistency
author
Matt Caswell
<matt@openssl.org>
Wed, 19 Oct 2016 10:35:55 +0000
(11:35 +0100)
committer
Matt Caswell
<matt@openssl.org>
Fri, 4 Nov 2016 10:38:54 +0000
(10:38 +0000)
Move from two ifs to a single one with an &&
Reviewed-by: Richard Levitte <levitte@openssl.org>
test/ossl_shim/ossl_shim.cc
patch
|
blob
|
history
diff --git
a/test/ossl_shim/ossl_shim.cc
b/test/ossl_shim/ossl_shim.cc
index fc2180ef5e8e0b998092da86f1c5e77662a94fcf..02917c970f9a32ca2eddccece0424a4537e3da14 100644
(file)
--- a/
test/ossl_shim/ossl_shim.cc
+++ b/
test/ossl_shim/ossl_shim.cc
@@
-176,10
+176,8
@@
static bool InstallCertificate(SSL *ssl) {
return false;
}
- if (pkey) {
- if (!SSL_use_PrivateKey(ssl, pkey.get())) {
- return false;
- }
+ if (pkey && !SSL_use_PrivateKey(ssl, pkey.get())) {
+ return false;
}
if (x509 && !SSL_use_certificate(ssl, x509.get())) {