diff options
author | jsing <> | 2014-12-06 13:51:06 +0000 |
---|---|---|
committer | jsing <> | 2014-12-06 13:51:06 +0000 |
commit | a657ba9d9f7c27a3001f24d121b111838c1dc856 (patch) | |
tree | bf970ac74fc18ba45834070bde1e0c9b24cc24fc /src/lib/libssl/ssl_locl.h | |
parent | 737df48ca584850ed0b5d4bb60494b65386a5d5f (diff) | |
download | openbsd-a657ba9d9f7c27a3001f24d121b111838c1dc856.tar.gz openbsd-a657ba9d9f7c27a3001f24d121b111838c1dc856.tar.bz2 openbsd-a657ba9d9f7c27a3001f24d121b111838c1dc856.zip |
Use appropriate internal types for EC curves and formats, rather than
storing and processing in wire encoded form.
Inspired by boringssl.
ok miod@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 74cacd4eec..c425f67a5a 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.77 2014/11/18 05:33:43 miod Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.78 2014/12/06 13:51:06 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -800,8 +800,8 @@ int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s); | |||
800 | 800 | ||
801 | SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n); | 801 | SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n); |
802 | 802 | ||
803 | int tls1_ec_curve_id2nid(int curve_id); | 803 | int tls1_ec_curve_id2nid(uint16_t curve_id); |
804 | int tls1_ec_nid2curve_id(int nid); | 804 | uint16_t tls1_ec_nid2curve_id(int nid); |
805 | int tls1_check_curve(SSL *s, const unsigned char *p, size_t len); | 805 | int tls1_check_curve(SSL *s, const unsigned char *p, size_t len); |
806 | int tls1_get_shared_curve(SSL *s); | 806 | int tls1_get_shared_curve(SSL *s); |
807 | 807 | ||