Attachment #4281 for bug #23037

View | Details | Raw Unified | Return to bug 23037
Collapse All | Expand All

Lines 344-349 Link Here

(-)include.l/openssl/asn1.h (-3 / +5 lines)
344	((void) (1 ? p : (type)0))	344	((void) (1 ? p : (type)0))
345	#define CHECKED_PPTR_OF(type, p) \	345	#define CHECKED_PPTR_OF(type, p) \
346	((void) (1 ? p : (type)0))	346	((void) (1 ? p : (type)0))
		347	#define CHECKED_PTR_OF_TO_CHAR(type, p) \
		348	((char) (1 ? p : (type)0))
347		349
348	#define TYPEDEF_D2I_OF(type) typedef type d2i_of_##type(type ,const unsigned char *,long)	350	#define TYPEDEF_D2I_OF(type) typedef type d2i_of_##type(type ,const unsigned char *,long)
349	#define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type(type ,unsigned char *)	351	#define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type(type ,unsigned char *)
Lines 933-944 Link Here
933	#define ASN1_dup_of(type,i2d,d2i,x) \	935	#define ASN1_dup_of(type,i2d,d2i,x) \
934	((type*)ASN1_dup(CHECKED_I2D_OF(type, i2d), \	936	((type*)ASN1_dup(CHECKED_I2D_OF(type, i2d), \
935	CHECKED_D2I_OF(type, d2i), \	937	CHECKED_D2I_OF(type, d2i), \
936	CHECKED_PTR_OF(type, x)))	938	CHECKED_PTR_OF_TO_CHAR(type, x)))
937		939
938	#define ASN1_dup_of_const(type,i2d,d2i,x) \	940	#define ASN1_dup_of_const(type,i2d,d2i,x) \
939	((type*)ASN1_dup(CHECKED_I2D_OF(const type, i2d), \	941	((type*)ASN1_dup(CHECKED_I2D_OF(const type, i2d), \
940	CHECKED_D2I_OF(type, d2i), \	942	CHECKED_D2I_OF(type, d2i), \
941	CHECKED_PTR_OF(const type, x)))	943	CHECKED_PTR_OF_TO_CHAR(const type, x)))
942		944
943	void ASN1_item_dup(const ASN1_ITEM it, void *x);	945	void ASN1_item_dup(const ASN1_ITEM it, void *x);
944		946
Lines 1158-1164 Link Here
1158	#define ASN1_F_ASN1_VERIFY 137	1160	#define ASN1_F_ASN1_VERIFY 137
1159	#define ASN1_F_B64_READ_ASN1 208	1161	#define ASN1_F_B64_READ_ASN1 208
1160	#define ASN1_F_B64_WRITE_ASN1 209	1162	#define ASN1_F_B64_WRITE_ASN1 209
1161	#define ASN1_F_BIO_NEW_NDEF 212
1162	#define ASN1_F_BITSTR_CB 180	1163	#define ASN1_F_BITSTR_CB 180
1163	#define ASN1_F_BN_TO_ASN1_ENUMERATED 138	1164	#define ASN1_F_BN_TO_ASN1_ENUMERATED 138
1164	#define ASN1_F_BN_TO_ASN1_INTEGER 139	1165	#define ASN1_F_BN_TO_ASN1_INTEGER 139
Lines 1264-1269 Link Here
1264	#define ASN1_R_INVALID_MIME_TYPE 200	1265	#define ASN1_R_INVALID_MIME_TYPE 200
1265	#define ASN1_R_INVALID_MODIFIER 186	1266	#define ASN1_R_INVALID_MODIFIER 186
1266	#define ASN1_R_INVALID_NUMBER 187	1267	#define ASN1_R_INVALID_NUMBER 187
		1268	#define ASN1_R_INVALID_OBJECT_ENCODING 212
1267	#define ASN1_R_INVALID_SEPARATOR 131	1269	#define ASN1_R_INVALID_SEPARATOR 131
1268	#define ASN1_R_INVALID_TIME_FORMAT 132	1270	#define ASN1_R_INVALID_TIME_FORMAT 132
1269	#define ASN1_R_INVALID_UNIVERSALSTRING_LENGTH 133	1271	#define ASN1_R_INVALID_UNIVERSALSTRING_LENGTH 133

Lines 156-163 Link Here

(-)include.l/openssl/bio.h (-2 / +7 lines)
156	* previous write	156	* previous write
157	* operation */	157	* operation */
158		158
		159	#define BIO_CTRL_DGRAM_GET_PEER 46
159	#define BIO_CTRL_DGRAM_SET_PEER 44 /* Destination for the data */	160	#define BIO_CTRL_DGRAM_SET_PEER 44 /* Destination for the data */
160		161
		162	#define BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT 45 /* Next DTLS handshake timeout to
		163	* adjust socket timeouts */
161		164
162	/* modifiers */	165	/* modifiers */
163	#define BIO_FP_READ 0x02	166	#define BIO_FP_READ 0x02
Lines 405-411 Link Here
405	#define BIO_get_conn_hostname(b) BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0)	408	#define BIO_get_conn_hostname(b) BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0)
406	#define BIO_get_conn_port(b) BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1)	409	#define BIO_get_conn_port(b) BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1)
407	#define BIO_get_conn_ip(b) BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2)	410	#define BIO_get_conn_ip(b) BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2)
408	#define BIO_get_conn_int_port(b) BIO_int_ctrl(b,BIO_C_GET_CONNECT,3)	411	#define BIO_get_conn_int_port(b) BIO_int_ctrl(b,BIO_C_GET_CONNECT,3,0)
409		412
410		413
411	#define BIO_set_nbio(b,n) BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL)	414	#define BIO_set_nbio(b,n) BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL)
Lines 414-420 Link Here
414	#define BIO_set_accept_port(b,name) BIO_ctrl(b,BIO_C_SET_ACCEPT,0,(char *)name)	417	#define BIO_set_accept_port(b,name) BIO_ctrl(b,BIO_C_SET_ACCEPT,0,(char *)name)
415	#define BIO_get_accept_port(b) BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,0)	418	#define BIO_get_accept_port(b) BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,0)
416	/* #define BIO_set_nbio(b,n) BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL) */	419	/* #define BIO_set_nbio(b,n) BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL) */
417	#define BIO_set_nbio_accept(b,n) BIO_ctrl(b,BIO_C_SET_ACCEPT,1,(n)?"a":NULL)	420	#define BIO_set_nbio_accept(b,n) BIO_ctrl(b,BIO_C_SET_ACCEPT,1,(n)?(void *)"a":NULL)
418	#define BIO_set_accept_bios(b,bio) BIO_ctrl(b,BIO_C_SET_ACCEPT,2,(char *)bio)	421	#define BIO_set_accept_bios(b,bio) BIO_ctrl(b,BIO_C_SET_ACCEPT,2,(char *)bio)
419		422
420	#define BIO_BIND_NORMAL 0	423	#define BIO_BIND_NORMAL 0
Lines 541-546 Link Here
541	(int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP, 0, NULL)	544	(int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP, 0, NULL)
542	#define BIO_dgram_send_timedout(b) \	545	#define BIO_dgram_send_timedout(b) \
543	(int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP, 0, NULL)	546	(int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP, 0, NULL)
		547	#define BIO_dgram_get_peer(b,peer) \
		548	(int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_PEER, 0, (char *)peer)
544	#define BIO_dgram_set_peer(b,peer) \	549	#define BIO_dgram_set_peer(b,peer) \
545	(int)BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, (char *)peer)	550	(int)BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, (char *)peer)
546		551




void private_CAST_set_key(CAST_KEY *key, int len, const unsigned char *data);
#endif
void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data);
void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out, const CAST_KEY *key,
		      int enc);
void CAST_encrypt(CAST_LONG *data, const CAST_KEY *key);
void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key);
void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
		      const CAST_KEY *ks, unsigned char *iv, int enc);
void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,
			long length, const CAST_KEY *schedule, unsigned char *ivec,
			int *num, int enc);
void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out, 
			long length, const CAST_KEY *schedule, unsigned char *ivec,
			int *num);

#ifdef  __cplusplus





#include <openssl/buffer.h>
#include <openssl/pqueue.h>
#ifdef OPENSSL_SYS_VMS
#include <resource.h>
#include <sys/timeb.h>
#endif
#ifdef OPENSSL_SYS_WIN32
/* Needed for struct timeval */
#include <winsock.h>
#elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)
#include <sys/timeval.h>
#else
#include <sys/time.h>
#endif

#ifdef  __cplusplus
extern "C" {

#endif

/* lengths of messages */
#define DTLS1_COOKIE_LENGTH                     256

#define DTLS1_RT_HEADER_LENGTH                  13


	PQ_64BIT max_seq_num;  /* max record number seen so far */
	} DTLS1_BITMAP;

struct dtls1_retransmit_state
	{
	EVP_CIPHER_CTX *enc_write_ctx;	/* cryptographic state */
	const EVP_MD *write_hash;		/* used for mac generation */
#ifndef OPENSSL_NO_COMP
	COMP_CTX *compress;				/* compression */
#else
	char *compress;	
#endif
	SSL_SESSION *session;
	unsigned short epoch;
	};

struct hm_header_st
	{
	unsigned char type;

	unsigned long frag_off;
	unsigned long frag_len;
	unsigned int is_ccs;
	struct dtls1_retransmit_state saved_retransmit_state;
	};

struct ccs_header_st


	unsigned short handshake_read_seq;

	/* save last sequence number for retransmissions */
	unsigned char last_write_sequence[8];

	/* Received handshake records (processed and unprocessed) */
	record_pqueue unprocessed_rcds;
	record_pqueue processed_rcds;

	/* Buffered (sent) handshake records */
	pqueue sent_messages;

	/* Buffered application records.
	 * Only for records between CCS and Finished
	 * to prevent either protocol violation or
	 * unnecessary message loss.
	 */
	record_pqueue buffered_app_data;

	/* Is set when listening for new connections with dtls1_listen() */
	unsigned int listen;

	unsigned int mtu; /* max DTLS packet size */

	struct hm_header_st w_msg_hdr;
	struct hm_header_st r_msg_hdr;

	struct dtls1_timeout_st timeout;

	/* Indicates when the last handshake msg sent will timeout */
	struct timeval next_timeout;

	/* Timeout duration */
	unsigned short timeout_duration;

	/* storage for Alert/Handshake protocol data received but not
	 * yet processed by ssl3_read_bytes: */
	unsigned char alert_fragment[DTLS1_AL_HEADER_LENGTH];

	unsigned int handshake_fragment_len;

	unsigned int retransmitting;
	unsigned int change_cipher_spec_ok;

	} DTLS1_STATE;





void ENGINE_load_cryptodev(void);
void ENGINE_load_padlock(void);
void ENGINE_load_builtin_engines(void);
#ifdef OPENSSL_SYS_WIN32
#ifndef OPENSSL_NO_CAPIENG
void ENGINE_load_capi(void);
#endif
#endif

/* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
 * "registry" handling. */

#define ENGINE_R_DSO_FAILURE				 104
#define ENGINE_R_DSO_NOT_FOUND				 132
#define ENGINE_R_ENGINES_SECTION_ERROR			 148
#define ENGINE_R_ENGINE_CONFIGURATION_ERROR		 101
#define ENGINE_R_ENGINE_IS_NOT_IN_LIST			 105
#define ENGINE_R_ENGINE_SECTION_ERROR			 149
#define ENGINE_R_FAILED_LOADING_PRIVATE_KEY		 128





#define SN_wap_wsg		"wap-wsg"
#define NID_wap_wsg		679
#define OBJ_wap_wsg		OBJ_wap,1L

#define SN_selected_attribute_types		"selected-attribute-types"
#define LN_selected_attribute_types		"Selected Attribute Types"

#define NID_stateOrProvinceName		16
#define OBJ_stateOrProvinceName		OBJ_X509,8L

#define SN_streetAddress		"street"
#define LN_streetAddress		"streetAddress"
#define NID_streetAddress		660
#define OBJ_streetAddress		OBJ_X509,9L

#define NID_organizationalUnitName		18
#define OBJ_organizationalUnitName		OBJ_X509,11L

#define SN_title		"title"
#define LN_title		"title"
#define NID_title		106
#define OBJ_title		OBJ_X509,12L

#define NID_description		107
#define OBJ_description		OBJ_X509,13L

#define LN_searchGuide		"searchGuide"
#define NID_searchGuide		859
#define OBJ_searchGuide		OBJ_X509,14L

#define LN_businessCategory		"businessCategory"
#define NID_businessCategory		860
#define OBJ_businessCategory		OBJ_X509,15L

#define LN_postalAddress		"postalAddress"
#define NID_postalAddress		861
#define OBJ_postalAddress		OBJ_X509,16L

#define LN_postalCode		"postalCode"
#define NID_postalCode		661
#define OBJ_postalCode		OBJ_X509,17L

#define LN_postOfficeBox		"postOfficeBox"
#define NID_postOfficeBox		862
#define OBJ_postOfficeBox		OBJ_X509,18L

#define LN_physicalDeliveryOfficeName		"physicalDeliveryOfficeName"
#define NID_physicalDeliveryOfficeName		863
#define OBJ_physicalDeliveryOfficeName		OBJ_X509,19L

#define LN_telephoneNumber		"telephoneNumber"
#define NID_telephoneNumber		864
#define OBJ_telephoneNumber		OBJ_X509,20L

#define LN_telexNumber		"telexNumber"
#define NID_telexNumber		865
#define OBJ_telexNumber		OBJ_X509,21L

#define LN_teletexTerminalIdentifier		"teletexTerminalIdentifier"
#define NID_teletexTerminalIdentifier		866
#define OBJ_teletexTerminalIdentifier		OBJ_X509,22L

#define LN_facsimileTelephoneNumber		"facsimileTelephoneNumber"
#define NID_facsimileTelephoneNumber		867
#define OBJ_facsimileTelephoneNumber		OBJ_X509,23L

#define LN_x121Address		"x121Address"
#define NID_x121Address		868
#define OBJ_x121Address		OBJ_X509,24L

#define LN_internationaliSDNNumber		"internationaliSDNNumber"
#define NID_internationaliSDNNumber		869
#define OBJ_internationaliSDNNumber		OBJ_X509,25L

#define LN_registeredAddress		"registeredAddress"
#define NID_registeredAddress		870
#define OBJ_registeredAddress		OBJ_X509,26L

#define LN_destinationIndicator		"destinationIndicator"
#define NID_destinationIndicator		871
#define OBJ_destinationIndicator		OBJ_X509,27L

#define LN_preferredDeliveryMethod		"preferredDeliveryMethod"
#define NID_preferredDeliveryMethod		872
#define OBJ_preferredDeliveryMethod		OBJ_X509,28L

#define LN_presentationAddress		"presentationAddress"
#define NID_presentationAddress		873
#define OBJ_presentationAddress		OBJ_X509,29L

#define LN_supportedApplicationContext		"supportedApplicationContext"
#define NID_supportedApplicationContext		874
#define OBJ_supportedApplicationContext		OBJ_X509,30L

#define SN_member		"member"
#define NID_member		875
#define OBJ_member		OBJ_X509,31L

#define SN_owner		"owner"
#define NID_owner		876
#define OBJ_owner		OBJ_X509,32L

#define LN_roleOccupant		"roleOccupant"
#define NID_roleOccupant		877
#define OBJ_roleOccupant		OBJ_X509,33L

#define SN_seeAlso		"seeAlso"
#define NID_seeAlso		878
#define OBJ_seeAlso		OBJ_X509,34L

#define LN_userPassword		"userPassword"
#define NID_userPassword		879
#define OBJ_userPassword		OBJ_X509,35L

#define LN_userCertificate		"userCertificate"
#define NID_userCertificate		880
#define OBJ_userCertificate		OBJ_X509,36L

#define LN_cACertificate		"cACertificate"
#define NID_cACertificate		881
#define OBJ_cACertificate		OBJ_X509,37L

#define LN_authorityRevocationList		"authorityRevocationList"
#define NID_authorityRevocationList		882
#define OBJ_authorityRevocationList		OBJ_X509,38L

#define LN_certificateRevocationList		"certificateRevocationList"
#define NID_certificateRevocationList		883
#define OBJ_certificateRevocationList		OBJ_X509,39L

#define LN_crossCertificatePair		"crossCertificatePair"
#define NID_crossCertificatePair		884
#define OBJ_crossCertificatePair		OBJ_X509,40L

#define SN_name		"name"
#define LN_name		"name"
#define NID_name		173

#define NID_givenName		99
#define OBJ_givenName		OBJ_X509,42L

#define SN_initials		"initials"
#define LN_initials		"initials"
#define NID_initials		101
#define OBJ_initials		OBJ_X509,43L

#define NID_dnQualifier		174
#define OBJ_dnQualifier		OBJ_X509,46L

#define LN_enhancedSearchGuide		"enhancedSearchGuide"
#define NID_enhancedSearchGuide		885
#define OBJ_enhancedSearchGuide		OBJ_X509,47L

#define LN_protocolInformation		"protocolInformation"
#define NID_protocolInformation		886
#define OBJ_protocolInformation		OBJ_X509,48L

#define LN_distinguishedName		"distinguishedName"
#define NID_distinguishedName		887
#define OBJ_distinguishedName		OBJ_X509,49L

#define LN_uniqueMember		"uniqueMember"
#define NID_uniqueMember		888
#define OBJ_uniqueMember		OBJ_X509,50L

#define LN_houseIdentifier		"houseIdentifier"
#define NID_houseIdentifier		889
#define OBJ_houseIdentifier		OBJ_X509,51L

#define LN_supportedAlgorithms		"supportedAlgorithms"
#define NID_supportedAlgorithms		890
#define OBJ_supportedAlgorithms		OBJ_X509,52L

#define LN_deltaRevocationList		"deltaRevocationList"
#define NID_deltaRevocationList		891
#define OBJ_deltaRevocationList		OBJ_X509,53L

#define SN_dmdName		"dmdName"
#define NID_dmdName		892
#define OBJ_dmdName		OBJ_X509,54L

#define LN_pseudonym		"pseudonym"
#define NID_pseudonym		510
#define OBJ_pseudonym		OBJ_X509,65L

Lines 25-35 Link Here

(-)include.l/openssl/opensslv.h (-3 / +3 lines)
25	* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for	25	* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
26	* major minor fix final patch/beta)	26	* major minor fix final patch/beta)
27	*/	27	*/
28	#define OPENSSL_VERSION_NUMBER 0x009080cfL	28	#define OPENSSL_VERSION_NUMBER 0x009080dfL
29	#ifdef OPENSSL_FIPS	29	#ifdef OPENSSL_FIPS
30	#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8l-fips 5 Nov 2009"	30	#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8m-fips 25 Feb 2010"
31	#else	31	#else
32	#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8l 5 Nov 2009"	32	#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8m 25 Feb 2010"
33	#endif	33	#endif
34	#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT	34	#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
35		35

Lines 232-240 Link Here

(-)include.l/openssl/pkcs12.h (-1 / +6 lines)
232	const EVP_MD *md_type);	232	const EVP_MD *md_type);
233	int PKCS12_setup_mac(PKCS12 p12, int iter, unsigned char salt,	233	int PKCS12_setup_mac(PKCS12 p12, int iter, unsigned char salt,
234	int saltlen, const EVP_MD *md_type);	234	int saltlen, const EVP_MD *md_type);
		235	#if defined(NETWARE) \|\| defined(OPENSSL_SYS_NETWARE)
		236	/* Rename these functions to avoid name clashes on NetWare OS */
		237	unsigned char OPENSSL_asc2uni(const char asc, int asclen, unsigned char *uni, int unilen);
		238	char OPENSSL_uni2asc(unsigned char uni, int unilen);
		239	#else
235	unsigned char asc2uni(const char asc, int asclen, unsigned char *uni, int unilen);	240	unsigned char asc2uni(const char asc, int asclen, unsigned char *uni, int unilen);
236	char uni2asc(unsigned char uni, int unilen);	241	char uni2asc(unsigned char uni, int unilen);
237		242	#endif
238	DECLARE_ASN1_FUNCTIONS(PKCS12)	243	DECLARE_ASN1_FUNCTIONS(PKCS12)
239	DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA)	244	DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA)
240	DECLARE_ASN1_FUNCTIONS(PKCS12_SAFEBAG)	245	DECLARE_ASN1_FUNCTIONS(PKCS12_SAFEBAG)




#define sk_ENGINE_CLEANUP_ITEM_sort(st) SKM_sk_sort(ENGINE_CLEANUP_ITEM, (st))
#define sk_ENGINE_CLEANUP_ITEM_is_sorted(st) SKM_sk_is_sorted(ENGINE_CLEANUP_ITEM, (st))

#define sk_EVP_PKEY_ASN1_METHOD_new(st) SKM_sk_new(EVP_PKEY_ASN1_METHOD, (st))
#define sk_EVP_PKEY_ASN1_METHOD_new_null() SKM_sk_new_null(EVP_PKEY_ASN1_METHOD)
#define sk_EVP_PKEY_ASN1_METHOD_free(st) SKM_sk_free(EVP_PKEY_ASN1_METHOD, (st))
#define sk_EVP_PKEY_ASN1_METHOD_num(st) SKM_sk_num(EVP_PKEY_ASN1_METHOD, (st))
#define sk_EVP_PKEY_ASN1_METHOD_value(st, i) SKM_sk_value(EVP_PKEY_ASN1_METHOD, (st), (i))
#define sk_EVP_PKEY_ASN1_METHOD_set(st, i, val) SKM_sk_set(EVP_PKEY_ASN1_METHOD, (st), (i), (val))
#define sk_EVP_PKEY_ASN1_METHOD_zero(st) SKM_sk_zero(EVP_PKEY_ASN1_METHOD, (st))
#define sk_EVP_PKEY_ASN1_METHOD_push(st, val) SKM_sk_push(EVP_PKEY_ASN1_METHOD, (st), (val))
#define sk_EVP_PKEY_ASN1_METHOD_unshift(st, val) SKM_sk_unshift(EVP_PKEY_ASN1_METHOD, (st), (val))
#define sk_EVP_PKEY_ASN1_METHOD_find(st, val) SKM_sk_find(EVP_PKEY_ASN1_METHOD, (st), (val))
#define sk_EVP_PKEY_ASN1_METHOD_find_ex(st, val) SKM_sk_find_ex(EVP_PKEY_ASN1_METHOD, (st), (val))
#define sk_EVP_PKEY_ASN1_METHOD_delete(st, i) SKM_sk_delete(EVP_PKEY_ASN1_METHOD, (st), (i))
#define sk_EVP_PKEY_ASN1_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PKEY_ASN1_METHOD, (st), (ptr))
#define sk_EVP_PKEY_ASN1_METHOD_insert(st, val, i) SKM_sk_insert(EVP_PKEY_ASN1_METHOD, (st), (val), (i))
#define sk_EVP_PKEY_ASN1_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PKEY_ASN1_METHOD, (st), (cmp))
#define sk_EVP_PKEY_ASN1_METHOD_dup(st) SKM_sk_dup(EVP_PKEY_ASN1_METHOD, st)
#define sk_EVP_PKEY_ASN1_METHOD_pop_free(st, free_func) SKM_sk_pop_free(EVP_PKEY_ASN1_METHOD, (st), (free_func))
#define sk_EVP_PKEY_ASN1_METHOD_shift(st) SKM_sk_shift(EVP_PKEY_ASN1_METHOD, (st))
#define sk_EVP_PKEY_ASN1_METHOD_pop(st) SKM_sk_pop(EVP_PKEY_ASN1_METHOD, (st))
#define sk_EVP_PKEY_ASN1_METHOD_sort(st) SKM_sk_sort(EVP_PKEY_ASN1_METHOD, (st))
#define sk_EVP_PKEY_ASN1_METHOD_is_sorted(st) SKM_sk_is_sorted(EVP_PKEY_ASN1_METHOD, (st))

#define sk_GENERAL_NAME_new(st) SKM_sk_new(GENERAL_NAME, (st))
#define sk_GENERAL_NAME_new_null() SKM_sk_new_null(GENERAL_NAME)
#define sk_GENERAL_NAME_free(st) SKM_sk_free(GENERAL_NAME, (st))

#define sk_MIME_HEADER_sort(st) SKM_sk_sort(MIME_HEADER, (st))
#define sk_MIME_HEADER_is_sorted(st) SKM_sk_is_sorted(MIME_HEADER, (st))

#define sk_MIME_HEADER_new(st) SKM_sk_new(MIME_HEADER, (st))
#define sk_MIME_HEADER_new_null() SKM_sk_new_null(MIME_HEADER)
#define sk_MIME_HEADER_free(st) SKM_sk_free(MIME_HEADER, (st))
#define sk_MIME_HEADER_num(st) SKM_sk_num(MIME_HEADER, (st))
#define sk_MIME_HEADER_value(st, i) SKM_sk_value(MIME_HEADER, (st), (i))
#define sk_MIME_HEADER_set(st, i, val) SKM_sk_set(MIME_HEADER, (st), (i), (val))
#define sk_MIME_HEADER_zero(st) SKM_sk_zero(MIME_HEADER, (st))
#define sk_MIME_HEADER_push(st, val) SKM_sk_push(MIME_HEADER, (st), (val))
#define sk_MIME_HEADER_unshift(st, val) SKM_sk_unshift(MIME_HEADER, (st), (val))
#define sk_MIME_HEADER_find(st, val) SKM_sk_find(MIME_HEADER, (st), (val))
#define sk_MIME_HEADER_find_ex(st, val) SKM_sk_find_ex(MIME_HEADER, (st), (val))
#define sk_MIME_HEADER_delete(st, i) SKM_sk_delete(MIME_HEADER, (st), (i))
#define sk_MIME_HEADER_delete_ptr(st, ptr) SKM_sk_delete_ptr(MIME_HEADER, (st), (ptr))
#define sk_MIME_HEADER_insert(st, val, i) SKM_sk_insert(MIME_HEADER, (st), (val), (i))
#define sk_MIME_HEADER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MIME_HEADER, (st), (cmp))
#define sk_MIME_HEADER_dup(st) SKM_sk_dup(MIME_HEADER, st)
#define sk_MIME_HEADER_pop_free(st, free_func) SKM_sk_pop_free(MIME_HEADER, (st), (free_func))
#define sk_MIME_HEADER_shift(st) SKM_sk_shift(MIME_HEADER, (st))
#define sk_MIME_HEADER_pop(st) SKM_sk_pop(MIME_HEADER, (st))
#define sk_MIME_HEADER_sort(st) SKM_sk_sort(MIME_HEADER, (st))
#define sk_MIME_HEADER_is_sorted(st) SKM_sk_is_sorted(MIME_HEADER, (st))

#define sk_MIME_PARAM_new(st) SKM_sk_new(MIME_PARAM, (st))
#define sk_MIME_PARAM_new_null() SKM_sk_new_null(MIME_PARAM)
#define sk_MIME_PARAM_free(st) SKM_sk_free(MIME_PARAM, (st))
#define sk_MIME_PARAM_num(st) SKM_sk_num(MIME_PARAM, (st))
#define sk_MIME_PARAM_value(st, i) SKM_sk_value(MIME_PARAM, (st), (i))
#define sk_MIME_PARAM_set(st, i, val) SKM_sk_set(MIME_PARAM, (st), (i), (val))
#define sk_MIME_PARAM_zero(st) SKM_sk_zero(MIME_PARAM, (st))
#define sk_MIME_PARAM_push(st, val) SKM_sk_push(MIME_PARAM, (st), (val))
#define sk_MIME_PARAM_unshift(st, val) SKM_sk_unshift(MIME_PARAM, (st), (val))
#define sk_MIME_PARAM_find(st, val) SKM_sk_find(MIME_PARAM, (st), (val))
#define sk_MIME_PARAM_find_ex(st, val) SKM_sk_find_ex(MIME_PARAM, (st), (val))
#define sk_MIME_PARAM_delete(st, i) SKM_sk_delete(MIME_PARAM, (st), (i))
#define sk_MIME_PARAM_delete_ptr(st, ptr) SKM_sk_delete_ptr(MIME_PARAM, (st), (ptr))
#define sk_MIME_PARAM_insert(st, val, i) SKM_sk_insert(MIME_PARAM, (st), (val), (i))
#define sk_MIME_PARAM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MIME_PARAM, (st), (cmp))
#define sk_MIME_PARAM_dup(st) SKM_sk_dup(MIME_PARAM, st)
#define sk_MIME_PARAM_pop_free(st, free_func) SKM_sk_pop_free(MIME_PARAM, (st), (free_func))
#define sk_MIME_PARAM_shift(st) SKM_sk_shift(MIME_PARAM, (st))
#define sk_MIME_PARAM_pop(st) SKM_sk_pop(MIME_PARAM, (st))
#define sk_MIME_PARAM_sort(st) SKM_sk_sort(MIME_PARAM, (st))
#define sk_MIME_PARAM_is_sorted(st) SKM_sk_is_sorted(MIME_PARAM, (st))

#define sk_MIME_PARAM_new(st) SKM_sk_new(MIME_PARAM, (st))
#define sk_MIME_PARAM_new_null() SKM_sk_new_null(MIME_PARAM)
#define sk_MIME_PARAM_free(st) SKM_sk_free(MIME_PARAM, (st))

Lines 129-134 Link Here

(-)include.l/openssl/ssl3.h (-5 / +13 lines)
129	extern "C" {	129	extern "C" {
130	#endif	130	#endif
131		131
		132	/* Signalling cipher suite value: from draft-ietf-tls-renegotiation-03.txt */
		133	#define SSL3_CK_SCSV 0x030000FF
		134
132	#define SSL3_CK_RSA_NULL_MD5 0x03000001	135	#define SSL3_CK_RSA_NULL_MD5 0x03000001
133	#define SSL3_CK_RSA_NULL_SHA 0x03000002	136	#define SSL3_CK_RSA_NULL_SHA 0x03000002
134	#define SSL3_CK_RSA_RC4_40_MD5 0x03000003	137	#define SSL3_CK_RSA_RC4_40_MD5 0x03000003
Lines 326-336 Link Here
326	#define SSL3_CT_NUMBER 7	329	#define SSL3_CT_NUMBER 7
327		330
328		331
329	#define SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS 0x0001	332	#define SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS 0x0001
330	#define SSL3_FLAGS_DELAY_CLIENT_FINISHED 0x0002	333	#define SSL3_FLAGS_DELAY_CLIENT_FINISHED 0x0002
331	#define SSL3_FLAGS_POP_BUFFER 0x0004	334	#define SSL3_FLAGS_POP_BUFFER 0x0004
332	#define TLS1_FLAGS_TLS_PADDING_BUG 0x0008	335	#define TLS1_FLAGS_TLS_PADDING_BUG 0x0008
333	#define SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0010
334		336
335	typedef struct ssl3_state_st	337	typedef struct ssl3_state_st
336	{	338	{
Lines 441-446 Link Here
441	int cert_request;	443	int cert_request;
442	} tmp;	444	} tmp;
443		445
		446	/* Connection binding to prevent renegotiation attacks */
		447	unsigned char previous_client_finished[EVP_MAX_MD_SIZE];
		448	unsigned char previous_client_finished_len;
		449	unsigned char previous_server_finished[EVP_MAX_MD_SIZE];
		450	unsigned char previous_server_finished_len;
		451	int send_connection_binding; /* TODOEKR */
444	} SSL3_STATE;	452	} SSL3_STATE;
445		453
446		454

Lines 485-491 Link Here

(-)include.l/openssl/ssl.h (-3 / +47 lines)
485		485
486	#define SSL_OP_MICROSOFT_SESS_ID_BUG 0x00000001L	486	#define SSL_OP_MICROSOFT_SESS_ID_BUG 0x00000001L
487	#define SSL_OP_NETSCAPE_CHALLENGE_BUG 0x00000002L	487	#define SSL_OP_NETSCAPE_CHALLENGE_BUG 0x00000002L
488	#define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x00000008L /* can break some security expectations */	488	/* Allow initial connection to servers that don't support RI */
		489	#define SSL_OP_LEGACY_SERVER_CONNECT 0x00000004L
		490	#define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x00000008L
489	#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x00000010L	491	#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x00000010L
490	#define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020L	492	#define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020L
491	#define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x00000040L /* no effect since 0.9.7h and 0.9.8b */	493	#define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x00000040L /* no effect since 0.9.7h and 0.9.8b */
Lines 515-520 Link Here
515		517
516	/* As server, disallow session resumption on renegotiation */	518	/* As server, disallow session resumption on renegotiation */
517	#define SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION 0x00010000L	519	#define SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION 0x00010000L
		520	/* Permit unsafe legacy renegotiation */
		521	#define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x00040000L
518	/* If set, always create a new key when using tmp_ecdh parameters */	522	/* If set, always create a new key when using tmp_ecdh parameters */
519	#define SSL_OP_SINGLE_ECDH_USE 0x00080000L	523	#define SSL_OP_SINGLE_ECDH_USE 0x00080000L
520	/* If set, always create a new key when using tmp_dh parameters */	524	/* If set, always create a new key when using tmp_dh parameters */
Lines 563-579 Link Here
563		567
564	#define SSL_CTX_set_options(ctx,op) \	568	#define SSL_CTX_set_options(ctx,op) \
565	SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL)	569	SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL)
		570	#define SSL_CTX_clear_options(ctx,op) \
		571	SSL_CTX_ctrl((ctx),SSL_CTRL_CLEAR_OPTIONS,(op),NULL)
566	#define SSL_CTX_get_options(ctx) \	572	#define SSL_CTX_get_options(ctx) \
567	SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,0,NULL)	573	SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,0,NULL)
568	#define SSL_set_options(ssl,op) \	574	#define SSL_set_options(ssl,op) \
569	SSL_ctrl((ssl),SSL_CTRL_OPTIONS,(op),NULL)	575	SSL_ctrl((ssl),SSL_CTRL_OPTIONS,(op),NULL)
		576	#define SSL_clear_options(ssl,op) \
		577	SSL_ctrl((ssl),SSL_CTRL_CLEAR_OPTIONS,(op),NULL)
570	#define SSL_get_options(ssl) \	578	#define SSL_get_options(ssl) \
571	SSL_ctrl((ssl),SSL_CTRL_OPTIONS,0,NULL)	579	SSL_ctrl((ssl),SSL_CTRL_OPTIONS,0,NULL)
572		580
573	#define SSL_CTX_set_mode(ctx,op) \	581	#define SSL_CTX_set_mode(ctx,op) \
574	SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,(op),NULL)	582	SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,(op),NULL)
		583	#define SSL_CTX_clear_mode(ctx,op) \
		584	SSL_CTX_ctrl((ctx),SSL_CTRL_CLEAR_MODE,(op),NULL)
575	#define SSL_CTX_get_mode(ctx) \	585	#define SSL_CTX_get_mode(ctx) \
576	SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,0,NULL)	586	SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,0,NULL)
		587	#define SSL_clear_mode(ssl,op) \
		588	SSL_ctrl((ssl),SSL_CTRL_CLEAR_MODE,(op),NULL)
577	#define SSL_set_mode(ssl,op) \	589	#define SSL_set_mode(ssl,op) \
578	SSL_ctrl((ssl),SSL_CTRL_MODE,(op),NULL)	590	SSL_ctrl((ssl),SSL_CTRL_MODE,(op),NULL)
579	#define SSL_get_mode(ssl) \	591	#define SSL_get_mode(ssl) \
Lines 581-586 Link Here
581	#define SSL_set_mtu(ssl, mtu) \	593	#define SSL_set_mtu(ssl, mtu) \
582	SSL_ctrl((ssl),SSL_CTRL_SET_MTU,(mtu),NULL)	594	SSL_ctrl((ssl),SSL_CTRL_SET_MTU,(mtu),NULL)
583		595
		596	#define SSL_get_secure_renegotiation_support(ssl) \
		597	SSL_ctrl((ssl), SSL_CTRL_GET_RI_SUPPORT, 0, NULL)
584		598
585	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));	599	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));
586	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));	600	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));
Lines 1271-1276 Link Here
1271	#define SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB 72	1285	#define SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB 72
1272	#endif	1286	#endif
1273		1287
		1288	#define DTLS_CTRL_GET_TIMEOUT 73
		1289	#define DTLS_CTRL_HANDLE_TIMEOUT 74
		1290	#define DTLS_CTRL_LISTEN 75
		1291
		1292	#define SSL_CTRL_GET_RI_SUPPORT 76
		1293	#define SSL_CTRL_CLEAR_OPTIONS 77
		1294	#define SSL_CTRL_CLEAR_MODE 78
		1295
		1296	#define DTLSv1_get_timeout(ssl, arg) \
		1297	SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)arg)
		1298	#define DTLSv1_handle_timeout(ssl) \
		1299	SSL_ctrl(ssl,DTLS_CTRL_HANDLE_TIMEOUT,0, NULL)
		1300	#define DTLSv1_listen(ssl, peer) \
		1301	SSL_ctrl(ssl,DTLS_CTRL_LISTEN,0, (void *)peer)
		1302
1274	#define SSL_session_reused(ssl) \	1303	#define SSL_session_reused(ssl) \
1275	SSL_ctrl((ssl),SSL_CTRL_GET_SESSION_REUSED,0,NULL)	1304	SSL_ctrl((ssl),SSL_CTRL_GET_SESSION_REUSED,0,NULL)
1276	#define SSL_num_renegotiations(ssl) \	1305	#define SSL_num_renegotiations(ssl) \
Lines 1521-1527 Link Here
1521		1550
1522	int SSL_library_init(void );	1551	int SSL_library_init(void );
1523		1552
1524	char SSL_CIPHER_description(SSL_CIPHER ,char *buf,int size);	1553	char SSL_CIPHER_description(const SSL_CIPHER ,char *buf,int size);
1525	STACK_OF(X509_NAME) SSL_dup_CA_list(STACK_OF(X509_NAME) sk);	1554	STACK_OF(X509_NAME) SSL_dup_CA_list(STACK_OF(X509_NAME) sk);
1526		1555
1527	SSL SSL_dup(SSL ssl);	1556	SSL SSL_dup(SSL ssl);
Lines 1651-1656 Link Here
1651	#define SSL_F_DO_DTLS1_WRITE 245	1680	#define SSL_F_DO_DTLS1_WRITE 245
1652	#define SSL_F_DO_SSL3_WRITE 104	1681	#define SSL_F_DO_SSL3_WRITE 104
1653	#define SSL_F_DTLS1_ACCEPT 246	1682	#define SSL_F_DTLS1_ACCEPT 246
		1683	#define SSL_F_DTLS1_ADD_CERT_TO_BUF 280
1654	#define SSL_F_DTLS1_BUFFER_RECORD 247	1684	#define SSL_F_DTLS1_BUFFER_RECORD 247
1655	#define SSL_F_DTLS1_CLIENT_HELLO 248	1685	#define SSL_F_DTLS1_CLIENT_HELLO 248
1656	#define SSL_F_DTLS1_CONNECT 249	1686	#define SSL_F_DTLS1_CONNECT 249
Lines 1659-1664 Link Here
1659	#define SSL_F_DTLS1_GET_MESSAGE 252	1689	#define SSL_F_DTLS1_GET_MESSAGE 252
1660	#define SSL_F_DTLS1_GET_MESSAGE_FRAGMENT 253	1690	#define SSL_F_DTLS1_GET_MESSAGE_FRAGMENT 253
1661	#define SSL_F_DTLS1_GET_RECORD 254	1691	#define SSL_F_DTLS1_GET_RECORD 254
		1692	#define SSL_F_DTLS1_HANDLE_TIMEOUT 282
1662	#define SSL_F_DTLS1_OUTPUT_CERT_CHAIN 255	1693	#define SSL_F_DTLS1_OUTPUT_CERT_CHAIN 255
1663	#define SSL_F_DTLS1_PREPROCESS_FRAGMENT 277	1694	#define SSL_F_DTLS1_PREPROCESS_FRAGMENT 277
1664	#define SSL_F_DTLS1_PROCESS_OUT_OF_SEQ_MESSAGE 256	1695	#define SSL_F_DTLS1_PROCESS_OUT_OF_SEQ_MESSAGE 256
Lines 1704-1709 Link Here
1704	#define SSL_F_SSL2_SET_CERTIFICATE 126	1735	#define SSL_F_SSL2_SET_CERTIFICATE 126
1705	#define SSL_F_SSL2_WRITE 127	1736	#define SSL_F_SSL2_WRITE 127
1706	#define SSL_F_SSL3_ACCEPT 128	1737	#define SSL_F_SSL3_ACCEPT 128
		1738	#define SSL_F_SSL3_ADD_CERT_TO_BUF 281
1707	#define SSL_F_SSL3_CALLBACK_CTRL 233	1739	#define SSL_F_SSL3_CALLBACK_CTRL 233
1708	#define SSL_F_SSL3_CHANGE_CIPHER_STATE 129	1740	#define SSL_F_SSL3_CHANGE_CIPHER_STATE 129
1709	#define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM 130	1741	#define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM 130
Lines 1744-1752 Link Here
1744	#define SSL_F_SSL3_SETUP_KEY_BLOCK 157	1776	#define SSL_F_SSL3_SETUP_KEY_BLOCK 157
1745	#define SSL_F_SSL3_WRITE_BYTES 158	1777	#define SSL_F_SSL3_WRITE_BYTES 158
1746	#define SSL_F_SSL3_WRITE_PENDING 159	1778	#define SSL_F_SSL3_WRITE_PENDING 159
		1779	#define SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT 285
1747	#define SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT 272	1780	#define SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT 272
1748	#define SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK 215	1781	#define SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK 215
1749	#define SSL_F_SSL_ADD_FILE_CERT_SUBJECTS_TO_STACK 216	1782	#define SSL_F_SSL_ADD_FILE_CERT_SUBJECTS_TO_STACK 216
		1783	#define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 286
1750	#define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 273	1784	#define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 273
1751	#define SSL_F_SSL_BAD_METHOD 160	1785	#define SSL_F_SSL_BAD_METHOD 160
1752	#define SSL_F_SSL_BYTES_TO_CIPHER_LIST 161	1786	#define SSL_F_SSL_BYTES_TO_CIPHER_LIST 161
Lines 1788-1793 Link Here
1788	#define SSL_F_SSL_INIT_WBIO_BUFFER 184	1822	#define SSL_F_SSL_INIT_WBIO_BUFFER 184
1789	#define SSL_F_SSL_LOAD_CLIENT_CA_FILE 185	1823	#define SSL_F_SSL_LOAD_CLIENT_CA_FILE 185
1790	#define SSL_F_SSL_NEW 186	1824	#define SSL_F_SSL_NEW 186
		1825	#define SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT 287
		1826	#define SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT 290
		1827	#define SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT 289
		1828	#define SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT 291
1791	#define SSL_F_SSL_PEEK 270	1829	#define SSL_F_SSL_PEEK 270
1792	#define SSL_F_SSL_PREPARE_CLIENTHELLO_TLSEXT 275	1830	#define SSL_F_SSL_PREPARE_CLIENTHELLO_TLSEXT 275
1793	#define SSL_F_SSL_PREPARE_SERVERHELLO_TLSEXT 276	1831	#define SSL_F_SSL_PREPARE_SERVERHELLO_TLSEXT 276
Lines 1887-1892 Link Here
1887	#define SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC 281	1925	#define SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC 281
1888	#define SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG 148	1926	#define SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG 148
1889	#define SSL_R_DIGEST_CHECK_FAILED 149	1927	#define SSL_R_DIGEST_CHECK_FAILED 149
		1928	#define SSL_R_DTLS_MESSAGE_TOO_BIG 318
1890	#define SSL_R_DUPLICATE_COMPRESSION_ID 309	1929	#define SSL_R_DUPLICATE_COMPRESSION_ID 309
1891	#define SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER 310	1930	#define SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER 310
1892	#define SSL_R_ENCRYPTED_LENGTH_TOO_LONG 150	1931	#define SSL_R_ENCRYPTED_LENGTH_TOO_LONG 150
Lines 1954-1960 Link Here
1954	#define SSL_R_NO_PRIVATE_KEY_ASSIGNED 190	1993	#define SSL_R_NO_PRIVATE_KEY_ASSIGNED 190
1955	#define SSL_R_NO_PROTOCOLS_AVAILABLE 191	1994	#define SSL_R_NO_PROTOCOLS_AVAILABLE 191
1956	#define SSL_R_NO_PUBLICKEY 192	1995	#define SSL_R_NO_PUBLICKEY 192
1957	#define SSL_R_NO_RENEGOTIATION 318	1996	#define SSL_R_NO_RENEGOTIATION 319
1958	#define SSL_R_NO_SHARED_CIPHER 193	1997	#define SSL_R_NO_SHARED_CIPHER 193
1959	#define SSL_R_NO_VERIFY_CALLBACK 194	1998	#define SSL_R_NO_VERIFY_CALLBACK 194
1960	#define SSL_R_NULL_SSL_CTX 195	1999	#define SSL_R_NULL_SSL_CTX 195
Lines 1982-1991 Link Here
1982	#define SSL_R_RECORD_LENGTH_MISMATCH 213	2021	#define SSL_R_RECORD_LENGTH_MISMATCH 213
1983	#define SSL_R_RECORD_TOO_LARGE 214	2022	#define SSL_R_RECORD_TOO_LARGE 214
1984	#define SSL_R_RECORD_TOO_SMALL 298	2023	#define SSL_R_RECORD_TOO_SMALL 298
		2024	#define SSL_R_RENEGOTIATE_EXT_TOO_LONG 320
		2025	#define SSL_R_RENEGOTIATION_ENCODING_ERR 321
		2026	#define SSL_R_RENEGOTIATION_MISMATCH 322
1985	#define SSL_R_REQUIRED_CIPHER_MISSING 215	2027	#define SSL_R_REQUIRED_CIPHER_MISSING 215
1986	#define SSL_R_REUSE_CERT_LENGTH_NOT_ZERO 216	2028	#define SSL_R_REUSE_CERT_LENGTH_NOT_ZERO 216
1987	#define SSL_R_REUSE_CERT_TYPE_NOT_ZERO 217	2029	#define SSL_R_REUSE_CERT_TYPE_NOT_ZERO 217
1988	#define SSL_R_REUSE_CIPHER_LIST_NOT_ZERO 218	2030	#define SSL_R_REUSE_CIPHER_LIST_NOT_ZERO 218
		2031	#define SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING 324
1989	#define SSL_R_SERVERHELLO_TLSEXT 224	2032	#define SSL_R_SERVERHELLO_TLSEXT 224
1990	#define SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED 277	2033	#define SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED 277
1991	#define SSL_R_SHORT_READ 219	2034	#define SSL_R_SHORT_READ 219
Lines 2055-2060 Link Here
2055	#define SSL_R_UNKNOWN_REMOTE_ERROR_TYPE 253	2098	#define SSL_R_UNKNOWN_REMOTE_ERROR_TYPE 253
2056	#define SSL_R_UNKNOWN_SSL_VERSION 254	2099	#define SSL_R_UNKNOWN_SSL_VERSION 254
2057	#define SSL_R_UNKNOWN_STATE 255	2100	#define SSL_R_UNKNOWN_STATE 255
		2101	#define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 323
2058	#define SSL_R_UNSUPPORTED_CIPHER 256	2102	#define SSL_R_UNSUPPORTED_CIPHER 256
2059	#define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257	2103	#define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
2060	#define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315	2104	#define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315

Lines 60-65 Link Here

(-)include.l/openssl/symhacks.h (+20 lines)
60	/* Hacks to solve the problem with linkers incapable of handling very long	60	/* Hacks to solve the problem with linkers incapable of handling very long
61	symbol names. In the case of VMS, the limit is 31 characters on VMS for	61	symbol names. In the case of VMS, the limit is 31 characters on VMS for
62	VAX. */	62	VAX. */
		63	/* Note that this affects util/libeay.num and util/ssleay.num... you may
		64	change those manually, but that's not recommended, as those files are
		65	controlled centrally and updated on Unix, and the central definition
		66	may disagree with yours, which in turn may come with shareable library
		67	incompatibilities. */
63	#ifdef OPENSSL_SYS_VMS	68	#ifdef OPENSSL_SYS_VMS
64		69
65	/* Hack a long name in crypto/cryptlib.c */	70	/* Hack a long name in crypto/cryptlib.c */
Lines 137-142 Link Here
137	#define X509_policy_node_get0_qualifiers X509_pcy_node_get0_qualifiers	142	#define X509_policy_node_get0_qualifiers X509_pcy_node_get0_qualifiers
138	#undef X509_STORE_CTX_get_explicit_policy	143	#undef X509_STORE_CTX_get_explicit_policy
139	#define X509_STORE_CTX_get_explicit_policy X509_STORE_CTX_get_expl_policy	144	#define X509_STORE_CTX_get_explicit_policy X509_STORE_CTX_get_expl_policy
		145	#undef X509_STORE_CTX_get0_current_issuer
		146	#define X509_STORE_CTX_get0_current_issuer X509_STORE_CTX_get0_cur_issuer
140		147
141	/* Hack some long CRYPTO names */	148	/* Hack some long CRYPTO names */
142	#undef CRYPTO_set_dynlock_destroy_callback	149	#undef CRYPTO_set_dynlock_destroy_callback
Lines 174-179 Link Here
174	#undef SSL_COMP_get_compression_methods	181	#undef SSL_COMP_get_compression_methods
175	#define SSL_COMP_get_compression_methods SSL_COMP_get_compress_methods	182	#define SSL_COMP_get_compression_methods SSL_COMP_get_compress_methods
176		183
		184	#undef ssl_add_clienthello_renegotiate_ext
		185	#define ssl_add_clienthello_renegotiate_ext ssl_add_clienthello_reneg_ext
		186	#undef ssl_add_serverhello_renegotiate_ext
		187	#define ssl_add_serverhello_renegotiate_ext ssl_add_serverhello_reneg_ext
		188	#undef ssl_parse_clienthello_renegotiate_ext
		189	#define ssl_parse_clienthello_renegotiate_ext ssl_parse_clienthello_reneg_ext
		190	#undef ssl_parse_serverhello_renegotiate_ext
		191	#define ssl_parse_serverhello_renegotiate_ext ssl_parse_serverhello_reneg_ext
		192
177	/* Hack some long ENGINE names */	193	/* Hack some long ENGINE names */
178	#undef ENGINE_get_default_BN_mod_exp_crt	194	#undef ENGINE_get_default_BN_mod_exp_crt
179	#define ENGINE_get_default_BN_mod_exp_crt ENGINE_get_def_BN_mod_exp_crt	195	#define ENGINE_get_default_BN_mod_exp_crt ENGINE_get_def_BN_mod_exp_crt
Lines 365-370 Link Here
365	#undef cms_SignerIdentifier_get0_signer_id	381	#undef cms_SignerIdentifier_get0_signer_id
366	#define cms_SignerIdentifier_get0_signer_id cms_SignerId_get0_signer_id	382	#define cms_SignerIdentifier_get0_signer_id cms_SignerId_get0_signer_id
367		383
		384	/* Hack some long DTLS1 names */
		385	#undef dtls1_retransmit_buffered_messages
		386	#define dtls1_retransmit_buffered_messages dtls1_retransmit_buffered_msgs
		387
368	#endif /* defined OPENSSL_SYS_VMS */	388	#endif /* defined OPENSSL_SYS_VMS */
369		389
370		390

Lines 116-121 Link Here

(-)include.l/openssl/x509.h (+1 lines)
116	/* Under Win32 these are defined in wincrypt.h */	116	/* Under Win32 these are defined in wincrypt.h */
117	#undef X509_NAME	117	#undef X509_NAME
118	#undef X509_CERT_PAIR	118	#undef X509_CERT_PAIR
		119	#undef X509_EXTENSIONS
119	#endif	120	#endif
120		121
121	#define X509_FILETYPE_PEM 1	122	#define X509_FILETYPE_PEM 1

Lines 363-368 Link Here

(-)include.l/openssl/x509_vfy.h (+3 lines)
363	/* Notify callback that policy is OK */	363	/* Notify callback that policy is OK */
364	#define X509_V_FLAG_NOTIFY_POLICY 0x800	364	#define X509_V_FLAG_NOTIFY_POLICY 0x800
365		365
		366	/* Check selfsigned CA signature */
		367	#define X509_V_FLAG_CHECK_SS_SIGNATURE 0x4000
		368
366	#define X509_VP_FLAG_DEFAULT 0x1	369	#define X509_VP_FLAG_DEFAULT 0x1
367	#define X509_VP_FLAG_OVERWRITE 0x2	370	#define X509_VP_FLAG_OVERWRITE 0x2
368	#define X509_VP_FLAG_RESET_FLAGS 0x4	371	#define X509_VP_FLAG_RESET_FLAGS 0x4

Return to bug 23037

Lines 122-128 Link Here

(-)include.l/openssl/obj_mac.h (-1 / +140 lines)
122		122
123	#define SN_wap_wsg "wap-wsg"	123	#define SN_wap_wsg "wap-wsg"
124	#define NID_wap_wsg 679	124	#define NID_wap_wsg 679
125	#define OBJ_wap_wsg OBJ_wap,13L	125	#define OBJ_wap_wsg OBJ_wap,1L
126		126
127	#define SN_selected_attribute_types "selected-attribute-types"	127	#define SN_selected_attribute_types "selected-attribute-types"
128	#define LN_selected_attribute_types "Selected Attribute Types"	128	#define LN_selected_attribute_types "Selected Attribute Types"
Lines 2049-2054 Link Here
2049	#define NID_stateOrProvinceName 16	2049	#define NID_stateOrProvinceName 16
2050	#define OBJ_stateOrProvinceName OBJ_X509,8L	2050	#define OBJ_stateOrProvinceName OBJ_X509,8L
2051		2051
		2052	#define SN_streetAddress "street"
2052	#define LN_streetAddress "streetAddress"	2053	#define LN_streetAddress "streetAddress"
2053	#define NID_streetAddress 660	2054	#define NID_streetAddress 660
2054	#define OBJ_streetAddress OBJ_X509,9L	2055	#define OBJ_streetAddress OBJ_X509,9L
Lines 2063-2068 Link Here
2063	#define NID_organizationalUnitName 18	2064	#define NID_organizationalUnitName 18
2064	#define OBJ_organizationalUnitName OBJ_X509,11L	2065	#define OBJ_organizationalUnitName OBJ_X509,11L
2065		2066
		2067	#define SN_title "title"
2066	#define LN_title "title"	2068	#define LN_title "title"
2067	#define NID_title 106	2069	#define NID_title 106
2068	#define OBJ_title OBJ_X509,12L	2070	#define OBJ_title OBJ_X509,12L
Lines 2071-2080 Link Here
2071	#define NID_description 107	2073	#define NID_description 107
2072	#define OBJ_description OBJ_X509,13L	2074	#define OBJ_description OBJ_X509,13L
2073		2075
		2076	#define LN_searchGuide "searchGuide"
		2077	#define NID_searchGuide 859
		2078	#define OBJ_searchGuide OBJ_X509,14L
		2079
		2080	#define LN_businessCategory "businessCategory"
		2081	#define NID_businessCategory 860
		2082	#define OBJ_businessCategory OBJ_X509,15L
		2083
		2084	#define LN_postalAddress "postalAddress"
		2085	#define NID_postalAddress 861
		2086	#define OBJ_postalAddress OBJ_X509,16L
		2087
2074	#define LN_postalCode "postalCode"	2088	#define LN_postalCode "postalCode"
2075	#define NID_postalCode 661	2089	#define NID_postalCode 661
2076	#define OBJ_postalCode OBJ_X509,17L	2090	#define OBJ_postalCode OBJ_X509,17L
2077		2091
		2092	#define LN_postOfficeBox "postOfficeBox"
		2093	#define NID_postOfficeBox 862
		2094	#define OBJ_postOfficeBox OBJ_X509,18L
		2095
		2096	#define LN_physicalDeliveryOfficeName "physicalDeliveryOfficeName"
		2097	#define NID_physicalDeliveryOfficeName 863
		2098	#define OBJ_physicalDeliveryOfficeName OBJ_X509,19L
		2099
		2100	#define LN_telephoneNumber "telephoneNumber"
		2101	#define NID_telephoneNumber 864
		2102	#define OBJ_telephoneNumber OBJ_X509,20L
		2103
		2104	#define LN_telexNumber "telexNumber"
		2105	#define NID_telexNumber 865
		2106	#define OBJ_telexNumber OBJ_X509,21L
		2107
		2108	#define LN_teletexTerminalIdentifier "teletexTerminalIdentifier"
		2109	#define NID_teletexTerminalIdentifier 866
		2110	#define OBJ_teletexTerminalIdentifier OBJ_X509,22L
		2111
		2112	#define LN_facsimileTelephoneNumber "facsimileTelephoneNumber"
		2113	#define NID_facsimileTelephoneNumber 867
		2114	#define OBJ_facsimileTelephoneNumber OBJ_X509,23L
		2115
		2116	#define LN_x121Address "x121Address"
		2117	#define NID_x121Address 868
		2118	#define OBJ_x121Address OBJ_X509,24L
		2119
		2120	#define LN_internationaliSDNNumber "internationaliSDNNumber"
		2121	#define NID_internationaliSDNNumber 869
		2122	#define OBJ_internationaliSDNNumber OBJ_X509,25L
		2123
		2124	#define LN_registeredAddress "registeredAddress"
		2125	#define NID_registeredAddress 870
		2126	#define OBJ_registeredAddress OBJ_X509,26L
		2127
		2128	#define LN_destinationIndicator "destinationIndicator"
		2129	#define NID_destinationIndicator 871
		2130	#define OBJ_destinationIndicator OBJ_X509,27L
		2131
		2132	#define LN_preferredDeliveryMethod "preferredDeliveryMethod"
		2133	#define NID_preferredDeliveryMethod 872
		2134	#define OBJ_preferredDeliveryMethod OBJ_X509,28L
		2135
		2136	#define LN_presentationAddress "presentationAddress"
		2137	#define NID_presentationAddress 873
		2138	#define OBJ_presentationAddress OBJ_X509,29L
		2139
		2140	#define LN_supportedApplicationContext "supportedApplicationContext"
		2141	#define NID_supportedApplicationContext 874
		2142	#define OBJ_supportedApplicationContext OBJ_X509,30L
		2143
		2144	#define SN_member "member"
		2145	#define NID_member 875
		2146	#define OBJ_member OBJ_X509,31L
		2147
		2148	#define SN_owner "owner"
		2149	#define NID_owner 876
		2150	#define OBJ_owner OBJ_X509,32L
		2151
		2152	#define LN_roleOccupant "roleOccupant"
		2153	#define NID_roleOccupant 877
		2154	#define OBJ_roleOccupant OBJ_X509,33L
		2155
2156	#define SN_seeAlso "seeAlso"
2157	#define NID_seeAlso 878
2158	#define OBJ_seeAlso OBJ_X509,34L
2159
2160	#define LN_userPassword "userPassword"
2161	#define NID_userPassword 879
2162	#define OBJ_userPassword OBJ_X509,35L
2163
2164	#define LN_userCertificate "userCertificate"
2165	#define NID_userCertificate 880
2166	#define OBJ_userCertificate OBJ_X509,36L
2167
2168	#define LN_cACertificate "cACertificate"
2169	#define NID_cACertificate 881
2170	#define OBJ_cACertificate OBJ_X509,37L
2171
2172	#define LN_authorityRevocationList "authorityRevocationList"
2173	#define NID_authorityRevocationList 882
2174	#define OBJ_authorityRevocationList OBJ_X509,38L
2175
2176	#define LN_certificateRevocationList "certificateRevocationList"
2177	#define NID_certificateRevocationList 883
2178	#define OBJ_certificateRevocationList OBJ_X509,39L
2179
2180	#define LN_crossCertificatePair "crossCertificatePair"
2181	#define NID_crossCertificatePair 884
2182	#define OBJ_crossCertificatePair OBJ_X509,40L
2183
2078	#define SN_name "name"	2184	#define SN_name "name"
2079	#define LN_name "name"	2185	#define LN_name "name"
2080	#define NID_name 173	2186	#define NID_name 173
Lines 2085-2090 Link Here
2085	#define NID_givenName 99	2191	#define NID_givenName 99
2086	#define OBJ_givenName OBJ_X509,42L	2192	#define OBJ_givenName OBJ_X509,42L
2087		2193
		2194	#define SN_initials "initials"
2088	#define LN_initials "initials"	2195	#define LN_initials "initials"
2089	#define NID_initials 101	2196	#define NID_initials 101
2090	#define OBJ_initials OBJ_X509,43L	2197	#define OBJ_initials OBJ_X509,43L
Lines 2102-2107 Link Here
2102	#define NID_dnQualifier 174	2209	#define NID_dnQualifier 174
2103	#define OBJ_dnQualifier OBJ_X509,46L	2210	#define OBJ_dnQualifier OBJ_X509,46L
2104		2211
		2212	#define LN_enhancedSearchGuide "enhancedSearchGuide"
		2213	#define NID_enhancedSearchGuide 885
		2214	#define OBJ_enhancedSearchGuide OBJ_X509,47L
		2215
		2216	#define LN_protocolInformation "protocolInformation"
		2217	#define NID_protocolInformation 886
		2218	#define OBJ_protocolInformation OBJ_X509,48L
		2219
		2220	#define LN_distinguishedName "distinguishedName"
		2221	#define NID_distinguishedName 887
		2222	#define OBJ_distinguishedName OBJ_X509,49L
		2223
		2224	#define LN_uniqueMember "uniqueMember"
		2225	#define NID_uniqueMember 888
		2226	#define OBJ_uniqueMember OBJ_X509,50L
		2227
		2228	#define LN_houseIdentifier "houseIdentifier"
		2229	#define NID_houseIdentifier 889
		2230	#define OBJ_houseIdentifier OBJ_X509,51L
		2231
		2232	#define LN_supportedAlgorithms "supportedAlgorithms"
		2233	#define NID_supportedAlgorithms 890
		2234	#define OBJ_supportedAlgorithms OBJ_X509,52L
		2235
		2236	#define LN_deltaRevocationList "deltaRevocationList"
		2237	#define NID_deltaRevocationList 891
		2238	#define OBJ_deltaRevocationList OBJ_X509,53L
		2239
		2240	#define SN_dmdName "dmdName"
		2241	#define NID_dmdName 892
		2242	#define OBJ_dmdName OBJ_X509,54L
		2243
2105	#define LN_pseudonym "pseudonym"	2244	#define LN_pseudonym "pseudonym"
2106	#define NID_pseudonym 510	2245	#define NID_pseudonym 510
2107	#define OBJ_pseudonym OBJ_X509,65L	2246	#define OBJ_pseudonym OBJ_X509,65L

Lines 87-103 Link Here

(-)include.l/openssl/cast.h (-6 / +6 lines)
87	void private_CAST_set_key(CAST_KEY key, int len, const unsigned char data);	87	void private_CAST_set_key(CAST_KEY key, int len, const unsigned char data);
88	#endif	88	#endif
89	void CAST_set_key(CAST_KEY key, int len, const unsigned char data);	89	void CAST_set_key(CAST_KEY key, int len, const unsigned char data);
90	void CAST_ecb_encrypt(const unsigned char in,unsigned char out,CAST_KEY *key,	90	void CAST_ecb_encrypt(const unsigned char in, unsigned char out, const CAST_KEY *key,
91	int enc);	91	int enc);
92	void CAST_encrypt(CAST_LONG data,CAST_KEY key);	92	void CAST_encrypt(CAST_LONG data, const CAST_KEY key);
93	void CAST_decrypt(CAST_LONG data,CAST_KEY key);	93	void CAST_decrypt(CAST_LONG data, const CAST_KEY key);
94	void CAST_cbc_encrypt(const unsigned char in, unsigned char out, long length,	94	void CAST_cbc_encrypt(const unsigned char in, unsigned char out, long length,
95	CAST_KEY ks, unsigned char iv, int enc);	95	const CAST_KEY ks, unsigned char iv, int enc);
96	void CAST_cfb64_encrypt(const unsigned char in, unsigned char out,	96	void CAST_cfb64_encrypt(const unsigned char in, unsigned char out,
97	long length, CAST_KEY schedule, unsigned char ivec,	97	long length, const CAST_KEY schedule, unsigned char ivec,
98	int *num, int enc);	98	int *num, int enc);
99	void CAST_ofb64_encrypt(const unsigned char in, unsigned char out,	99	void CAST_ofb64_encrypt(const unsigned char in, unsigned char out,
100	long length, CAST_KEY schedule, unsigned char ivec,	100	long length, const CAST_KEY schedule, unsigned char ivec,
101	int *num);	101	int *num);
102		102
103	#ifdef __cplusplus	103	#ifdef __cplusplus

Lines 62-67 Link Here

(-)include.l/openssl/dtls1.h (-3 / +49 lines)
62		62
63	#include <openssl/buffer.h>	63	#include <openssl/buffer.h>
64	#include <openssl/pqueue.h>	64	#include <openssl/pqueue.h>
		65	#ifdef OPENSSL_SYS_VMS
		66	#include <resource.h>
		67	#include <sys/timeb.h>
		68	#endif
		69	#ifdef OPENSSL_SYS_WIN32
		70	/* Needed for struct timeval */
		71	#include <winsock.h>
		72	#elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)
		73	#include <sys/timeval.h>
		74	#else
		75	#include <sys/time.h>
		76	#endif
65		77
66	#ifdef __cplusplus	78	#ifdef __cplusplus
67	extern "C" {	79	extern "C" {
Lines 76-82 Link Here
76	#endif	88	#endif
77		89
78	/* lengths of messages */	90	/* lengths of messages */
79	#define DTLS1_COOKIE_LENGTH 32	91	#define DTLS1_COOKIE_LENGTH 256
80		92
81	#define DTLS1_RT_HEADER_LENGTH 13	93	#define DTLS1_RT_HEADER_LENGTH 13
82		94
Lines 101-106 Link Here
101	PQ_64BIT max_seq_num; /* max record number seen so far */	113	PQ_64BIT max_seq_num; /* max record number seen so far */
102	} DTLS1_BITMAP;	114	} DTLS1_BITMAP;
103		115
		116	struct dtls1_retransmit_state
		117	{
		118	EVP_CIPHER_CTX enc_write_ctx; / cryptographic state */
		119	const EVP_MD write_hash; / used for mac generation */
		120	#ifndef OPENSSL_NO_COMP
		121	COMP_CTX compress; / compression */
		122	#else
		123	char *compress;
		124	#endif
		125	SSL_SESSION *session;
		126	unsigned short epoch;
		127	};
		128
104	struct hm_header_st	129	struct hm_header_st
105	{	130	{
106	unsigned char type;	131	unsigned char type;
Lines 109-114 Link Here
109	unsigned long frag_off;	134	unsigned long frag_off;
110	unsigned long frag_len;	135	unsigned long frag_len;
111	unsigned int is_ccs;	136	unsigned int is_ccs;
		137	struct dtls1_retransmit_state saved_retransmit_state;
112	};	138	};
113		139
114	struct ccs_header_st	140	struct ccs_header_st
Lines 168-173 Link Here
168		194
169	unsigned short handshake_read_seq;	195	unsigned short handshake_read_seq;
170		196
		197	/* save last sequence number for retransmissions */
		198	unsigned char last_write_sequence[8];
		199
171	/* Received handshake records (processed and unprocessed) */	200	/* Received handshake records (processed and unprocessed) */
172	record_pqueue unprocessed_rcds;	201	record_pqueue unprocessed_rcds;
173	record_pqueue processed_rcds;	202	record_pqueue processed_rcds;
Lines 178-190 Link Here
178	/* Buffered (sent) handshake records */	207	/* Buffered (sent) handshake records */
179	pqueue sent_messages;	208	pqueue sent_messages;
180		209
181	unsigned int mtu; /* max wire packet size */	210	/* Buffered application records.
		211	* Only for records between CCS and Finished
		212	* to prevent either protocol violation or
		213	* unnecessary message loss.
		214	*/
		215	record_pqueue buffered_app_data;
		216
		217	/* Is set when listening for new connections with dtls1_listen() */
		218	unsigned int listen;
		219
		220	unsigned int mtu; /* max DTLS packet size */
182		221
183	struct hm_header_st w_msg_hdr;	222	struct hm_header_st w_msg_hdr;
184	struct hm_header_st r_msg_hdr;	223	struct hm_header_st r_msg_hdr;
185		224
186	struct dtls1_timeout_st timeout;	225	struct dtls1_timeout_st timeout;
187		226
		227	/* Indicates when the last handshake msg sent will timeout */
		228	struct timeval next_timeout;
		229
		230	/* Timeout duration */
		231	unsigned short timeout_duration;
		232
188	/* storage for Alert/Handshake protocol data received but not	233	/* storage for Alert/Handshake protocol data received but not
189	* yet processed by ssl3_read_bytes: */	234	* yet processed by ssl3_read_bytes: */
190	unsigned char alert_fragment[DTLS1_AL_HEADER_LENGTH];	235	unsigned char alert_fragment[DTLS1_AL_HEADER_LENGTH];
Lines 193-198 Link Here
193	unsigned int handshake_fragment_len;	238	unsigned int handshake_fragment_len;
194		239
195	unsigned int retransmitting;	240	unsigned int retransmitting;
		241	unsigned int change_cipher_spec_ok;
196		242
197	} DTLS1_STATE;	243	} DTLS1_STATE;
198		244

Lines 339-347 Link Here

(-)include.l/openssl/engine.h (+3 lines)
339	void ENGINE_load_cryptodev(void);	339	void ENGINE_load_cryptodev(void);
340	void ENGINE_load_padlock(void);	340	void ENGINE_load_padlock(void);
341	void ENGINE_load_builtin_engines(void);	341	void ENGINE_load_builtin_engines(void);
		342	#ifdef OPENSSL_SYS_WIN32
342	#ifndef OPENSSL_NO_CAPIENG	343	#ifndef OPENSSL_NO_CAPIENG
343	void ENGINE_load_capi(void);	344	void ENGINE_load_capi(void);
344	#endif	345	#endif
		346	#endif
345		347
346	/* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation	348	/* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
347	* "registry" handling. */	349	* "registry" handling. */
Lines 767-772 Link Here
767	#define ENGINE_R_DSO_FAILURE 104	769	#define ENGINE_R_DSO_FAILURE 104
768	#define ENGINE_R_DSO_NOT_FOUND 132	770	#define ENGINE_R_DSO_NOT_FOUND 132
769	#define ENGINE_R_ENGINES_SECTION_ERROR 148	771	#define ENGINE_R_ENGINES_SECTION_ERROR 148
		772	#define ENGINE_R_ENGINE_CONFIGURATION_ERROR 101
770	#define ENGINE_R_ENGINE_IS_NOT_IN_LIST 105	773	#define ENGINE_R_ENGINE_IS_NOT_IN_LIST 105
771	#define ENGINE_R_ENGINE_SECTION_ERROR 149	774	#define ENGINE_R_ENGINE_SECTION_ERROR 149
772	#define ENGINE_R_FAILED_LOADING_PRIVATE_KEY 128	775	#define ENGINE_R_FAILED_LOADING_PRIVATE_KEY 128

Lines 678-705 Link Here

(-)include.l/openssl/safestack.h (-66 lines)
678	#define sk_ENGINE_CLEANUP_ITEM_sort(st) SKM_sk_sort(ENGINE_CLEANUP_ITEM, (st))	678	#define sk_ENGINE_CLEANUP_ITEM_sort(st) SKM_sk_sort(ENGINE_CLEANUP_ITEM, (st))
679	#define sk_ENGINE_CLEANUP_ITEM_is_sorted(st) SKM_sk_is_sorted(ENGINE_CLEANUP_ITEM, (st))	679	#define sk_ENGINE_CLEANUP_ITEM_is_sorted(st) SKM_sk_is_sorted(ENGINE_CLEANUP_ITEM, (st))
680		680
681	#define sk_EVP_PKEY_ASN1_METHOD_new(st) SKM_sk_new(EVP_PKEY_ASN1_METHOD, (st))
682	#define sk_EVP_PKEY_ASN1_METHOD_new_null() SKM_sk_new_null(EVP_PKEY_ASN1_METHOD)
683	#define sk_EVP_PKEY_ASN1_METHOD_free(st) SKM_sk_free(EVP_PKEY_ASN1_METHOD, (st))
684	#define sk_EVP_PKEY_ASN1_METHOD_num(st) SKM_sk_num(EVP_PKEY_ASN1_METHOD, (st))
685	#define sk_EVP_PKEY_ASN1_METHOD_value(st, i) SKM_sk_value(EVP_PKEY_ASN1_METHOD, (st), (i))
686	#define sk_EVP_PKEY_ASN1_METHOD_set(st, i, val) SKM_sk_set(EVP_PKEY_ASN1_METHOD, (st), (i), (val))
687	#define sk_EVP_PKEY_ASN1_METHOD_zero(st) SKM_sk_zero(EVP_PKEY_ASN1_METHOD, (st))
688	#define sk_EVP_PKEY_ASN1_METHOD_push(st, val) SKM_sk_push(EVP_PKEY_ASN1_METHOD, (st), (val))
689	#define sk_EVP_PKEY_ASN1_METHOD_unshift(st, val) SKM_sk_unshift(EVP_PKEY_ASN1_METHOD, (st), (val))
690	#define sk_EVP_PKEY_ASN1_METHOD_find(st, val) SKM_sk_find(EVP_PKEY_ASN1_METHOD, (st), (val))
691	#define sk_EVP_PKEY_ASN1_METHOD_find_ex(st, val) SKM_sk_find_ex(EVP_PKEY_ASN1_METHOD, (st), (val))
692	#define sk_EVP_PKEY_ASN1_METHOD_delete(st, i) SKM_sk_delete(EVP_PKEY_ASN1_METHOD, (st), (i))
693	#define sk_EVP_PKEY_ASN1_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PKEY_ASN1_METHOD, (st), (ptr))
694	#define sk_EVP_PKEY_ASN1_METHOD_insert(st, val, i) SKM_sk_insert(EVP_PKEY_ASN1_METHOD, (st), (val), (i))
695	#define sk_EVP_PKEY_ASN1_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PKEY_ASN1_METHOD, (st), (cmp))
696	#define sk_EVP_PKEY_ASN1_METHOD_dup(st) SKM_sk_dup(EVP_PKEY_ASN1_METHOD, st)
697	#define sk_EVP_PKEY_ASN1_METHOD_pop_free(st, free_func) SKM_sk_pop_free(EVP_PKEY_ASN1_METHOD, (st), (free_func))
698	#define sk_EVP_PKEY_ASN1_METHOD_shift(st) SKM_sk_shift(EVP_PKEY_ASN1_METHOD, (st))
699	#define sk_EVP_PKEY_ASN1_METHOD_pop(st) SKM_sk_pop(EVP_PKEY_ASN1_METHOD, (st))
700	#define sk_EVP_PKEY_ASN1_METHOD_sort(st) SKM_sk_sort(EVP_PKEY_ASN1_METHOD, (st))
701	#define sk_EVP_PKEY_ASN1_METHOD_is_sorted(st) SKM_sk_is_sorted(EVP_PKEY_ASN1_METHOD, (st))
702
703	#define sk_GENERAL_NAME_new(st) SKM_sk_new(GENERAL_NAME, (st))	681	#define sk_GENERAL_NAME_new(st) SKM_sk_new(GENERAL_NAME, (st))
704	#define sk_GENERAL_NAME_new_null() SKM_sk_new_null(GENERAL_NAME)	682	#define sk_GENERAL_NAME_new_null() SKM_sk_new_null(GENERAL_NAME)
705	#define sk_GENERAL_NAME_free(st) SKM_sk_free(GENERAL_NAME, (st))	683	#define sk_GENERAL_NAME_free(st) SKM_sk_free(GENERAL_NAME, (st))
Lines 1008-1057 Link Here
1008	#define sk_MIME_HEADER_sort(st) SKM_sk_sort(MIME_HEADER, (st))	986	#define sk_MIME_HEADER_sort(st) SKM_sk_sort(MIME_HEADER, (st))
1009	#define sk_MIME_HEADER_is_sorted(st) SKM_sk_is_sorted(MIME_HEADER, (st))	987	#define sk_MIME_HEADER_is_sorted(st) SKM_sk_is_sorted(MIME_HEADER, (st))
1010		988
1011	#define sk_MIME_HEADER_new(st) SKM_sk_new(MIME_HEADER, (st))
1012	#define sk_MIME_HEADER_new_null() SKM_sk_new_null(MIME_HEADER)
1013	#define sk_MIME_HEADER_free(st) SKM_sk_free(MIME_HEADER, (st))
1014	#define sk_MIME_HEADER_num(st) SKM_sk_num(MIME_HEADER, (st))
1015	#define sk_MIME_HEADER_value(st, i) SKM_sk_value(MIME_HEADER, (st), (i))
1016	#define sk_MIME_HEADER_set(st, i, val) SKM_sk_set(MIME_HEADER, (st), (i), (val))
1017	#define sk_MIME_HEADER_zero(st) SKM_sk_zero(MIME_HEADER, (st))
1018	#define sk_MIME_HEADER_push(st, val) SKM_sk_push(MIME_HEADER, (st), (val))
1019	#define sk_MIME_HEADER_unshift(st, val) SKM_sk_unshift(MIME_HEADER, (st), (val))
1020	#define sk_MIME_HEADER_find(st, val) SKM_sk_find(MIME_HEADER, (st), (val))
1021	#define sk_MIME_HEADER_find_ex(st, val) SKM_sk_find_ex(MIME_HEADER, (st), (val))
1022	#define sk_MIME_HEADER_delete(st, i) SKM_sk_delete(MIME_HEADER, (st), (i))
1023	#define sk_MIME_HEADER_delete_ptr(st, ptr) SKM_sk_delete_ptr(MIME_HEADER, (st), (ptr))
1024	#define sk_MIME_HEADER_insert(st, val, i) SKM_sk_insert(MIME_HEADER, (st), (val), (i))
1025	#define sk_MIME_HEADER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MIME_HEADER, (st), (cmp))
1026	#define sk_MIME_HEADER_dup(st) SKM_sk_dup(MIME_HEADER, st)
1027	#define sk_MIME_HEADER_pop_free(st, free_func) SKM_sk_pop_free(MIME_HEADER, (st), (free_func))
1028	#define sk_MIME_HEADER_shift(st) SKM_sk_shift(MIME_HEADER, (st))
1029	#define sk_MIME_HEADER_pop(st) SKM_sk_pop(MIME_HEADER, (st))
1030	#define sk_MIME_HEADER_sort(st) SKM_sk_sort(MIME_HEADER, (st))
1031	#define sk_MIME_HEADER_is_sorted(st) SKM_sk_is_sorted(MIME_HEADER, (st))
1032
1033	#define sk_MIME_PARAM_new(st) SKM_sk_new(MIME_PARAM, (st))
1034	#define sk_MIME_PARAM_new_null() SKM_sk_new_null(MIME_PARAM)
1035	#define sk_MIME_PARAM_free(st) SKM_sk_free(MIME_PARAM, (st))
1036	#define sk_MIME_PARAM_num(st) SKM_sk_num(MIME_PARAM, (st))
1037	#define sk_MIME_PARAM_value(st, i) SKM_sk_value(MIME_PARAM, (st), (i))
1038	#define sk_MIME_PARAM_set(st, i, val) SKM_sk_set(MIME_PARAM, (st), (i), (val))
1039	#define sk_MIME_PARAM_zero(st) SKM_sk_zero(MIME_PARAM, (st))
1040	#define sk_MIME_PARAM_push(st, val) SKM_sk_push(MIME_PARAM, (st), (val))
1041	#define sk_MIME_PARAM_unshift(st, val) SKM_sk_unshift(MIME_PARAM, (st), (val))
1042	#define sk_MIME_PARAM_find(st, val) SKM_sk_find(MIME_PARAM, (st), (val))
1043	#define sk_MIME_PARAM_find_ex(st, val) SKM_sk_find_ex(MIME_PARAM, (st), (val))
1044	#define sk_MIME_PARAM_delete(st, i) SKM_sk_delete(MIME_PARAM, (st), (i))
1045	#define sk_MIME_PARAM_delete_ptr(st, ptr) SKM_sk_delete_ptr(MIME_PARAM, (st), (ptr))
1046	#define sk_MIME_PARAM_insert(st, val, i) SKM_sk_insert(MIME_PARAM, (st), (val), (i))
1047	#define sk_MIME_PARAM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MIME_PARAM, (st), (cmp))
1048	#define sk_MIME_PARAM_dup(st) SKM_sk_dup(MIME_PARAM, st)
1049	#define sk_MIME_PARAM_pop_free(st, free_func) SKM_sk_pop_free(MIME_PARAM, (st), (free_func))
1050	#define sk_MIME_PARAM_shift(st) SKM_sk_shift(MIME_PARAM, (st))
1051	#define sk_MIME_PARAM_pop(st) SKM_sk_pop(MIME_PARAM, (st))
1052	#define sk_MIME_PARAM_sort(st) SKM_sk_sort(MIME_PARAM, (st))
1053	#define sk_MIME_PARAM_is_sorted(st) SKM_sk_is_sorted(MIME_PARAM, (st))
1054
1055	#define sk_MIME_PARAM_new(st) SKM_sk_new(MIME_PARAM, (st))	989	#define sk_MIME_PARAM_new(st) SKM_sk_new(MIME_PARAM, (st))
1056	#define sk_MIME_PARAM_new_null() SKM_sk_new_null(MIME_PARAM)	990	#define sk_MIME_PARAM_new_null() SKM_sk_new_null(MIME_PARAM)
1057	#define sk_MIME_PARAM_free(st) SKM_sk_free(MIME_PARAM, (st))	991	#define sk_MIME_PARAM_free(st) SKM_sk_free(MIME_PARAM, (st))

Lines 115-120 Link Here

(-)include.l/openssl/tls1.h (-2 / +5 lines)
115	#define TLSEXT_TYPE_ec_point_formats 11	115	#define TLSEXT_TYPE_ec_point_formats 11
116	#define TLSEXT_TYPE_session_ticket 35	116	#define TLSEXT_TYPE_session_ticket 35
117		117
		118	/* Temporary extension type */
		119	#define TLSEXT_TYPE_renegotiate 0xff01
		120
118	/* NameType value from RFC 3546 */	121	/* NameType value from RFC 3546 */
119	#define TLSEXT_NAMETYPE_host_name 0	122	#define TLSEXT_NAMETYPE_host_name 0
120	/* status request value from RFC 3546 */	123	/* status request value from RFC 3546 */
Lines 169-177 Link Here
169	SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG,0, (void *)arg)	172	SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG,0, (void *)arg)
170		173
171	#define SSL_CTX_get_tlsext_ticket_keys(ctx, keys, keylen) \	174	#define SSL_CTX_get_tlsext_ticket_keys(ctx, keys, keylen) \
172	SSL_CTX_ctrl((ctx),SSL_CTRL_GET_TLXEXT_TICKET_KEYS,(keylen),(keys))	175	SSL_CTX_ctrl((ctx),SSL_CTRL_GET_TLSEXT_TICKET_KEYS,(keylen),(keys))
173	#define SSL_CTX_set_tlsext_ticket_keys(ctx, keys, keylen) \	176	#define SSL_CTX_set_tlsext_ticket_keys(ctx, keys, keylen) \
174	SSL_CTX_ctrl((ctx),SSL_CTRL_SET_TLXEXT_TICKET_KEYS,(keylen),(keys))	177	SSL_CTX_ctrl((ctx),SSL_CTRL_SET_TLSEXT_TICKET_KEYS,(keylen),(keys))
175		178
176	#define SSL_CTX_set_tlsext_status_cb(ssl, cb) \	179	#define SSL_CTX_set_tlsext_status_cb(ssl, cb) \
177	SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB,(void (*)(void))cb)	180	SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB,(void (*)(void))cb)