summaryrefslogtreecommitdiffstats
path: root/ssl/d1_both.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-02-02 15:47:39 +0000
committerMatt Caswell <matt@openssl.org>2015-03-26 15:02:00 +0000
commit2c60ed0452919ea9a67886685e2fa5c8b9330620 (patch)
treeb70dedf9bc6ea8964fde43b276ffeb9b2740ac67 /ssl/d1_both.c
parentbd2e3a9512523ff888982cd91e830fc49f1a9595 (diff)
Removed dependency on rrec from heartbeat processing
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/d1_both.c')
-rw-r--r--ssl/d1_both.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index 48c75b2227..587eb9e53a 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -1347,16 +1347,12 @@ int dtls1_shutdown(SSL *s)
}
#ifndef OPENSSL_NO_HEARTBEATS
-int dtls1_process_heartbeat(SSL *s)
+int dtls1_process_heartbeat(SSL *s, unsigned char *p, unsigned int length)
{
- unsigned char *p, *pl;
+ unsigned char *pl;
unsigned short hbtype;
unsigned int payload;
unsigned int padding = 16; /* Use minimum padding */
- unsigned int length;
-
- p = SSL3_RECORD_get_data(RECORD_LAYER_get_rrec(&s->rlayer));
- length = SSL3_RECORD_get_length(RECORD_LAYER_get_rrec(&s->rlayer));
if (s->msg_callback)
s->msg_callback(0, s->version, TLS1_RT_HEARTBEAT,