diff options
| author |   jsing <jsing@openbsd.org> | 2014-12-06 13:51:06 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-12-06 13:51:06 +0000 |
| commit | 55d8b5b6bff9f1fb60aafd49ee1132110e33c1d0 (patch) | |
| tree | 004f8ce2a9000c22c7fed058ad287ea114245908 /lib/libssl/src/ssl/ssl_locl.h | |
| parent | Ensure that the client specified EC curve list length is a multiple of two. (diff) | |
| download | wireguard-openbsd-55d8b5b6bff9f1fb60aafd49ee1132110e33c1d0.tar.xz wireguard-openbsd-55d8b5b6bff9f1fb60aafd49ee1132110e33c1d0.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 'lib/libssl/src/ssl/ssl_locl.h')
| -rw-r--r-- | lib/libssl/src/ssl/ssl_locl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libssl/src/ssl/ssl_locl.h b/lib/libssl/src/ssl/ssl_locl.h index 74cacd4eec3..c425f67a5a5 100644 --- a/lib/libssl/src/ssl/ssl_locl.h +++ b/lib/libssl/src/ssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.77 2014/11/18 05:33:43 miod Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.78 2014/12/06 13:51:06 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -800,8 +800,8 @@ int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s); SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n); -int tls1_ec_curve_id2nid(int curve_id); -int tls1_ec_nid2curve_id(int nid); +int tls1_ec_curve_id2nid(uint16_t curve_id); +uint16_t tls1_ec_nid2curve_id(int nid); int tls1_check_curve(SSL *s, const unsigned char *p, size_t len); int tls1_get_shared_curve(SSL *s); |