commit cc79b003cb3863e3742cbbd60913a539be684873
author Pradeep Jindal <praddyjindal@gmail.com> Thu Aug 20 18:25:17 2015 +0530
committer Willy Tarreau <w@1wt.eu> Thu Aug 20 16:23:22 2015 +0200
tree 51758d1fb8847444a4f0a00a9123e081a28c85e1
parent d8e42b6b3aee3bf4dee6192a4cc6d77dcce32645

BUG/MINOR: ssl: TLS Ticket Key rotation broken via socket command

It seems haproxy was doing wrong pointer arithmetic to update the ticket
ring correctly.

src/dumpstats.c

diff --git a/src/dumpstats.c b/src/dumpstats.c
index a779f47..b97318b 100644
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -1933,8 +1933,8 @@
 					return 1;
 				}
 
-				memcpy(appctx->ctx.tlskeys.ref->tlskeys + 2 % TLS_TICKETS_NO, trash.str, trash.len);
-				appctx->ctx.tlskeys.ref->tls_ticket_enc_index = appctx->ctx.tlskeys.ref->tls_ticket_enc_index + 1 % TLS_TICKETS_NO;
+				memcpy(appctx->ctx.tlskeys.ref->tlskeys + ((appctx->ctx.tlskeys.ref->tls_ticket_enc_index + 2) % TLS_TICKETS_NO), trash.str, trash.len);
+				appctx->ctx.tlskeys.ref->tls_ticket_enc_index = (appctx->ctx.tlskeys.ref->tls_ticket_enc_index + 1) % TLS_TICKETS_NO;
 
 				appctx->ctx.cli.msg = "TLS ticket key updated!";
 				appctx->st0 = STAT_CLI_PRINT;

src/ssl_sock.c

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 2b91eed..85ffd5f 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -500,8 +500,8 @@
 		return 1;
 	}
 
-	memcpy((char *) (ref->tlskeys + 2 % TLS_TICKETS_NO), tlskey->str, tlskey->len);
-	ref->tls_ticket_enc_index = ref->tls_ticket_enc_index + 1 % TLS_TICKETS_NO;
+	memcpy((char *) (ref->tlskeys + ((ref->tls_ticket_enc_index + 2) % TLS_TICKETS_NO)), tlskey->str, tlskey->len);
+	ref->tls_ticket_enc_index = (ref->tls_ticket_enc_index + 1) % TLS_TICKETS_NO;
 
 	return 0;
 }