projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for Win32 build.
[openssl.git]
/
ssl
/
s2_lib.c
diff --git
a/ssl/s2_lib.c
b/ssl/s2_lib.c
index 8954bc36627f8129e5020ddcf4a6a4379ebde58e..129ed89d970448a84cefd0b3fcff9423f0186917 100644
(file)
--- a/
ssl/s2_lib.c
+++ b/
ssl/s2_lib.c
@@
-230,6
+230,9
@@
static SSL_METHOD SSLv2_data= {
ssl_bad_method,
ssl2_default_timeout,
&ssl3_undef_enc_method,
ssl_bad_method,
ssl2_default_timeout,
&ssl3_undef_enc_method,
+ ssl_undefined_function,
+ ssl2_callback_ctrl, /* local */
+ ssl2_ctx_callback_ctrl, /* local */
};
static long ssl2_default_timeout(void)
};
static long ssl2_default_timeout(void)
@@
-262,14
+265,14
@@
int ssl2_pending(SSL *s)
int ssl2_new(SSL *s)
{
int ssl2_new(SSL *s)
{
- SSL2_
CTX
*s2;
+ SSL2_
STATE
*s2;
- if ((s2=
(SSL2_CTX *)Malloc(sizeof(SSL2_CTX)
)) == NULL) goto err;
- memset(s2,0,sizeof
(SSL2_CTX)
);
+ if ((s2=
OPENSSL_malloc(sizeof *s2
)) == NULL) goto err;
+ memset(s2,0,sizeof
*s2
);
- if ((s2->rbuf=
(unsigned char *)M
alloc(
+ if ((s2->rbuf=
OPENSSL_m
alloc(
SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER+2)) == NULL) goto err;
SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER+2)) == NULL) goto err;
- if ((s2->wbuf=
(unsigned char *)M
alloc(
+ if ((s2->wbuf=
OPENSSL_m
alloc(
SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER+2)) == NULL) goto err;
s->s2=s2;
SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER+2)) == NULL) goto err;
s->s2=s2;
@@
-278,31
+281,31
@@
int ssl2_new(SSL *s)
err:
if (s2 != NULL)
{
err:
if (s2 != NULL)
{
- if (s2->wbuf != NULL)
F
ree(s2->wbuf);
- if (s2->rbuf != NULL)
F
ree(s2->rbuf);
-
F
ree(s2);
+ if (s2->wbuf != NULL)
OPENSSL_f
ree(s2->wbuf);
+ if (s2->rbuf != NULL)
OPENSSL_f
ree(s2->rbuf);
+
OPENSSL_f
ree(s2);
}
return(0);
}
void ssl2_free(SSL *s)
{
}
return(0);
}
void ssl2_free(SSL *s)
{
- SSL2_
CTX
*s2;
+ SSL2_
STATE
*s2;
if(s == NULL)
return;
s2=s->s2;
if(s == NULL)
return;
s2=s->s2;
- if (s2->rbuf != NULL)
F
ree(s2->rbuf);
- if (s2->wbuf != NULL)
F
ree(s2->wbuf);
- memset(s2,0,sizeof
(SSL2_CTX)
);
-
F
ree(s2);
+ if (s2->rbuf != NULL)
OPENSSL_f
ree(s2->rbuf);
+ if (s2->wbuf != NULL)
OPENSSL_f
ree(s2->wbuf);
+ memset(s2,0,sizeof
*s2
);
+
OPENSSL_f
ree(s2);
s->s2=NULL;
}
void ssl2_clear(SSL *s)
{
s->s2=NULL;
}
void ssl2_clear(SSL *s)
{
- SSL2_
CTX
*s2;
+ SSL2_
STATE
*s2;
unsigned char *rbuf,*wbuf;
s2=s->s2;
unsigned char *rbuf,*wbuf;
s2=s->s2;
@@
-310,7
+313,7
@@
void ssl2_clear(SSL *s)
rbuf=s2->rbuf;
wbuf=s2->wbuf;
rbuf=s2->rbuf;
wbuf=s2->wbuf;
- memset(s2,0,sizeof
(SSL2_CTX)
);
+ memset(s2,0,sizeof
*s2
);
s2->rbuf=rbuf;
s2->wbuf=wbuf;
s2->rbuf=rbuf;
s2->wbuf=wbuf;
@@
-335,11
+338,21
@@
long ssl2_ctrl(SSL *s, int cmd, long larg, char *parg)
return(ret);
}
return(ret);
}
+long ssl2_callback_ctrl(SSL *s, int cmd, void (*fp)())
+ {
+ return(0);
+ }
+
long ssl2_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, char *parg)
{
return(0);
}
long ssl2_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, char *parg)
{
return(0);
}
+long ssl2_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)())
+ {
+ return(0);
+ }
+
/* This function needs to check if the ciphers required are actually
* available */
SSL_CIPHER *ssl2_get_cipher_by_char(const unsigned char *p)
/* This function needs to check if the ciphers required are actually
* available */
SSL_CIPHER *ssl2_get_cipher_by_char(const unsigned char *p)
@@
-371,7
+384,7
@@
SSL_CIPHER *ssl2_get_cipher_by_char(const unsigned char *p)
cpp=(SSL_CIPHER **)OBJ_bsearch((char *)&cp,
(char *)sorted,
SSL2_NUM_CIPHERS,sizeof(SSL_CIPHER *),
cpp=(SSL_CIPHER **)OBJ_bsearch((char *)&cp,
(char *)sorted,
SSL2_NUM_CIPHERS,sizeof(SSL_CIPHER *),
-
(int (*)())
ssl_cipher_ptr_id_cmp);
+
FP_ICC
ssl_cipher_ptr_id_cmp);
if ((cpp == NULL) || !(*cpp)->valid)
return(NULL);
else
if ((cpp == NULL) || !(*cpp)->valid)
return(NULL);
else
@@
-411,7
+424,7
@@
void ssl2_generate_key_material(SSL *s)
MD5_Init(&ctx);
MD5_Update(&ctx,s->session->master_key,s->session->master_key_length);
MD5_Init(&ctx);
MD5_Update(&ctx,s->session->master_key,s->session->master_key_length);
- MD5_Update(&ctx,
(unsigned char *)
&c,1);
+ MD5_Update(&ctx,&c,1);
c++;
MD5_Update(&ctx,s->s2->challenge,s->s2->challenge_length);
MD5_Update(&ctx,s->s2->conn_id,s->s2->conn_id_length);
c++;
MD5_Update(&ctx,s->s2->challenge,s->s2->challenge_length);
MD5_Update(&ctx,s->s2->conn_id,s->s2->conn_id_length);