projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OPENSSL_NO_TLS1 WIN32 build support. Fix so normal build works again.
[openssl.git]
/
ssl
/
s2_srvr.c
diff --git
a/ssl/s2_srvr.c
b/ssl/s2_srvr.c
index f0a1d4c3a94795246cebd6565aa079ad13433c59..fa21d6fe68a80c0917af252d6979b66ce43784e1 100644
(file)
--- a/
ssl/s2_srvr.c
+++ b/
ssl/s2_srvr.c
@@
-144,7
+144,7
@@
IMPLEMENT_ssl2_meth_func(SSLv2_server_method,
int ssl2_accept(SSL *s)
{
int ssl2_accept(SSL *s)
{
- unsigned long l=time(NULL);
+ unsigned long l=
(unsigned long)
time(NULL);
BUF_MEM *buf=NULL;
int ret= -1;
long num1;
BUF_MEM *buf=NULL;
int ret= -1;
long num1;
@@
-451,7
+451,7
@@
static int get_client_master_key(SSL *s)
is_export=SSL_C_IS_EXPORT(s->session->cipher);
is_export=SSL_C_IS_EXPORT(s->session->cipher);
- if (!ssl_cipher_get_evp(s->session,&c,&md,NULL))
+ if (!ssl_cipher_get_evp(s->session,&c,&md,NULL
,NULL,NULL
))
{
ssl2_return_error(s,SSL2_PE_NO_CIPHER);
SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS);
{
ssl2_return_error(s,SSL2_PE_NO_CIPHER);
SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS);
@@
-607,7
+607,7
@@
static int get_client_hello(SSL *s)
else
{
i=ssl_get_prev_session(s,&(p[s->s2->tmp.cipher_spec_length]),
else
{
i=ssl_get_prev_session(s,&(p[s->s2->tmp.cipher_spec_length]),
- s->s2->tmp.session_id_length);
+ s->s2->tmp.session_id_length
, NULL
);
if (i == 1)
{ /* previous session */
s->hit=1;
if (i == 1)
{ /* previous session */
s->hit=1;