diff options
| author | Ben Laurie <ben@openssl.org> | 2012-06-06 14:52:19 +0200 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2012-06-06 14:52:19 +0200 |
| commit | aeda172afd37e6f7b2f285b5f18a5978415cbc9b (patch) | |
| tree | ee962a282f9122efbe48c9f366f3472f01a6fe8c /ssl | |
| parent | Revert random changes from commit#22606. (diff) | |
| download | openssl-aeda172afd37e6f7b2f285b5f18a5978415cbc9b.tar.xz openssl-aeda172afd37e6f7b2f285b5f18a5978415cbc9b.zip | |
Parse authz correctly.
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_srvr.c | 4 | ||||
| -rw-r--r-- | ssl/t1_lib.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index fdf8052aa1..b372a9a58c 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 bb4fbe6587..85a5681f87 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; } |