projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cut&paste error.
[openssl.git]
/
ssl
/
s3_lib.c
diff --git
a/ssl/s3_lib.c
b/ssl/s3_lib.c
index ab0d012b380650cb453bc2c59f8f76d0e5e76e4b..0d4317973bf3ddaa19dc66983ab41244aec6e477 100644
(file)
--- a/
ssl/s3_lib.c
+++ b/
ssl/s3_lib.c
@@
-57,20
+57,18
@@
*/
#include <stdio.h>
*/
#include <stdio.h>
-#include "objects.h"
+#include <openssl/md5.h>
+#include <openssl/sha.h>
+#include <openssl/objects.h>
#include "ssl_locl.h"
#include "ssl_locl.h"
-char *ssl3_version_str="SSLv3" OPENSSL_VERSION_PTEXT;
+c
onst c
har *ssl3_version_str="SSLv3" OPENSSL_VERSION_PTEXT;
#define SSL3_NUM_CIPHERS (sizeof(ssl3_ciphers)/sizeof(SSL_CIPHER))
#define SSL3_NUM_CIPHERS (sizeof(ssl3_ciphers)/sizeof(SSL_CIPHER))
-#ifndef NOPROTO
static long ssl3_default_timeout(void );
static long ssl3_default_timeout(void );
-#else
-static long ssl3_default_timeout();
-#endif
-SSL_CIPHER ssl3_ciphers[]={
+
GLOBAL
SSL_CIPHER ssl3_ciphers[]={
/* The RSA ciphers */
/* Cipher 01 */
{
/* The RSA ciphers */
/* Cipher 01 */
{
@@
-464,25
+462,24
@@
static SSL_METHOD SSLv3_data= {
&SSLv3_enc_data,
};
&SSLv3_enc_data,
};
-static long ssl3_default_timeout()
+static long ssl3_default_timeout(
void
)
{
/* 2 hours, the 24 hours mentioned in the SSLv3 spec
* is way too long for http, the cache would over fill */
return(60*60*2);
}
{
/* 2 hours, the 24 hours mentioned in the SSLv3 spec
* is way too long for http, the cache would over fill */
return(60*60*2);
}
-SSL_METHOD *sslv3_base_method()
+SSL_METHOD *sslv3_base_method(
void
)
{
return(&SSLv3_data);
}
{
return(&SSLv3_data);
}
-int ssl3_num_ciphers()
+int ssl3_num_ciphers(
void
)
{
return(SSL3_NUM_CIPHERS);
}
{
return(SSL3_NUM_CIPHERS);
}
-SSL_CIPHER *ssl3_get_cipher(u)
-unsigned int u;
+SSL_CIPHER *ssl3_get_cipher(unsigned int u)
{
if (u < SSL3_NUM_CIPHERS)
return(&(ssl3_ciphers[SSL3_NUM_CIPHERS-1-u]));
{
if (u < SSL3_NUM_CIPHERS)
return(&(ssl3_ciphers[SSL3_NUM_CIPHERS-1-u]));
@@
-491,14
+488,12
@@
unsigned int u;
}
/* The problem is that it may not be the correct record type */
}
/* The problem is that it may not be the correct record type */
-int ssl3_pending(s)
-SSL *s;
+int ssl3_pending(SSL *s)
{
return(s->s3->rrec.length);
}
{
return(s->s3->rrec.length);
}
-int ssl3_new(s)
-SSL *s;
+int ssl3_new(SSL *s)
{
SSL3_CTX *s3;
{
SSL3_CTX *s3;
@@
-520,8
+515,7
@@
err:
return(0);
}
return(0);
}
-void ssl3_free(s)
-SSL *s;
+void ssl3_free(SSL *s)
{
if(s == NULL)
return;
{
if(s == NULL)
return;
@@
-544,8
+538,7
@@
SSL *s;
s->s3=NULL;
}
s->s3=NULL;
}
-void ssl3_clear(s)
-SSL *s;
+void ssl3_clear(SSL *s)
{
unsigned char *rp,*wp;
{
unsigned char *rp,*wp;
@@
-576,11
+569,7
@@
SSL *s;
s->version=SSL3_VERSION;
}
s->version=SSL3_VERSION;
}
-long ssl3_ctrl(s,cmd,larg,parg)
-SSL *s;
-int cmd;
-long larg;
-char *parg;
+long ssl3_ctrl(SSL *s, int cmd, long larg, char *parg)
{
int ret=0;
{
int ret=0;
@@
-596,7
+585,7
@@
char *parg;
#endif
0)
{
#endif
0)
{
- if (!ssl_cert_inst
antiate(&s->cert, s->ctx->default_cert))
+ if (!ssl_cert_inst
(&s->cert))
{
SSLerr(SSL_F_SSL3_CTRL, ERR_R_MALLOC_FAILURE);
return(0);
{
SSLerr(SSL_F_SSL3_CTRL, ERR_R_MALLOC_FAILURE);
return(0);
@@
-649,11
+638,7
@@
char *parg;
}
break;
case SSL_CTRL_SET_TMP_RSA_CB:
}
break;
case SSL_CTRL_SET_TMP_RSA_CB:
-#ifndef NOPROTO
s->cert->rsa_tmp_cb = (RSA *(*)(SSL *, int, int))parg;
s->cert->rsa_tmp_cb = (RSA *(*)(SSL *, int, int))parg;
-#else
- s->cert->rsa_tmp_cb = (RSA *(*)())parg;
-#endif
break;
#endif
#ifndef NO_DH
break;
#endif
#ifndef NO_DH
@@
-680,11
+665,7
@@
char *parg;
}
break;
case SSL_CTRL_SET_TMP_DH_CB:
}
break;
case SSL_CTRL_SET_TMP_DH_CB:
-#ifndef NOPROTO
s->cert->dh_tmp_cb = (DH *(*)(SSL *, int, int))parg;
s->cert->dh_tmp_cb = (DH *(*)(SSL *, int, int))parg;
-#else
- s->cert->dh_tmp_cb = (DH *(*)())parg;
-#endif
break;
#endif
default:
break;
#endif
default:
@@
-693,15
+674,11
@@
char *parg;
return(ret);
}
return(ret);
}
-long ssl3_ctx_ctrl(ctx,cmd,larg,parg)
-SSL_CTX *ctx;
-int cmd;
-long larg;
-char *parg;
+long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, char *parg)
{
CERT *cert;
{
CERT *cert;
- cert=ctx->
default_
cert;
+ cert=ctx->cert;
switch (cmd)
{
switch (cmd)
{
@@
-744,11
+721,7
@@
char *parg;
}
/* break; */
case SSL_CTRL_SET_TMP_RSA_CB:
}
/* break; */
case SSL_CTRL_SET_TMP_RSA_CB:
-#ifndef NOPROTO
cert->rsa_tmp_cb=(RSA *(*)(SSL *, int, int))parg;
cert->rsa_tmp_cb=(RSA *(*)(SSL *, int, int))parg;
-#else
- cert->rsa_tmp_cb=(RSA *(*)())parg;
-#endif
break;
#endif
#ifndef NO_DH
break;
#endif
#ifndef NO_DH
@@
-775,11
+748,7
@@
char *parg;
}
/*break; */
case SSL_CTRL_SET_TMP_DH_CB:
}
/*break; */
case SSL_CTRL_SET_TMP_DH_CB:
-#ifndef NOPROTO
cert->dh_tmp_cb=(DH *(*)(SSL *, int, int))parg;
cert->dh_tmp_cb=(DH *(*)(SSL *, int, int))parg;
-#else
- cert->dh_tmp_cb=(DH *(*)())parg;
-#endif
break;
#endif
/* A Thawte special :-) */
break;
#endif
/* A Thawte special :-) */
@@
-800,8
+769,7
@@
char *parg;
/* This function needs to check if the ciphers required are actually
* available */
/* This function needs to check if the ciphers required are actually
* available */
-SSL_CIPHER *ssl3_get_cipher_by_char(p)
-const unsigned char *p;
+SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p)
{
static int init=1;
static SSL_CIPHER *sorted[SSL3_NUM_CIPHERS];
{
static int init=1;
static SSL_CIPHER *sorted[SSL3_NUM_CIPHERS];
@@
-811,7
+779,7
@@
const unsigned char *p;
if (init)
{
if (init)
{
-
init=0
;
+
CRYPTO_w_lock(CRYPTO_LOCK_SSL)
;
for (i=0; i<SSL3_NUM_CIPHERS; i++)
sorted[i]= &(ssl3_ciphers[i]);
for (i=0; i<SSL3_NUM_CIPHERS; i++)
sorted[i]= &(ssl3_ciphers[i]);
@@
-819,6
+787,10
@@
const unsigned char *p;
qsort( (char *)sorted,
SSL3_NUM_CIPHERS,sizeof(SSL_CIPHER *),
FP_ICC ssl_cipher_ptr_id_cmp);
qsort( (char *)sorted,
SSL3_NUM_CIPHERS,sizeof(SSL_CIPHER *),
FP_ICC ssl_cipher_ptr_id_cmp);
+
+ CRYPTO_w_unlock(CRYPTO_LOCK_SSL);
+
+ init=0;
}
id=0x03000000L|((unsigned long)p[0]<<8L)|(unsigned long)p[1];
}
id=0x03000000L|((unsigned long)p[0]<<8L)|(unsigned long)p[1];
@@
-833,9
+805,7
@@
const unsigned char *p;
return(*cpp);
}
return(*cpp);
}
-int ssl3_put_cipher_by_char(c,p)
-const SSL_CIPHER *c;
-unsigned char *p;
+int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p)
{
long l;
{
long l;
@@
-849,9
+819,7
@@
unsigned char *p;
return(2);
}
return(2);
}
-int ssl3_part_read(s,i)
-SSL *s;
-int i;
+int ssl3_part_read(SSL *s, int i)
{
s->rwstate=SSL_READING;
{
s->rwstate=SSL_READING;
@@
-866,21
+834,16
@@
int i;
}
}
}
}
-SSL_CIPHER *ssl3_choose_cipher(s,have,pref)
-SSL *s;
-STACK_OF(SSL_CIPHER) *have;
-STACK_OF(SSL_CIPHER) *pref;
+SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *have,
+ STACK_OF(SSL_CIPHER) *pref)
{
SSL_CIPHER *c,*ret=NULL;
int i,j,ok;
CERT *cert;
unsigned long alg,mask,emask;
{
SSL_CIPHER *c,*ret=NULL;
int i,j,ok;
CERT *cert;
unsigned long alg,mask,emask;
- /* Lets see which ciphers we can supported */
- if (s->cert != NULL)
- cert=s->cert;
- else
- cert=s->ctx->default_cert;
+ /* Let's see which ciphers we can support */
+ cert=s->cert;
sk_SSL_CIPHER_set_cmp_func(pref,ssl_cipher_ptr_id_cmp);
sk_SSL_CIPHER_set_cmp_func(pref,ssl_cipher_ptr_id_cmp);
@@
-897,7
+860,7
@@
STACK_OF(SSL_CIPHER) *pref;
{
c=sk_SSL_CIPHER_value(have,i);
{
c=sk_SSL_CIPHER_value(have,i);
- ssl_set_cert_masks(cert,
s->ctx->default_cert,
c);
+ ssl_set_cert_masks(cert,c);
mask=cert->mask;
emask=cert->export_mask;
mask=cert->mask;
emask=cert->export_mask;
@@
-931,9
+894,7
@@
STACK_OF(SSL_CIPHER) *pref;
return(ret);
}
return(ret);
}
-int ssl3_get_req_cert_type(s,p)
-SSL *s;
-unsigned char *p;
+int ssl3_get_req_cert_type(SSL *s, unsigned char *p)
{
int ret=0;
unsigned long alg;
{
int ret=0;
unsigned long alg;
@@
-970,8
+931,7
@@
unsigned char *p;
return(ret);
}
return(ret);
}
-int ssl3_shutdown(s)
-SSL *s;
+int ssl3_shutdown(SSL *s)
{
/* Don't do anything much if we have not done the handshake or
{
/* Don't do anything much if we have not done the handshake or
@@
-1011,10
+971,7
@@
SSL *s;
return(0);
}
return(0);
}
-int ssl3_write(s,buf,len)
-SSL *s;
-const char *buf;
-int len;
+int ssl3_write(SSL *s, const void *buf, int len)
{
int ret,n;
{
int ret,n;
@@
-1039,7
+996,7
@@
int len;
if (s->s3->delay_buf_pop_ret == 0)
{
ret=ssl3_write_bytes(s,SSL3_RT_APPLICATION_DATA,
if (s->s3->delay_buf_pop_ret == 0)
{
ret=ssl3_write_bytes(s,SSL3_RT_APPLICATION_DATA,
-
(char *)
buf,len);
+
buf,len);
if (ret <= 0) return(ret);
s->s3->delay_buf_pop_ret=ret;
if (ret <= 0) return(ret);
s->s3->delay_buf_pop_ret=ret;
@@
-1060,17
+1017,14
@@
int len;
else
{
ret=ssl3_write_bytes(s,SSL3_RT_APPLICATION_DATA,
else
{
ret=ssl3_write_bytes(s,SSL3_RT_APPLICATION_DATA,
-
(char *)
buf,len);
+
buf,len);
if (ret <= 0) return(ret);
}
return(ret);
}
if (ret <= 0) return(ret);
}
return(ret);
}
-int ssl3_read(s,buf,len)
-SSL *s;
-char *buf;
-int len;
+int ssl3_read(SSL *s, void *buf, int len)
{
int ret;
{
int ret;
@@
-1092,10
+1046,7
@@
int len;
return(ret);
}
return(ret);
}
-int ssl3_peek(s,buf,len)
-SSL *s;
-char *buf;
-int len;
+int ssl3_peek(SSL *s, char *buf, int len)
{
SSL3_RECORD *rr;
int n;
{
SSL3_RECORD *rr;
int n;
@@
-1117,8
+1068,7
@@
int len;
return(n);
}
return(n);
}
-int ssl3_renegotiate(s)
-SSL *s;
+int ssl3_renegotiate(SSL *s)
{
if (s->handshake_func == NULL)
return(1);
{
if (s->handshake_func == NULL)
return(1);
@@
-1130,8
+1080,7
@@
SSL *s;
return(1);
}
return(1);
}
-int ssl3_renegotiate_check(s)
-SSL *s;
+int ssl3_renegotiate_check(SSL *s)
{
int ret=0;
{
int ret=0;