diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index fdf8052aa127c11618aa424795cbf503baa46aa0..b372a9a58c8e200cbe173c8c581a72b2de772eda 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -3676,6 +3676,8 @@ int tls1_send_server_supplemental_data(SSL *s)
 
 		type = *(authz++);
 		n2s(authz, len);
+		/* n2s increments authz by 2*/
+		i += 2;
 
 		if (memchr(s->s3->tlsext_authz_client_types,
 			   type,
@@ -3719,6 +3721,8 @@ int tls1_send_server_supplemental_data(SSL *s)
 
 		type = *(authz++);
 		n2s(authz, len);
+		/* n2s increments authz by 2 */
+		i += 2;
 
 		if (memchr(s->s3->tlsext_authz_client_types,
 			   type,
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index bb4fbe658703d2d9240967f80a911d147493a333..85a5681f87a41df497151d545be6c9014acafc95 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1234,6 +1234,8 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned cha
 				authz_count++;
 
 			n2s(authz, length);
+			/* n2s increments authz by 2 */
+			i += 2;
 			authz += length;
 			i += length;
 			}
@@ -1267,6 +1269,8 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned cha
 				   s->s3->tlsext_authz_client_types_len) != NULL)
 				*(ret++) = type;
 			n2s(authz, length);
+			/* n2s increments authz by 2 */
+			i += 2;
 			authz += length;
 			i += length;
 			}