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:
cf900cb
)
Fix whitespace nit in ssl_generate_master_secret()
author
Benjamin Kaduk
<bkaduk@akamai.com>
Fri, 24 Jan 2020 21:25:02 +0000
(13:25 -0800)
committer
Benjamin Kaduk
<kaduk@mit.edu>
Fri, 13 Mar 2020 22:55:50 +0000
(15:55 -0700)
Use a space after a comma.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10943)
(cherry picked from commit
1866a0d380fc361d9be2ca0509de0f2281505db5
)
ssl/s3_lib.c
patch
|
blob
|
history
diff --git
a/ssl/s3_lib.c
b/ssl/s3_lib.c
index 0cb3e8ccd3349d271aeb1d72d56809f8cc89a31f..dc44fa5c4bf0314ef6691c6f9b43f2547758e915 100644
(file)
--- a/
ssl/s3_lib.c
+++ b/
ssl/s3_lib.c
@@
-4639,7
+4639,7
@@
int ssl_generate_master_secret(SSL *s, unsigned char *pms, size_t pmslen,
OPENSSL_clear_free(s->s3->tmp.psk, psklen);
s->s3->tmp.psk = NULL;
if (!s->method->ssl3_enc->generate_master_secret(s,
- s->session->master_key,pskpms, pskpmslen,
+ s->session->master_key,
pskpms, pskpmslen,
&s->session->master_key_length)) {
OPENSSL_clear_free(pskpms, pskpmslen);
/* SSLfatal() already called */