diff options
| author | marha <marha@users.sourceforge.net> | 2015-04-20 23:05:23 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-04-20 23:05:23 +0200 |
| commit | 0f7871ff824bcf064db3ab6bdfe26645ba6c8087 (patch) | |
| tree | 90d3d2b6112e083289c9cf68146852087814f6d3 /openssl/ssl/s2_lib.c | |
| parent | 934184bfecd402aae891b8740d788b486aa7269f (diff) | |
| parent | 2a00e489122f6c4b525090dbdba2855a2ea2d519 (diff) | |
| download | vcxsrv-0f7871ff824bcf064db3ab6bdfe26645ba6c8087.tar.gz vcxsrv-0f7871ff824bcf064db3ab6bdfe26645ba6c8087.tar.bz2 vcxsrv-0f7871ff824bcf064db3ab6bdfe26645ba6c8087.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
Diffstat (limited to 'openssl/ssl/s2_lib.c')
| -rw-r--r-- | openssl/ssl/s2_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/ssl/s2_lib.c b/openssl/ssl/s2_lib.c index f8a943930..d55b93f76 100644 --- a/openssl/ssl/s2_lib.c +++ b/openssl/ssl/s2_lib.c @@ -493,7 +493,7 @@ int ssl2_generate_key_material(SSL *s) OPENSSL_assert(s->session->master_key_length >= 0 && s->session->master_key_length - < (int)sizeof(s->session->master_key)); + <= (int)sizeof(s->session->master_key)); EVP_DigestUpdate(&ctx, s->session->master_key, s->session->master_key_length); EVP_DigestUpdate(&ctx, &c, 1); |