From: Matt Caswell <matt@openssl.org>
Date: Wed, 4 Feb 2015 11:24:24 +0000 (+0000)
Subject: Move ssl3_record_sequence_update into record layer
X-Git-Tag: OpenSSL_1_1_0-pre1~1397
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=14daae5a625b38b43229eed0cf750f44d5881c0b;p=oweals%2Fopenssl.git

Move ssl3_record_sequence_update into record layer

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/ssl/record/rec_layer.h b/ssl/record/rec_layer.h
index 1367487e3a..e50bb79873 100644
--- a/ssl/record/rec_layer.h
+++ b/ssl/record/rec_layer.h
@@ -260,7 +260,7 @@ int DTLS_RECORD_LAYER_new(RECORD_LAYER *rl);
 void DTLS_RECORD_LAYER_free(RECORD_LAYER *rl);
 void DTLS_RECORD_LAYER_clear(RECORD_LAYER *rl);
 __owur int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek);
-int dtls1_write_bytes(SSL *s, int type, const void *buf, int len);
+__owur int dtls1_write_bytes(SSL *s, int type, const void *buf, int len);
 __owur int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
                    unsigned int len, int create_empty_fragement);
 void dtls1_reset_seq_numbers(SSL *s, int rw);
@@ -292,4 +292,4 @@ int dtls1_process_buffered_records(SSL *s);
 int dtls1_retrieve_buffered_record(SSL *s, record_pqueue *queue);
 int dtls1_buffer_record(SSL *s, record_pqueue *q,
                                unsigned char *priority);
-
+void ssl3_record_sequence_update(unsigned char *seq);
diff --git a/ssl/record/s3_pkt.c b/ssl/record/s3_pkt.c
index 30df2b741a..b9a0934690 100644
--- a/ssl/record/s3_pkt.c
+++ b/ssl/record/s3_pkt.c
@@ -1445,4 +1445,15 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
     return (-1);
 }
 
+void ssl3_record_sequence_update(unsigned char *seq)
+{
+    int i;
+
+    for (i = 7; i >= 0; i--) {
+        ++seq[i];
+        if (seq[i] != 0)
+            break;
+    }
+}
+
 
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index f69192cb04..1db2f77cd4 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -638,17 +638,6 @@ static int ssl3_handshake_mac(SSL *s, int md_nid,
     return ((int)ret);
 }
 
-void ssl3_record_sequence_update(unsigned char *seq)
-{
-    int i;
-
-    for (i = 7; i >= 0; i--) {
-        ++seq[i];
-        if (seq[i] != 0)
-            break;
-    }
-}
-
 int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
                                 int len)
 {
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 4ee0ddd79c..ed57b34e86 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -2049,7 +2049,6 @@ __owur long ssl3_ctx_ctrl(SSL_CTX *s, int cmd, long larg, void *parg);
 __owur long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp) (void));
 __owur long ssl3_ctx_callback_ctrl(SSL_CTX *s, int cmd, void (*fp) (void));
 
-void ssl3_record_sequence_update(unsigned char *seq);
 __owur int ssl3_do_change_cipher_spec(SSL *ssl);
 __owur long ssl3_default_timeout(void);
 
@@ -2076,7 +2075,6 @@ void dtls1_set_message_header(SSL *s,
                               unsigned long frag_len);
 
 __owur int dtls1_write_app_data_bytes(SSL *s, int type, const void *buf, int len);
-__owur int dtls1_write_bytes(SSL *s, int type, const void *buf, int len);
 
 __owur int dtls1_send_change_cipher_spec(SSL *s, int a, int b);
 __owur int dtls1_send_finished(SSL *s, int a, int b, const char *sender, int slen);