Commit 9c6c8c55 authored by kelsey's avatar kelsey
Browse files

Further progress based on the v0.1.0 draft.

parent 6a450c9b

crypto/err/openssl.txt

+24 −0
Original line number Diff line number Diff line
@@ -1351,7 +1351,10 @@ SSL_F_TLMSP_CHECK_READER_MAC:642:tlmsp_check_reader_mac 
SSL_F_TLMSP_CONSTRUCT_CTOS_TLMSP:643:tlmsp_construct_ctos_tlmsp

SSL_F_TLMSP_CONSTRUCT_CTOS_TLMSP_CONTEXT_LIST:644:\

	tlmsp_construct_ctos_tlmsp_context_list

SSL_F_TLMSP_CONSTRUCT_KEY_MATERIAL_CONTRIBUTION:711:\

	tlmsp_construct_key_material_contribution

SSL_F_TLMSP_CONSTRUCT_MIDDLEBOX_CERT:691:tlmsp_construct_middlebox_cert

SSL_F_TLMSP_CONSTRUCT_MIDDLEBOX_FINISHED:716:tlmsp_construct_middlebox_finished

SSL_F_TLMSP_CONSTRUCT_MIDDLEBOX_HELLO:688:tlmsp_construct_middlebox_hello

SSL_F_TLMSP_CONSTRUCT_MIDDLEBOX_KEY_CONFIRMATION:696:\

	tlmsp_construct_middlebox_key_confirmation
@@ -1374,33 +1377,53 @@ SSL_F_TLMSP_ENC:655:tlmsp_enc 
SSL_F_TLMSP_GENERATE_MASTER_SECRET:656:tlmsp_generate_master_secret

SSL_F_TLMSP_GENERATE_MIDDLEBOX_MASTER_SECRET:699:\

	tlmsp_generate_middlebox_master_secret

SSL_F_TLMSP_GET_MIDDLEBOXES_INSTANCE:719:TLMSP_get_middleboxes_instance

SSL_F_TLMSP_HASH_IDLIST:657:tlmsp_hash_idlist

SSL_F_TLMSP_KEY_ACTIVATE_ALL:658:tlmsp_key_activate_all

SSL_F_TLMSP_MAC:659:tlmsp_mac

SSL_F_TLMSP_MAC_INPUT:660:tlmsp_mac_input

SSL_F_TLMSP_MIDDLEBOX_ADD:661:TLMSP_middlebox_add

SSL_F_TLMSP_MIDDLEBOX_COPY:707:tlmsp_middlebox_copy

SSL_F_TLMSP_MIDDLEBOX_CREATE:662:tlmsp_middlebox_create

SSL_F_TLMSP_MIDDLEBOX_DUP:708:tlmsp_middlebox_dup

SSL_F_TLMSP_MIDDLEBOX_HANDSHAKE_PROCESS:663:tlmsp_middlebox_handshake_process

SSL_F_TLMSP_MIDDLEBOX_INSTANCE_COPY:710:tlmsp_middlebox_instance_copy

SSL_F_TLMSP_MIDDLEBOX_INSTANCE_DUP:709:tlmsp_middlebox_instance_dup

SSL_F_TLMSP_MIDDLEBOX_PARSE_CTOS_SIG_ALGS:704:\

	tlmsp_middlebox_parse_ctos_sig_algs

SSL_F_TLMSP_MIDDLEBOX_POST_WRITE_CHANGE_CIPHER_SPEC:700:\

	tlmsp_middlebox_post_write_change_cipher_spec

SSL_F_TLMSP_MIDDLEBOX_PROCESS_CHANGE_CIPHER_SPEC:701:\

	tlmsp_middlebox_process_change_cipher_spec

SSL_F_TLMSP_MIDDLEBOX_PROCESS_CLIENT_HELLO:684:\

	tlmsp_middlebox_process_client_hello

SSL_F_TLMSP_MIDDLEBOX_PROCESS_MIDDLEBOX_FINISHED:717:\

	tlmsp_middlebox_process_middlebox_finished

SSL_F_TLMSP_MIDDLEBOX_PROCESS_MIDDLEBOX_HELLO:714:\

	tlmsp_middlebox_process_middlebox_hello

SSL_F_TLMSP_MIDDLEBOX_PROCESS_MIDDLEBOX_HELLO_DONE:702:\

	tlmsp_middlebox_process_middlebox_hello_done

SSL_F_TLMSP_MIDDLEBOX_PROCESS_MIDDLEBOX_KEY_MATERIAL:715:\

	tlmsp_middlebox_process_middlebox_key_material

SSL_F_TLMSP_MIDDLEBOX_PROCESS_SERVER_HELLO:686:\

	tlmsp_middlebox_process_server_hello

SSL_F_TLMSP_MIDDLEBOX_SEND_MIDDLEBOX_HELLO:687:\

	tlmsp_middlebox_send_middlebox_hello

SSL_F_TLMSP_MIDDLEBOX_SEND_MIDDLEBOX_KEY_CONFIRMATION:698:\

	tlmsp_middlebox_send_middlebox_key_confirmation

SSL_F_TLMSP_MIDDLEBOX_VERIFY_CERTIFICATE:705:tlmsp_middlebox_verify_certificate

SSL_F_TLMSP_PARSE_CONTEXT_LIST:664:tlmsp_parse_context_list

SSL_F_TLMSP_PARSE_CTOS_TLMSP:665:tlmsp_parse_ctos_tlmsp

SSL_F_TLMSP_PARSE_CTOS_TLMSP_CONTEXT_LIST:666:\

	tlmsp_parse_ctos_tlmsp_context_list

SSL_F_TLMSP_PARSE_MIDDLEBOX_LIST:685:tlmsp_parse_middlebox_list

SSL_F_TLMSP_PARSE_STOC_TLMSP:667:tlmsp_parse_stoc_tlmsp

SSL_F_TLMSP_PROCESS_CERTIFICATE:713:tlmsp_process_certificate

SSL_F_TLMSP_PROCESS_CLIENT_KEY_EXCHANGE:706:tlmsp_process_client_key_exchange

SSL_F_TLMSP_PROCESS_KEY_MATERIAL_CONTRIBUTION:712:\

	tlmsp_process_key_material_contribution

SSL_F_TLMSP_PROCESS_MIDDLEBOX_CERT:703:tlmsp_process_middlebox_cert

SSL_F_TLMSP_PROCESS_MIDDLEBOX_FINISHED:718:tlmsp_process_middlebox_finished

SSL_F_TLMSP_PROCESS_MIDDLEBOX_HELLO:689:tlmsp_process_middlebox_hello

SSL_F_TLMSP_PROCESS_MIDDLEBOX_HELLO_DONE:695:tlmsp_process_middlebox_hello_done

SSL_F_TLMSP_PROCESS_MIDDLEBOX_KEY_CONFIRMATION:697:\
@@ -1411,6 +1434,7 @@ SSL_F_TLMSP_PROCESS_MIDDLEBOX_KEY_MATERIAL:668:\ 
	tlmsp_process_middlebox_key_material

SSL_F_TLMSP_PROCESS_SERVER_KEY_EXCHANGE:694:tlmsp_process_server_key_exchange

SSL_F_TLMSP_READ_BYTES:669:tlmsp_read_bytes

SSL_F_TLMSP_READ_CONTAINER:720:tlmsp_read_container

SSL_F_TLMSP_READ_FORWARDING_MAC:670:tlmsp_read_forwarding_mac

SSL_F_TLMSP_READ_FORWARDING_MACS:671:tlmsp_read_forwarding_macs

SSL_F_TLMSP_READ_FRAGMENT:672:tlmsp_read_fragment

include/openssl/opensslv.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ extern "C" { 
 *  major minor fix final patch/beta)

 */

# define OPENSSL_VERSION_NUMBER  0x1010101fL

# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1a  20 Nov 2018"

# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1a  20 Nov 2018 +TLMSP"



/*-

 * The macros below are to be used for shared library (.so, .dll, ...)

include/openssl/ssl.h

+4 −0
Original line number Diff line number Diff line
@@ -1051,6 +1051,10 @@ typedef enum { 
    TLMSP_ST_CR_MB_HELLO_DONE,

    TLMSP_ST_SR_MB_KEY_CONFIRM,

    TLMSP_ST_CR_MB_KEY_CONFIRM,

    TLMSP_ST_CW_MB_FIN,

    TLMSP_ST_SR_MB_FIN,

    TLMSP_ST_SW_MB_FIN,

    TLMSP_ST_CR_MB_FIN,

} OSSL_HANDSHAKE_STATE;



/*

include/openssl/ssl3.h

+1 −5
Original line number Diff line number Diff line
@@ -181,11 +181,7 @@ extern "C" { 
#  define SSL3_RT_MAX_PLAIN_LENGTH               65535

# endif

/* Maximum compression overhead: defined by SSL/TLS standards */

# if 0

# define SSL3_RT_MAX_COMPRESSED_OVERHEAD         1024

# else

#  define SSL3_RT_MAX_COMPRESSED_OVERHEAD        4096

# endif



/*

 * The standards give a maximum encryption overhead of 1024 bytes. In

include/openssl/sslerr.h

+18 −0
Original line number Diff line number Diff line
@@ -262,7 +262,9 @@ int ERR_load_SSL_strings(void); 
# define SSL_F_TLMSP_CHECK_READER_MAC                     642

# define SSL_F_TLMSP_CONSTRUCT_CTOS_TLMSP                 643

# define SSL_F_TLMSP_CONSTRUCT_CTOS_TLMSP_CONTEXT_LIST    644

# define SSL_F_TLMSP_CONSTRUCT_KEY_MATERIAL_CONTRIBUTION  711

# define SSL_F_TLMSP_CONSTRUCT_MIDDLEBOX_CERT             691

# define SSL_F_TLMSP_CONSTRUCT_MIDDLEBOX_FINISHED         716

# define SSL_F_TLMSP_CONSTRUCT_MIDDLEBOX_HELLO            688

# define SSL_F_TLMSP_CONSTRUCT_MIDDLEBOX_KEY_CONFIRMATION 696

# define SSL_F_TLMSP_CONSTRUCT_MIDDLEBOX_KEY_EXCHANGE     690
@@ -280,25 +282,40 @@ int ERR_load_SSL_strings(void); 
# define SSL_F_TLMSP_ENC                                  655

# define SSL_F_TLMSP_GENERATE_MASTER_SECRET               656

# define SSL_F_TLMSP_GENERATE_MIDDLEBOX_MASTER_SECRET     699

# define SSL_F_TLMSP_GET_MIDDLEBOXES_INSTANCE             719

# define SSL_F_TLMSP_HASH_IDLIST                          657

# define SSL_F_TLMSP_KEY_ACTIVATE_ALL                     658

# define SSL_F_TLMSP_MAC                                  659

# define SSL_F_TLMSP_MAC_INPUT                            660

# define SSL_F_TLMSP_MIDDLEBOX_ADD                        661

# define SSL_F_TLMSP_MIDDLEBOX_COPY                       707

# define SSL_F_TLMSP_MIDDLEBOX_CREATE                     662

# define SSL_F_TLMSP_MIDDLEBOX_DUP                        708

# define SSL_F_TLMSP_MIDDLEBOX_HANDSHAKE_PROCESS          663

# define SSL_F_TLMSP_MIDDLEBOX_INSTANCE_COPY              710

# define SSL_F_TLMSP_MIDDLEBOX_INSTANCE_DUP               709

# define SSL_F_TLMSP_MIDDLEBOX_PARSE_CTOS_SIG_ALGS        704

# define SSL_F_TLMSP_MIDDLEBOX_POST_WRITE_CHANGE_CIPHER_SPEC 700

# define SSL_F_TLMSP_MIDDLEBOX_PROCESS_CHANGE_CIPHER_SPEC 701

# define SSL_F_TLMSP_MIDDLEBOX_PROCESS_CLIENT_HELLO       684

# define SSL_F_TLMSP_MIDDLEBOX_PROCESS_MIDDLEBOX_FINISHED 717

# define SSL_F_TLMSP_MIDDLEBOX_PROCESS_MIDDLEBOX_HELLO    714

# define SSL_F_TLMSP_MIDDLEBOX_PROCESS_MIDDLEBOX_HELLO_DONE 702

# define SSL_F_TLMSP_MIDDLEBOX_PROCESS_MIDDLEBOX_KEY_MATERIAL 715

# define SSL_F_TLMSP_MIDDLEBOX_PROCESS_SERVER_HELLO       686

# define SSL_F_TLMSP_MIDDLEBOX_SEND_MIDDLEBOX_HELLO       687

# define SSL_F_TLMSP_MIDDLEBOX_SEND_MIDDLEBOX_KEY_CONFIRMATION 698

# define SSL_F_TLMSP_MIDDLEBOX_VERIFY_CERTIFICATE         705

# define SSL_F_TLMSP_PARSE_CONTEXT_LIST                   664

# define SSL_F_TLMSP_PARSE_CTOS_TLMSP                     665

# define SSL_F_TLMSP_PARSE_CTOS_TLMSP_CONTEXT_LIST        666

# define SSL_F_TLMSP_PARSE_MIDDLEBOX_LIST                 685

# define SSL_F_TLMSP_PARSE_STOC_TLMSP                     667

# define SSL_F_TLMSP_PROCESS_CERTIFICATE                  713

# define SSL_F_TLMSP_PROCESS_CLIENT_KEY_EXCHANGE          706

# define SSL_F_TLMSP_PROCESS_KEY_MATERIAL_CONTRIBUTION    712

# define SSL_F_TLMSP_PROCESS_MIDDLEBOX_CERT               703

# define SSL_F_TLMSP_PROCESS_MIDDLEBOX_FINISHED           718

# define SSL_F_TLMSP_PROCESS_MIDDLEBOX_HELLO              689

# define SSL_F_TLMSP_PROCESS_MIDDLEBOX_HELLO_DONE         695

# define SSL_F_TLMSP_PROCESS_MIDDLEBOX_KEY_CONFIRMATION   697
@@ -306,6 +323,7 @@ int ERR_load_SSL_strings(void); 
# define SSL_F_TLMSP_PROCESS_MIDDLEBOX_KEY_MATERIAL       668

# define SSL_F_TLMSP_PROCESS_SERVER_KEY_EXCHANGE          694

# define SSL_F_TLMSP_READ_BYTES                           669

# define SSL_F_TLMSP_READ_CONTAINER                       720

# define SSL_F_TLMSP_READ_FORWARDING_MAC                  670

# define SSL_F_TLMSP_READ_FORWARDING_MACS                 671

# define SSL_F_TLMSP_READ_FRAGMENT                        672