From: Matt Caswell <matt@openssl.org>
Date: Thu, 30 Jul 2015 10:14:44 +0000 (+0100)
Subject: Fix make errors for the CCS changes
X-Git-Tag: OpenSSL_1_1_0-pre1~853
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=496dbe1855b486c39f42d673d56924d5f9ae3c78;p=oweals%2Fopenssl.git

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 892e129611..06ac5c1672 100644
--- 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 e097de4671..ec47b94c75 100644
--- 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;
             }