Fix make errors for the CCS changes

The move of CCS into the state machine was causing make errors to fail. This
fixes it.

Reviewed-by: Tim Hudson <tjh@openssl.org>

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 892e12961155732c5c004c6ec571040abeaaa55f..06ac5c167205551a41d94e062f61779f143a1762 100644 (file)
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1943,7 +1943,7 @@ void ERR_load_SSL_strings(void);
 # define SSL_F_SSL3_GET_CERTIFICATE_REQUEST               135
 # define SSL_F_SSL3_GET_CERT_STATUS                       289
 # define SSL_F_SSL3_GET_CERT_VERIFY                       136
-# define SSL_F_SSL3_GET_CHANGE_CIPHER_SPEC                348
+# define SSL_F_SSL3_GET_CHANGE_CIPHER_SPEC                349
 # define SSL_F_SSL3_GET_CLIENT_CERTIFICATE                137
 # define SSL_F_SSL3_GET_CLIENT_HELLO                      138
 # define SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE               139

diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index e097de46718fb96f2c38b27762a3285b129d7a9b..ec47b94c7594ee9473c25ded224453860c9f7ebd 100644 (file)
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -882,7 +882,7 @@ dtls1_get_message_fragment(SSL *s, int st1, int stn, int mt, long max, int *ok)
         if(mt == SSL3_MT_CHANGE_CIPHER_SPEC) {
             if (wire[0] != SSL3_MT_CCS) {
                 al = SSL_AD_UNEXPECTED_MESSAGE;
-                SSLerr(SSL_F_SSL3_GET_MESSAGE, SSL_R_BAD_CHANGE_CIPHER_SPEC);
+                SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT, SSL_R_BAD_CHANGE_CIPHER_SPEC);
                 goto f_err;
             }