diff options
| author | Bodo Möller <bodo@openssl.org> | 2005-12-13 07:33:35 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2005-12-13 07:33:35 +0000 |
| commit | d56349a2aa0ef13487a230949990ed42421b4bc9 (patch) | |
| tree | 900929532c411344ca332f26e4928568ac410b41 /ssl/s3_clnt.c | |
| parent | 67c03ff185fd9e4ecbd2b2d7ed551a5a5ad94c1f (diff) | |
update TLS-ECC code
Submitted by: Douglas Stebila
Diffstat (limited to 'ssl/s3_clnt.c')
| -rw-r--r-- | ssl/s3_clnt.c | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 3e1f256c26..0098f56178 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -1213,12 +1213,12 @@ int ssl3_get_key_exchange(SSL *s) */ /* XXX: For now we only support named (not generic) curves - * and the ECParameters in this case is just two bytes. + * and the ECParameters in this case is just three bytes. */ - param_len=2; + param_len=3; if ((param_len > n) || (*p != NAMED_CURVE_TYPE) || - ((curve_nid = curve_id2nid(*(p + 1))) == 0)) + ((curve_nid = curve_id2nid(*(p + 2))) == 0)) { al=SSL_AD_INTERNAL_ERROR; SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS); @@ -1248,7 +1248,7 @@ int ssl3_get_key_exchange(SSL *s) goto f_err; } - p+=2; + p+=3; /* Next, get the encoded ECPoint */ if (((srvr_ecpoint = EC_POINT_new(group)) == NULL) || @@ -1616,22 +1616,6 @@ int ssl3_get_server_done(SSL *s) } -#ifndef OPENSSL_NO_ECDH -static const int KDF1_SHA1_len = 20; -static void *KDF1_SHA1(const void *in, size_t inlen, void *out, size_t *outlen) - { -#ifndef OPENSSL_NO_SHA - if (*outlen < SHA_DIGEST_LENGTH) - return NULL; - else - *outlen = SHA_DIGEST_LENGTH; - return SHA1(in, inlen, out); -#else - return NULL; -#endif /* OPENSSL_NO_SHA */ - } -#endif /* OPENSSL_NO_ECDH */ - int ssl3_send_client_key_exchange(SSL *s) { unsigned char *p,*d; @@ -2029,14 +2013,7 @@ int ssl3_send_client_key_exchange(SSL *s) ERR_R_ECDH_LIB); goto err; } - /* If field size is not more than 24 octets, then use SHA-1 hash of result; - * otherwise, use result (see section 4.8 of draft-ietf-tls-ecc-03.txt; - * this is new with this version of the Internet Draft). - */ - if (field_size <= 24 * 8) - n=ECDH_compute_key(p, KDF1_SHA1_len, srvr_ecpoint, clnt_ecdh, KDF1_SHA1); - else - n=ECDH_compute_key(p, (field_size+7)/8, srvr_ecpoint, clnt_ecdh, NULL); + n=ECDH_compute_key(p, (field_size+7)/8, srvr_ecpoint, clnt_ecdh, NULL); if (n <= 0) { SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, |