wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

"extern" is a C++ reserved word.

Browse source 
Pointed out by: Janez Jere <jj@void.si>
This commit is contained in:
Ulf Möller 1999-06-09 16:33:18 +00:00
parent 4e6ec1da04
commit df63a389a5
6 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/s_server.c
View file

@ -93,7 +93,7 @@ typedef unsigned int u_int;
#endif #endif
#ifndef NO_RSA #ifndef NO_RSA
static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int export,int keylength); static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength);
#endif #endif
static int sv_body(char *hostname, int s, unsigned char *context); static int sv_body(char *hostname, int s, unsigned char *context);
static int www_body(char *hostname, int s, unsigned char *context); static int www_body(char *hostname, int s, unsigned char *context);
@ -1394,7 +1394,7 @@ err:
} }
#ifndef NO_RSA #ifndef NO_RSA
static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int export, int keylength) static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength)
{ {
static RSA *rsa_tmp=NULL; static RSA *rsa_tmp=NULL;

18
ssl/s2_srvr.c
View file

@ -321,7 +321,7 @@ end:
static int get_client_master_key(SSL *s) static int get_client_master_key(SSL *s)
{ {
int export,i,n,keya,ek; int is_export,i,n,keya,ek;
unsigned char *p; unsigned char *p;
SSL_CIPHER *cp; SSL_CIPHER *cp;
const EVP_CIPHER *c; const EVP_CIPHER *c;
@ -385,7 +385,7 @@ static int get_client_master_key(SSL *s)
&(p[s->s2->tmp.clear]),&(p[s->s2->tmp.clear]), &(p[s->s2->tmp.clear]),&(p[s->s2->tmp.clear]),
(s->s2->ssl2_rollback)?RSA_SSLV23_PADDING:RSA_PKCS1_PADDING); (s->s2->ssl2_rollback)?RSA_SSLV23_PADDING:RSA_PKCS1_PADDING);
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))
{ {
@ -396,7 +396,7 @@ static int get_client_master_key(SSL *s)
if (s->session->cipher->algorithm2 & SSL2_CF_8_BYTE_ENC) if (s->session->cipher->algorithm2 & SSL2_CF_8_BYTE_ENC)
{ {
export=1; is_export=1;
ek=8; ek=8;
} }
else else
@ -407,11 +407,11 @@ static int get_client_master_key(SSL *s)
/* If a bad decrypt, continue with protocol but with a /* If a bad decrypt, continue with protocol but with a
* dud master secret */ * dud master secret */
if ((i < 0) || if ((i < 0) ||
((!export && (i != EVP_CIPHER_key_length(c))) ((!is_export && (i != EVP_CIPHER_key_length(c)))
|| ( export && ((i != ek) || (s->s2->tmp.clear+i != || (is_export && ((i != ek) || (s->s2->tmp.clear+i !=
EVP_CIPHER_key_length(c)))))) EVP_CIPHER_key_length(c))))))
{ {
if (export) if (is_export)
i=ek; i=ek;
else else
i=EVP_CIPHER_key_length(c); i=EVP_CIPHER_key_length(c);
@ -424,8 +424,8 @@ static int get_client_master_key(SSL *s)
SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_BAD_RSA_DECRYPT); SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_BAD_RSA_DECRYPT);
} }
/* incorrect number of key bytes for non export cipher */ /* incorrect number of key bytes for non export cipher */
else if ((!export && (i != EVP_CIPHER_key_length(c))) else if ((!is_export && (i != EVP_CIPHER_key_length(c)))
|| ( export && ((i != ek) || (s->s2->tmp.clear+i != || (is_export && ((i != ek) || (s->s2->tmp.clear+i !=
EVP_CIPHER_key_length(c))))) EVP_CIPHER_key_length(c)))))
{ {
error=1; error=1;
@ -438,7 +438,7 @@ static int get_client_master_key(SSL *s)
} }
#endif #endif
if (export) i+=s->s2->tmp.clear; if (is_export) i+=s->s2->tmp.clear;
s->session->master_key_length=i; s->session->master_key_length=i;
memcpy(s->session->master_key,p,(unsigned int)i); memcpy(s->session->master_key,p,(unsigned int)i);
return(1); return(1);

12
ssl/ssl.h
View file

@ -1084,21 +1084,23 @@ int SSL_get_ex_data_X509_STORE_CTX_idx(void );
#define SSL_CTX_set_read_ahead(ctx,m) \ #define SSL_CTX_set_read_ahead(ctx,m) \
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_READ_AHEAD,0,NULL) SSL_CTX_ctrl(ctx,SSL_CTRL_SET_READ_AHEAD,0,NULL)
/* NB: the keylength is only applicable when export is true */ /* NB: the keylength is only applicable when is_export is true */
#ifndef NO_RSA #ifndef NO_RSA
void SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx, void SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx,
RSA *(*cb)(SSL *ssl,int export, RSA *(*cb)(SSL *ssl,int is_export,
int keylength)); int keylength));
void SSL_set_tmp_rsa_callback(SSL *ssl, void SSL_set_tmp_rsa_callback(SSL *ssl,
RSA *(*cb)(SSL *ssl,int export, RSA *(*cb)(SSL *ssl,int is_export,
int keylength)); int keylength));
#endif #endif
#ifndef NO_DH #ifndef NO_DH
void SSL_CTX_set_tmp_dh_callback(SSL_CTX *ctx, void SSL_CTX_set_tmp_dh_callback(SSL_CTX *ctx,
DH *(*dh)(SSL *ssl,int export,int keylength)); DH *(*dh)(SSL *ssl,int is_export,
int keylength));
void SSL_set_tmp_dh_callback(SSL *ssl, void SSL_set_tmp_dh_callback(SSL *ssl,
DH *(*dh)(SSL *ssl,int export,int keylength)); DH *(*dh)(SSL *ssl,int is_export,
int keylength));
#endif #endif
#ifdef HEADER_COMP_H #ifdef HEADER_COMP_H

23
ssl/ssl_lib.c
View file

@ -1250,13 +1250,13 @@ X509 *ssl_get_server_send_cert(SSL *s)
{ {
unsigned long alg,mask,kalg; unsigned long alg,mask,kalg;
CERT *c; CERT *c;
int i,export; int i,is_export;
c=s->cert; c=s->cert;
ssl_set_cert_masks(c, s->s3->tmp.new_cipher); ssl_set_cert_masks(c, s->s3->tmp.new_cipher);
alg=s->s3->tmp.new_cipher->algorithms; alg=s->s3->tmp.new_cipher->algorithms;
export=SSL_IS_EXPORT(alg); is_export=SSL_IS_EXPORT(alg);
mask=export?c->export_mask:c->mask; mask=is_export?c->export_mask:c->mask;
kalg=alg&(SSL_MKEY_MASK|SSL_AUTH_MASK); kalg=alg&(SSL_MKEY_MASK|SSL_AUTH_MASK);
if (kalg & SSL_kDHr) if (kalg & SSL_kDHr)
@ -1877,13 +1877,14 @@ int SSL_want(SSL *s)
*/ */
#ifndef NO_RSA #ifndef NO_RSA
void SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx,RSA *(*cb)(SSL *ssl,int export, void SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx,RSA *(*cb)(SSL *ssl,
int is_export,
int keylength)) int keylength))
{ SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_RSA_CB,0,(char *)cb); } { SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_RSA_CB,0,(char *)cb); }
#endif #endif
#ifndef NO_RSA #ifndef NO_RSA
void SSL_set_tmp_rsa_callback(SSL *ssl,RSA *(*cb)(SSL *ssl,int export, void SSL_set_tmp_rsa_callback(SSL *ssl,RSA *(*cb)(SSL *ssl,int is_export,
int keylength)) int keylength))
{ SSL_ctrl(ssl,SSL_CTRL_SET_TMP_RSA_CB,0,(char *)cb); } { SSL_ctrl(ssl,SSL_CTRL_SET_TMP_RSA_CB,0,(char *)cb); }
#endif #endif
@ -1892,14 +1893,14 @@ void SSL_set_tmp_rsa_callback(SSL *ssl,RSA *(*cb)(SSL *ssl,int export,
/*! /*!
* \brief The RSA temporary key callback function. * \brief The RSA temporary key callback function.
* \param ssl the SSL session. * \param ssl the SSL session.
* \param export \c TRUE if the temp RSA key is for an export ciphersuite. * \param is_export \c TRUE if the temp RSA key is for an export ciphersuite.
* \param keylength if \c export is \c TRUE, then \c keylength is the size of * \param keylength if \c is_export is \c TRUE, then \c keylength is the size
* the required key in bits. * of the required key in bits.
* \return the temporary RSA key. * \return the temporary RSA key.
* \sa SSL_CTX_set_tmp_rsa_callback, SSL_set_tmp_rsa_callback * \sa SSL_CTX_set_tmp_rsa_callback, SSL_set_tmp_rsa_callback
*/ */
RSA *cb(SSL *ssl,int export,int keylength) RSA *cb(SSL *ssl,int is_export,int keylength)
{} {}
#endif #endif
@ -1910,11 +1911,11 @@ RSA *cb(SSL *ssl,int export,int keylength)
*/ */
#ifndef NO_DH #ifndef NO_DH
void SSL_CTX_set_tmp_dh_callback(SSL_CTX *ctx,DH *(*dh)(SSL *ssl,int export, void SSL_CTX_set_tmp_dh_callback(SSL_CTX *ctx,DH *(*dh)(SSL *ssl,int is_export,
int keylength)) int keylength))
{ SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_DH_CB,0,(char *)dh); } { SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_DH_CB,0,(char *)dh); }
void SSL_set_tmp_dh_callback(SSL *ssl,DH *(*dh)(SSL *ssl,int export, void SSL_set_tmp_dh_callback(SSL *ssl,DH *(*dh)(SSL *ssl,int is_export,
int keylength)) int keylength))
{ SSL_ctrl(ssl,SSL_CTRL_SET_TMP_DH_CB,0,(char *)dh); } { SSL_ctrl(ssl,SSL_CTRL_SET_TMP_DH_CB,0,(char *)dh); }
#endif #endif

4
ssl/ssl_locl.h
View file

@ -264,11 +264,11 @@ typedef struct cert_st
unsigned long export_mask; unsigned long export_mask;
#ifndef NO_RSA #ifndef NO_RSA
RSA *rsa_tmp; RSA *rsa_tmp;
RSA *(*rsa_tmp_cb)(SSL *ssl,int export,int keysize); RSA *(*rsa_tmp_cb)(SSL *ssl,int is_export,int keysize);
#endif #endif
#ifndef NO_DH #ifndef NO_DH
DH *dh_tmp; DH *dh_tmp;
DH *(*dh_tmp_cb)(SSL *ssl,int export,int keysize); DH *(*dh_tmp_cb)(SSL *ssl,int is_export,int keysize);
#endif #endif
CERT_PKEY pkeys[SSL_PKEY_NUM]; CERT_PKEY pkeys[SSL_PKEY_NUM];

4
ssl/ssltest.c
View file

@ -86,7 +86,7 @@
int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx); int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
#ifndef NO_RSA #ifndef NO_RSA
static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int export,int keylength); static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export,int keylength);
#endif #endif
#ifndef NO_DH #ifndef NO_DH
static DH *get_dh512(void); static DH *get_dh512(void);
@ -724,7 +724,7 @@ static DH *get_dh512(void)
#endif #endif
#ifndef NO_RSA #ifndef NO_RSA
static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int export, int keylength) static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength)
{ {
static RSA *rsa_tmp=NULL; static RSA *rsa_tmp=NULL;