diff options
| author |   mcbride <mcbride@openbsd.org> | 2014-04-24 13:06:52 +0000 |
|---|---|---|
| committer | mcbride <mcbride@openbsd.org> | 2014-04-24 13:06:52 +0000 |
| commit | c297be8ae6f7d7cfc10970c4e4074f8dd3f48e44 (patch) | |
| tree | 4170e37f40296505a57ff7563b2c2f80029d22a4 /lib/libssl/s3_lib.c | |
| parent | unifdef -U LINT (diff) | |
| download | wireguard-openbsd-c297be8ae6f7d7cfc10970c4e4074f8dd3f48e44.tar.xz wireguard-openbsd-c297be8ae6f7d7cfc10970c4e4074f8dd3f48e44.zip | |
More KNF, things that couldn't be verified with md5(1), and some whitespace
I missed on the first go around.
Diffstat (limited to 'lib/libssl/s3_lib.c')
| -rw-r--r-- | lib/libssl/s3_lib.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/libssl/s3_lib.c b/lib/libssl/s3_lib.c index 28a3d51b9e5..12ce8a16055 100644 --- a/lib/libssl/s3_lib.c +++ b/lib/libssl/s3_lib.c @@ -2962,9 +2962,9 @@ ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) break; case SSL_CTRL_NEED_TMP_RSA: if ((s->cert != NULL) && (s->cert->rsa_tmp == NULL) && - ((s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL) || - (EVP_PKEY_size(s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey) - > (512 / 8)))) + ((s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL) || + (EVP_PKEY_size(s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey) + > (512 / 8)))) ret = 1; break; case SSL_CTRL_SET_TMP_RSA: @@ -3113,10 +3113,12 @@ ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) } if (s->tlsext_opaque_prf_input != NULL) free(s->tlsext_opaque_prf_input); - if ((size_t)larg == 0) - s->tlsext_opaque_prf_input = malloc(1); /* dummy byte just to get non-NULL */ - else - s->tlsext_opaque_prf_input = BUF_memdup(parg, (size_t)larg); + if ((size_t)larg == 0) { + /* dummy byte just to get non-NULL */ + s->tlsext_opaque_prf_input = malloc(1); + } else + s->tlsext_opaque_prf_input = + BUF_memdup(parg, (size_t)larg); if (s->tlsext_opaque_prf_input != NULL) { s->tlsext_opaque_prf_input_len = (size_t)larg; ret = 1; |