"extern" is a C++ reserved word. (df63a389) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

apps/s_server.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ typedef unsigned int u_int;
		#endif

		#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
		static int sv_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
		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;

ssl/s2_srvr.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -321,7 +321,7 @@ end:

		static int get_client_master_key(SSL *s)
		{
		int export,i,n,keya,ek;
		int is_export,i,n,keya,ek;
		unsigned char *p;
		SSL_CIPHER *cp;
		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]),
		(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))
		{
		@@ -396,7 +396,7 @@ static int get_client_master_key(SSL *s)

		if (s->session->cipher->algorithm2 & SSL2_CF_8_BYTE_ENC)
		{
		export=1;
		is_export=1;
		ek=8;
		}
		else
		@@ -407,11 +407,11 @@ static int get_client_master_key(SSL *s)
		/* If a bad decrypt, continue with protocol but with a
		* dud master secret */
		if ((i < 0) \|\|
		((!export && (i != EVP_CIPHER_key_length(c)))
		\|\| ( export && ((i != ek) \|\| (s->s2->tmp.clear+i !=
		((!is_export && (i != EVP_CIPHER_key_length(c)))
		\|\| (is_export && ((i != ek) \|\| (s->s2->tmp.clear+i !=
		EVP_CIPHER_key_length(c))))))
		{
		if (export)
		if (is_export)
		i=ek;
		else
		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);
		}
		/* incorrect number of key bytes for non export cipher */
		else if ((!export && (i != EVP_CIPHER_key_length(c)))
		\|\| ( export && ((i != ek) \|\| (s->s2->tmp.clear+i !=
		else if ((!is_export && (i != EVP_CIPHER_key_length(c)))
		\|\| (is_export && ((i != ek) \|\| (s->s2->tmp.clear+i !=
		EVP_CIPHER_key_length(c)))))
		{
		error=1;
		@@ -438,7 +438,7 @@ static int get_client_master_key(SSL *s)
		}
		#endif

		if (export) i+=s->s2->tmp.clear;
		if (is_export) i+=s->s2->tmp.clear;
		s->session->master_key_length=i;
		memcpy(s->session->master_key,p,(unsigned int)i);
		return(1);

ssl/ssl.h

+7 −5

Original line number	Diff line number	Diff line
		@@ -1084,21 +1084,23 @@ int SSL_get_ex_data_X509_STORE_CTX_idx(void );
		#define SSL_CTX_set_read_ahead(ctx,m) \
		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
		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));

		void SSL_set_tmp_rsa_callback(SSL *ssl,
		RSA (cb)(SSL *ssl,int export,
		RSA (cb)(SSL *ssl,int is_export,
		int keylength));
		#endif
		#ifndef NO_DH
		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,
		DH (dh)(SSL *ssl,int export,int keylength));
		DH (dh)(SSL *ssl,int is_export,
		int keylength));
		#endif

		#ifdef HEADER_COMP_H

ssl/ssl_lib.c

+12 −11

Original line number	Diff line number	Diff line
		@@ -1250,13 +1250,13 @@ X509 ssl_get_server_send_cert(SSL s)
		{
		unsigned long alg,mask,kalg;
		CERT *c;
		int i,export;
		int i,is_export;

		c=s->cert;
		ssl_set_cert_masks(c, s->s3->tmp.new_cipher);
		alg=s->s3->tmp.new_cipher->algorithms;
		export=SSL_IS_EXPORT(alg);
		mask=export?c->export_mask:c->mask;
		is_export=SSL_IS_EXPORT(alg);
		mask=is_export?c->export_mask:c->mask;
		kalg=alg&(SSL_MKEY_MASK\|SSL_AUTH_MASK);

		if (kalg & SSL_kDHr)
		@@ -1877,13 +1877,14 @@ int SSL_want(SSL *s)
		*/

		#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))
		{ SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_RSA_CB,0,(char *)cb); }
		#endif

		#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))
		{ SSL_ctrl(ssl,SSL_CTRL_SET_TMP_RSA_CB,0,(char *)cb); }
		#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.
		* \param ssl the SSL session.
		* \param 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
		* the required key in bits.
		* \param is_export \c TRUE if the temp RSA key is for an export ciphersuite.
		* \param keylength if \c is_export is \c TRUE, then \c keylength is the size
		* of the required key in bits.
		* \return the temporary RSA key.
		* \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

		@@ -1910,11 +1911,11 @@ RSA cb(SSL ssl,int export,int keylength)
		*/

		#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))
		{ 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))
		{ SSL_ctrl(ssl,SSL_CTRL_SET_TMP_DH_CB,0,(char *)dh); }
		#endif

ssl/ssl_locl.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -264,11 +264,11 @@ typedef struct cert_st
		unsigned long export_mask;
		#ifndef NO_RSA
		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
		#ifndef NO_DH
		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

		CERT_PKEY pkeys[SSL_PKEY_NUM];