Commit 5a32dd89 authored by Scott Deboy's avatar Scott Deboy
Browse files

Don't break out of the custom extension callback loop - continue instead 

The contract for custom extension callbacks has changed - all custom extension callbacks are triggered
parent 130ebe34

ssl/ssltest.c

+3 −6
Original line number Diff line number Diff line
@@ -501,8 +501,7 @@ static int custom_ext_0_cli_second_cb(SSL *s, unsigned short ext_type, 
				      unsigned short inlen, int *al,

				      void *arg)

	{

	custom_ext_error = 1; /* Shouldn't be called */

	return 0;

	return 1;

	}



static int custom_ext_1_cli_first_cb(SSL *s, unsigned short ext_type,
@@ -521,8 +520,7 @@ static int custom_ext_1_cli_second_cb(SSL *s, unsigned short ext_type, 
				      unsigned short inlen, int *al,

				      void *arg)

	{

	custom_ext_error = 1; /* Shouldn't be called */

	return 0;

	return 1;

	}



static int custom_ext_2_cli_first_cb(SSL *s, unsigned short ext_type,
@@ -579,8 +577,7 @@ static int custom_ext_0_srv_first_cb(SSL *s, unsigned short ext_type, 
				     unsigned short inlen, int *al,

				     void *arg)

	{

	custom_ext_error = 1;

	return 0; /* Shouldn't be called */

	return 1;

	}



/* 'generate' callbacks are always called, even if the 'receive' callback isn't called */

ssl/t1_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -1718,14 +1718,14 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned cha 


		/* NULL callback or -1 omits extension */

		if (!record->fn2)

			break;

			continue;

		cb_retval = record->fn2(s, record->ext_type,

								&out, &outlen, al,

								record->arg);

		if (cb_retval == 0)

			return NULL; /* error */

		if (cb_retval == -1)

			break; /* skip this extension */

			continue; /* skip this extension */

		if (limit < ret + 4 + outlen)

			return NULL;

		s2n(record->ext_type, ret);