X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=include%2Fopenssl%2Fssl3.h;h=0bdd7ed3765099dda7fb52a3819628efdf994d5c;hp=bfb2c2dbd6cd143da0881b6a9fd0c9ca497a291d;hb=970f467ac32af4fb5680eb5bc845f35618468bed;hpb=c64359db8af1bf759f4496a01c93bac658decc7e diff --git a/include/openssl/ssl3.h b/include/openssl/ssl3.h index bfb2c2dbd6..0bdd7ed376 100644 --- a/include/openssl/ssl3.h +++ b/include/openssl/ssl3.h @@ -1,125 +1,17 @@ -/* ssl/ssl3.h */ -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ -/* ==================================================================== - * Copyright (c) 1998-2002 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 - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). +/* + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * - */ -/* ==================================================================== - * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. - * ECC cipher suite support in OpenSSL originally developed by - * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project. + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html */ #ifndef HEADER_SSL3_H # define HEADER_SSL3_H -# ifndef OPENSSL_NO_COMP -# include -# endif +# include # include # include # include @@ -273,7 +165,8 @@ extern "C" { * practice the value is lower than this. The overhead is the maximum number * of padding bytes (256) plus the mac size. */ -# define SSL3_RT_MAX_ENCRYPTED_OVERHEAD (256 + SSL3_RT_MAX_MD_SIZE) +# define SSL3_RT_MAX_ENCRYPTED_OVERHEAD (256 + SSL3_RT_MAX_MD_SIZE) +# define SSL3_RT_MAX_TLS13_ENCRYPTED_OVERHEAD 256 /* * OpenSSL currently only uses a padding length of at most one block so the @@ -289,12 +182,14 @@ extern "C" { # define SSL3_RT_MAX_COMPRESSED_LENGTH SSL3_RT_MAX_PLAIN_LENGTH # else # define SSL3_RT_MAX_COMPRESSED_LENGTH \ - (SSL3_RT_MAX_PLAIN_LENGTH+SSL3_RT_MAX_COMPRESSED_OVERHEAD) + (SSL3_RT_MAX_PLAIN_LENGTH+SSL3_RT_MAX_COMPRESSED_OVERHEAD) # endif # define SSL3_RT_MAX_ENCRYPTED_LENGTH \ - (SSL3_RT_MAX_ENCRYPTED_OVERHEAD+SSL3_RT_MAX_COMPRESSED_LENGTH) + (SSL3_RT_MAX_ENCRYPTED_OVERHEAD+SSL3_RT_MAX_COMPRESSED_LENGTH) +# define SSL3_RT_MAX_TLS13_ENCRYPTED_LENGTH \ + (SSL3_RT_MAX_PLAIN_LENGTH + SSL3_RT_MAX_TLS13_ENCRYPTED_OVERHEAD) # define SSL3_RT_MAX_PACKET_SIZE \ - (SSL3_RT_MAX_ENCRYPTED_LENGTH+SSL3_RT_HEADER_LENGTH) + (SSL3_RT_MAX_ENCRYPTED_LENGTH+SSL3_RT_HEADER_LENGTH) # define SSL3_MD_CLIENT_FINISHED_CONST "\x43\x4C\x4E\x54" # define SSL3_MD_SERVER_FINISHED_CONST "\x53\x52\x56\x52" @@ -307,7 +202,7 @@ extern "C" { # define SSL3_RT_ALERT 21 # define SSL3_RT_HANDSHAKE 22 # define SSL3_RT_APPLICATION_DATA 23 -# define TLS1_RT_HEARTBEAT 24 +# define DTLS1_RT_HEARTBEAT 24 /* Pseudo content types to indicate additional parameters */ # define TLS1_RT_CRYPTO 0x1000 @@ -323,8 +218,9 @@ extern "C" { # define TLS1_RT_CRYPTO_IV (TLS1_RT_CRYPTO | 0x7) # define TLS1_RT_CRYPTO_FIXED_IV (TLS1_RT_CRYPTO | 0x8) -/* Pseudo content type for SSL/TLS header info */ +/* Pseudo content types for SSL/TLS header info */ # define SSL3_RT_HEADER 0x100 +# define SSL3_RT_INNER_CONTENT_TYPE 0x101 # define SSL3_AL_WARNING 1 # define SSL3_AL_FATAL 2 @@ -359,6 +255,7 @@ extern "C" { */ # define SSL3_CT_NUMBER 9 +/* No longer used as of OpenSSL 1.1.1 */ # define SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS 0x0001 /* Removed from OpenSSL 1.1.0 */ @@ -367,125 +264,21 @@ extern "C" { # define TLS1_FLAGS_SKIP_CERT_VERIFY 0x0010 /* Set if we encrypt then mac instead of usual mac then encrypt */ -# define TLS1_FLAGS_ENCRYPT_THEN_MAC 0x0100 +# define TLS1_FLAGS_ENCRYPT_THEN_MAC_READ 0x0100 +# define TLS1_FLAGS_ENCRYPT_THEN_MAC TLS1_FLAGS_ENCRYPT_THEN_MAC_READ +/* Set if extended master secret extension received from peer */ +# define TLS1_FLAGS_RECEIVED_EXTMS 0x0200 -/* SSLv3 */ -/* - * The following states are no longer used and are defined to be the closest - * equivalent value in the current state machine code. Not all defines have an - * equivalent and are set to a dummy value (-1). - */ -/* - * client - */ -/* extra state */ -# define SSL3_ST_CW_FLUSH (-1) -# ifndef OPENSSL_NO_SCTP -# define DTLS1_SCTP_ST_CW_WRITE_SOCK (-1) -# define DTLS1_SCTP_ST_CR_READ_SOCK (-1) -# endif -/* write to server */ -# define SSL3_ST_CW_CLNT_HELLO_A TLS_ST_CW_CLNT_HELLO -# define SSL3_ST_CW_CLNT_HELLO_B TLS_ST_CW_CLNT_HELLO -/* read from server */ -# define SSL3_ST_CR_SRVR_HELLO_A TLS_ST_CR_SRVR_HELLO -# define SSL3_ST_CR_SRVR_HELLO_B TLS_ST_CR_SRVR_HELLO -# define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A DTLS_ST_CR_HELLO_VERIFY_REQUEST -# define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B DTLS_ST_CR_HELLO_VERIFY_REQUEST -# define SSL3_ST_CR_CERT_A TLS_ST_CR_CERT -# define SSL3_ST_CR_CERT_B TLS_ST_CR_CERT -# define SSL3_ST_CR_KEY_EXCH_A TLS_ST_CR_KEY_EXCH -# define SSL3_ST_CR_KEY_EXCH_B TLS_ST_CR_KEY_EXCH -# define SSL3_ST_CR_CERT_REQ_A TLS_ST_CR_CERT_REQ -# define SSL3_ST_CR_CERT_REQ_B TLS_ST_CR_CERT_REQ -# define SSL3_ST_CR_SRVR_DONE_A TLS_ST_CR_SRVR_DONE -# define SSL3_ST_CR_SRVR_DONE_B TLS_ST_CR_SRVR_DONE -/* write to server */ -# define SSL3_ST_CW_CERT_A TLS_ST_CW_CERT -# define SSL3_ST_CW_CERT_B TLS_ST_CW_CERT -# define SSL3_ST_CW_CERT_C TLS_ST_CW_CERT -# define SSL3_ST_CW_CERT_D TLS_ST_CW_CERT -# define SSL3_ST_CW_KEY_EXCH_A TLS_ST_CW_KEY_EXCH -# define SSL3_ST_CW_KEY_EXCH_B TLS_ST_CW_KEY_EXCH -# define SSL3_ST_CW_CERT_VRFY_A TLS_ST_CW_CERT_VRFY -# define SSL3_ST_CW_CERT_VRFY_B TLS_ST_CW_CERT_VRFY -# define SSL3_ST_CW_CHANGE_A TLS_ST_CW_CHANGE -# define SSL3_ST_CW_CHANGE_B TLS_ST_CW_CHANGE -# ifndef OPENSSL_NO_NEXTPROTONEG -# define SSL3_ST_CW_NEXT_PROTO_A TLS_ST_CW_NEXT_PROTO -# define SSL3_ST_CW_NEXT_PROTO_B TLS_ST_CW_NEXT_PROTO -# endif -# define SSL3_ST_CW_FINISHED_A TLS_ST_CW_FINISHED -# define SSL3_ST_CW_FINISHED_B TLS_ST_CW_FINISHED -/* read from server */ -# define SSL3_ST_CR_CHANGE_A TLS_ST_CR_CHANGE -# define SSL3_ST_CR_CHANGE_B TLS_ST_CR_CHANGE -# define SSL3_ST_CR_FINISHED_A TLS_ST_CR_FINISHED -# define SSL3_ST_CR_FINISHED_B TLS_ST_CR_FINISHED -# define SSL3_ST_CR_SESSION_TICKET_A TLS_ST_CR_SESSION_TICKET -# define SSL3_ST_CR_SESSION_TICKET_B TLS_ST_CR_SESSION_TICKET -# define SSL3_ST_CR_CERT_STATUS_A TLS_ST_CR_CERT_STATUS -# define SSL3_ST_CR_CERT_STATUS_B TLS_ST_CR_CERT_STATUS - -/* server */ -/* extra state */ -# define SSL3_ST_SW_FLUSH (-1) -# ifndef OPENSSL_NO_SCTP -# define DTLS1_SCTP_ST_SW_WRITE_SOCK (-1) -# define DTLS1_SCTP_ST_SR_READ_SOCK (-1) -# endif -/* read from client */ -/* Do not change the number values, they do matter */ -# define SSL3_ST_SR_CLNT_HELLO_A TLS_ST_SR_CLNT_HELLO -# define SSL3_ST_SR_CLNT_HELLO_B TLS_ST_SR_CLNT_HELLO -# define SSL3_ST_SR_CLNT_HELLO_C TLS_ST_SR_CLNT_HELLO -# define SSL3_ST_SR_CLNT_HELLO_D TLS_ST_SR_CLNT_HELLO -/* write to client */ -# define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A DTLS_ST_SW_HELLO_VERIFY_REQUEST -# define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B DTLS_ST_SW_HELLO_VERIFY_REQUEST -# define SSL3_ST_SW_HELLO_REQ_A TLS_ST_SW_HELLO_REQ -# define SSL3_ST_SW_HELLO_REQ_B TLS_ST_SW_HELLO_REQ -# define SSL3_ST_SW_HELLO_REQ_C TLS_ST_SW_HELLO_REQ -# define SSL3_ST_SW_SRVR_HELLO_A TLS_ST_SW_SRVR_HELLO -# define SSL3_ST_SW_SRVR_HELLO_B TLS_ST_SW_SRVR_HELLO -# define SSL3_ST_SW_CERT_A TLS_ST_SW_CERT -# define SSL3_ST_SW_CERT_B TLS_ST_SW_CERT -# define SSL3_ST_SW_KEY_EXCH_A TLS_ST_SW_KEY_EXCH -# define SSL3_ST_SW_KEY_EXCH_B TLS_ST_SW_KEY_EXCH -# define SSL3_ST_SW_CERT_REQ_A TLS_ST_SW_CERT_REQ -# define SSL3_ST_SW_CERT_REQ_B TLS_ST_SW_CERT_REQ -# define SSL3_ST_SW_SRVR_DONE_A TLS_ST_SW_SRVR_DONE -# define SSL3_ST_SW_SRVR_DONE_B TLS_ST_SW_SRVR_DONE -/* read from client */ -# define SSL3_ST_SR_CERT_A TLS_ST_SR_CERT -# define SSL3_ST_SR_CERT_B TLS_ST_SR_CERT -# define SSL3_ST_SR_KEY_EXCH_A TLS_ST_SR_KEY_EXCH -# define SSL3_ST_SR_KEY_EXCH_B TLS_ST_SR_KEY_EXCH -# define SSL3_ST_SR_CERT_VRFY_A TLS_ST_SR_CERT_VRFY -# define SSL3_ST_SR_CERT_VRFY_B TLS_ST_SR_CERT_VRFY -# define SSL3_ST_SR_CHANGE_A TLS_ST_SR_CHANGE -# define SSL3_ST_SR_CHANGE_B TLS_ST_SR_CHANGE -# ifndef OPENSSL_NO_NEXTPROTONEG -# define SSL3_ST_SR_NEXT_PROTO_A TLS_ST_SR_NEXT_PROTO -# define SSL3_ST_SR_NEXT_PROTO_B TLS_ST_SR_NEXT_PROTO -# endif -# define SSL3_ST_SR_FINISHED_A TLS_ST_SR_FINISHED -# define SSL3_ST_SR_FINISHED_B TLS_ST_SR_FINISHED -/* write to client */ -# define SSL3_ST_SW_CHANGE_A TLS_ST_SW_CHANGE -# define SSL3_ST_SW_CHANGE_B TLS_ST_SW_CHANGE -# define SSL3_ST_SW_FINISHED_A TLS_ST_SW_FINISHED -# define SSL3_ST_SW_FINISHED_B TLS_ST_SW_FINISHED -# define SSL3_ST_SW_SESSION_TICKET_A TLS_ST_SW_SESSION_TICKET -# define SSL3_ST_SW_SESSION_TICKET_B TLS_ST_SW_SESSION_TICKET -# define SSL3_ST_SW_CERT_STATUS_A TLS_ST_SW_CERT_STATUS -# define SSL3_ST_SW_CERT_STATUS_B TLS_ST_SW_CERT_STATUS +# define TLS1_FLAGS_ENCRYPT_THEN_MAC_WRITE 0x0400 # define SSL3_MT_HELLO_REQUEST 0 # define SSL3_MT_CLIENT_HELLO 1 # define SSL3_MT_SERVER_HELLO 2 # define SSL3_MT_NEWSESSION_TICKET 4 +# define SSL3_MT_END_OF_EARLY_DATA 5 +# define SSL3_MT_HELLO_RETRY_REQUEST 6 +# define SSL3_MT_ENCRYPTED_EXTENSIONS 8 # define SSL3_MT_CERTIFICATE 11 # define SSL3_MT_SERVER_KEY_EXCHANGE 12 # define SSL3_MT_CERTIFICATE_REQUEST 13 @@ -494,10 +287,12 @@ extern "C" { # define SSL3_MT_CLIENT_KEY_EXCHANGE 16 # define SSL3_MT_FINISHED 20 # define SSL3_MT_CERTIFICATE_STATUS 22 +# define SSL3_MT_KEY_UPDATE 24 # ifndef OPENSSL_NO_NEXTPROTONEG -# define SSL3_MT_NEXT_PROTO 67 +# define SSL3_MT_NEXT_PROTO 67 # endif -# define DTLS1_MT_HELLO_VERIFY_REQUEST 3 +# define SSL3_MT_MESSAGE_HASH 254 +# define DTLS1_MT_HELLO_VERIFY_REQUEST 3 /* Dummy message type for handling CCS like a normal handshake message */ # define SSL3_MT_CHANGE_CIPHER_SPEC 0x0101 @@ -505,10 +300,13 @@ extern "C" { # define SSL3_MT_CCS 1 /* These are used when changing over to a new cipher */ -# define SSL3_CC_READ 0x01 -# define SSL3_CC_WRITE 0x02 -# define SSL3_CC_CLIENT 0x10 -# define SSL3_CC_SERVER 0x20 +# define SSL3_CC_READ 0x001 +# define SSL3_CC_WRITE 0x002 +# define SSL3_CC_CLIENT 0x010 +# define SSL3_CC_SERVER 0x020 +# define SSL3_CC_EARLY 0x040 +# define SSL3_CC_HANDSHAKE 0x080 +# define SSL3_CC_APPLICATION 0x100 # define SSL3_CHANGE_CIPHER_CLIENT_WRITE (SSL3_CC_CLIENT|SSL3_CC_WRITE) # define SSL3_CHANGE_CIPHER_SERVER_READ (SSL3_CC_SERVER|SSL3_CC_READ) # define SSL3_CHANGE_CIPHER_CLIENT_READ (SSL3_CC_CLIENT|SSL3_CC_READ)