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

Update from HEAD.

parent 967ead72

ssl/s3_lib.c

+25 −0
Original line number Diff line number Diff line
@@ -2131,6 +2131,31 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) 
	case SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG:

		ctx->tlsext_servername_arg=parg;

		break;

	case SSL_CTRL_SET_TLSEXT_TICKET_KEYS:

	case SSL_CTRL_GET_TLSEXT_TICKET_KEYS:

		{

		unsigned char *keys = parg;

		if (!keys)

			return 48;

		if (larg != 48)

			{

			SSLerr(SSL_F_SSL3_CTX_CTRL, SSL_R_INVALID_TICKET_KEYS_LENGTH);

			return 0;

			}

		if (cmd == SSL_CTRL_SET_TLSEXT_TICKET_KEYS)

			{

			memcpy(ctx->tlsext_tick_key_name, keys, 16);

			memcpy(ctx->tlsext_tick_hmac_key, keys + 16, 16);

			memcpy(ctx->tlsext_tick_aes_key, keys + 32, 16);

			}

		else

			{

			memcpy(keys, ctx->tlsext_tick_key_name, 16);

			memcpy(keys + 16, ctx->tlsext_tick_hmac_key, 16);

			memcpy(keys + 32, ctx->tlsext_tick_aes_key, 16);

			}

		return 1;

		}

#endif /* !OPENSSL_NO_TLSEXT */

	/* A Thawte special :-) */

	case SSL_CTRL_EXTRA_CHAIN_CERT:

ssl/ssl.h

+3 −0
Original line number Diff line number Diff line
@@ -1223,6 +1223,8 @@ size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count); 
#define SSL_CTRL_SET_TLSEXT_HOSTNAME		55

#define SSL_CTRL_SET_TLSEXT_DEBUG_CB		56

#define SSL_CTRL_SET_TLSEXT_DEBUG_ARG		57

#define SSL_CTRL_GET_TLSEXT_TICKET_KEYS		58

#define SSL_CTRL_SET_TLSEXT_TICKET_KEYS		59

#endif



#define SSL_session_reused(ssl) \
@@ -1851,6 +1853,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_R_INVALID_CHALLENGE_LENGTH			 158

#define SSL_R_INVALID_COMMAND				 280

#define SSL_R_INVALID_PURPOSE				 278

#define SSL_R_INVALID_TICKET_KEYS_LENGTH		 275

#define SSL_R_INVALID_TRUST				 279

#define SSL_R_KEY_ARG_TOO_LONG				 284

#define SSL_R_KRB5					 285

ssl/ssl_err.c

+2 −1
Original line number Diff line number Diff line 
/* ssl/ssl_err.c */

/* ====================================================================

 * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.

 * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions
@@ -327,6 +327,7 @@ static ERR_STRING_DATA SSL_str_reasons[]= 
{ERR_REASON(SSL_R_INVALID_CHALLENGE_LENGTH),"invalid challenge length"},

{ERR_REASON(SSL_R_INVALID_COMMAND)       ,"invalid command"},

{ERR_REASON(SSL_R_INVALID_PURPOSE)       ,"invalid purpose"},

{ERR_REASON(SSL_R_INVALID_TICKET_KEYS_LENGTH),"invalid ticket keys length"},

{ERR_REASON(SSL_R_INVALID_TRUST)         ,"invalid trust"},

{ERR_REASON(SSL_R_KEY_ARG_TOO_LONG)      ,"key arg too long"},

{ERR_REASON(SSL_R_KRB5)                  ,"krb5"},

ssl/tls1.h

+5 −0
Original line number Diff line number Diff line
@@ -144,6 +144,11 @@ SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_CB,(void (*)(void))cb) 


#define SSL_CTX_set_tlsext_servername_arg(ctx, arg) \

SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG,0, (void *)arg)



#define SSL_CTX_get_tlsext_ticket_keys(ctx, keys, keylen) \

	SSL_CTX_ctrl((ctx),SSL_CTRL_GET_TLXEXT_TICKET_KEYS,(keylen),(keys))

#define SSL_CTX_set_tlsext_ticket_keys(ctx, keys, keylen) \

	SSL_CTX_ctrl((ctx),SSL_CTRL_SET_TLXEXT_TICKET_KEYS,(keylen),(keys))

#endif



/* Additional TLS ciphersuites from draft-ietf-tls-56-bit-ciphersuites-00.txt