Commit 484f8762 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add new "valid_flags" field to CERT_PKEY structure which determines what 

the certificate can be used for (if anything). Set valid_flags field
in new tls1_check_chain function. Simplify ssl_set_cert_masks which used
to have similar checks in it.

Add new "cert_flags" field to CERT structure and include a "strict mode".
This enforces some TLS certificate requirements (such as only permitting
certificate signature algorithms contained in the supported algorithms
extension) which some implementations ignore: this option should be used
with caution as it could cause interoperability issues.
(backport from HEAD)
parent c70a1fee

CHANGES

+12 −0
Original line number Diff line number Diff line
@@ -4,6 +4,18 @@ 


 Changes between 1.0.1 and 1.0.2 [xx XXX xxxx]



  *) Add new "valid_flags" field to CERT_PKEY structure which determines what

     the certificate can be used for (if anything). Set valid_flags field 

     in new tls1_check_chain function. Simplify ssl_set_cert_masks which used

     to have similar checks in it.



     Add new "cert_flags" field to CERT structure and include a "strict mode".

     This enforces some TLS certificate requirements (such as only permitting

     certificate signature algorithms contained in the supported algorithms

     extension) which some implementations ignore: this option should be used

     with caution as it could cause interoperability issues.

     [Steve Henson]



  *) Update and tidy signature algorithm extension processing. Work out

     shared signature algorithms based on preferences and peer algorithms

     and print them out in s_client and s_server. Abort handshake if no

apps/s_server.c

+5 −0
Original line number Diff line number Diff line
@@ -949,6 +949,7 @@ int MAIN(int argc, char *argv[]) 
	int badop=0,bugs=0;

	int ret=1;

	int off=0;

	int cert_flags = 0;

	int no_tmp_rsa=0,no_dhe=0,no_ecdhe=0,nocert=0;

	int state=0;

	const SSL_METHOD *meth=NULL;
@@ -1373,6 +1374,8 @@ int MAIN(int argc, char *argv[]) 
			keymatexportlen=atoi(*(++argv));

			if (keymatexportlen == 0) goto bad;

			}

		else if (strcmp(*argv, "-cert_strict") == 0)

			cert_flags |= SSL_CERT_FLAG_TLS_STRICT;

		else

			{

			BIO_printf(bio_err,"unknown option %s\n",*argv);
@@ -1590,6 +1593,7 @@ bad: 
	if (bugs) SSL_CTX_set_options(ctx,SSL_OP_ALL);

	if (hack) SSL_CTX_set_options(ctx,SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG);

	SSL_CTX_set_options(ctx,off);

	if (cert_flags) SSL_CTX_set_cert_flags(ctx, cert_flags);

	/* DTLS: partial reads end up discarding unread UDP bytes :-( 

	 * Setting read ahead solves this problem.

	 */
@@ -1661,6 +1665,7 @@ bad: 
		if (bugs) SSL_CTX_set_options(ctx2,SSL_OP_ALL);

		if (hack) SSL_CTX_set_options(ctx2,SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG);

		SSL_CTX_set_options(ctx2,off);

		if (cert_flags) SSL_CTX_set_cert_flags(ctx2, cert_flags);

		/* DTLS: partial reads end up discarding unread UDP bytes :-( 

		 * Setting read ahead solves this problem.

		 */

ssl/s3_lib.c

+2 −0
Original line number Diff line number Diff line
@@ -3911,6 +3911,8 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt, 
		allow = srvr;

		}



	tls1_set_cert_validity(s);



	for (i=0; i<sk_SSL_CIPHER_num(prio); i++)

		{

		c=sk_SSL_CIPHER_value(prio,i);

ssl/ssl.h

+17 −0
Original line number Diff line number Diff line
@@ -650,6 +650,12 @@ struct ssl_session_st 
 * or just freed (depending on the context's setting for freelist_max_len). */

#define SSL_MODE_RELEASE_BUFFERS 0x00000010L



/* Cert related flags */

/* Many implementations ignore some aspects of the TLS standards such as

 * enforcing certifcate chain algorithms. When this is set we enforce them.

 */

#define SSL_CERT_FLAG_TLS_STRICT	0x00000001L



/* Note: SSL[_CTX]_set_{options,mode} use |= op on the previous value,

 * they cannot be used to clear bits. */
@@ -689,6 +695,15 @@ struct ssl_session_st 
        SSL_ctrl((ssl),SSL_CTRL_TLS_EXT_SEND_HEARTBEAT,0,NULL)

#endif



#define SSL_CTX_set_cert_flags(ctx,op) \

	SSL_CTX_ctrl((ctx),SSL_CTRL_CERT_FLAGS,(op),NULL)

#define SSL_set_cert_flags(s,op) \

	SSL_ctrl((s),SSL_CTRL_CERT_FLAGS,(op),NULL)

#define SSL_CTX_clear_cert_flags(ctx,op) \

	SSL_CTX_ctrl((ctx),SSL_CTRL_CLEAR_CERT_FLAGS,(op),NULL)

#define SSL_clear_cert_flags(s,op) \

	SSL_ctrl((s),SSL_CTRL_CLEAR_CERT_FLAGS,(op),NULL)



void SSL_CTX_set_msg_callback(SSL_CTX *ctx, void (*cb)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg));

void SSL_set_msg_callback(SSL *ssl, void (*cb)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg));

#define SSL_CTX_set_msg_callback_arg(ctx, arg) SSL_CTX_ctrl((ctx), SSL_CTRL_SET_MSG_CALLBACK_ARG, 0, (arg))
@@ -1636,6 +1651,8 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION) 
#define SSL_CTRL_SET_ECDH_AUTO			94

#define SSL_CTRL_SET_SIGALGS			97

#define SSL_CTRL_SET_SIGALGS_LIST		98

#define SSL_CTRL_CERT_FLAGS			99

#define SSL_CTRL_CLEAR_CERT_FLAGS		100



#define DTLSv1_get_timeout(ssl, arg) \

	SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)arg)

ssl/ssl_cert.c

+4 −0
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ CERT *ssl_cert_dup(CERT *cert) 
				CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);

				}

			}

		rpk->valid_flags = 0;

                if (cert->pkeys[i].authz != NULL)

			{

			/* Just copy everything. */
@@ -376,6 +377,8 @@ CERT *ssl_cert_dup(CERT *cert) 
	/* Shared sigalgs also NULL */

	ret->shared_sigalgs = NULL;



	ret->cert_flags = cert->cert_flags;



	return(ret);

	

#if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_ECDH)
@@ -428,6 +431,7 @@ void ssl_cert_clear_certs(CERT *c) 
                if (cpk->authz != NULL)

			OPENSSL_free(cpk->authz);

#endif

		cpk->valid_flags = 0;

		}

	}