diff options
| author | Bodo Möller <bodo@openssl.org> | 2006-03-11 23:46:37 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2006-03-11 23:46:37 +0000 |
| commit | 36ca4ba63d083da6f9d4598f18f17a8c32c8eca2 (patch) | |
| tree | 1744a6165454e79e9c3cd76b4c33d72ff945e8d3 /ssl/s3_clnt.c | |
| parent | ed4a1d12b96ec9cdd927c116be8277654666c430 (diff) | |
Implement the Supported Point Formats Extension for ECC ciphersuites
Submitted by: Douglas Stebila
Diffstat (limited to 'ssl/s3_clnt.c')
| -rw-r--r-- | ssl/s3_clnt.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 237dfb61d9..a8f2b8f557 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -632,6 +632,11 @@ int ssl3_client_hello(SSL *s) #endif *(p++)=0; /* Add the NULL method */ #ifndef OPENSSL_NO_TLSEXT + if (ssl_prepare_clienthello_tlsext(s) <= 0) + { + SSLerr(SSL_F_SSL3_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT); + goto err; + } if ((p = ssl_add_clienthello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL) { SSLerr(SSL_F_SSL3_CLIENT_HELLO,ERR_R_INTERNAL_ERROR); @@ -829,12 +834,12 @@ int ssl3_get_server_hello(SSL *s) if (!ssl_parse_serverhello_tlsext(s,&p,d,n, &al)) { /* 'al' set by ssl_parse_serverhello_tlsext */ - SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_PARSE_TLS_EXT); + SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_PARSE_TLSEXT); goto f_err; } - if (ssl_check_tlsext(s,0) <= 0) + if (ssl_check_serverhello_tlsext(s) <= 0) { - SSLerr(SSL_F_SSL3_CONNECT,SSL_R_SERVERHELLO_TLS_EXT); + SSLerr(SSL_F_SSL3_CONNECT,SSL_R_SERVERHELLO_TLSEXT); goto err; } } |