diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/d1_pkt.c | 6 | ||||
| -rw-r--r-- | src/lib/libssl/ssl_locl.h | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/lib/libssl/d1_pkt.c b/src/lib/libssl/d1_pkt.c index 5326a2c3d0..9ea7d5277a 100644 --- a/src/lib/libssl/d1_pkt.c +++ b/src/lib/libssl/d1_pkt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: d1_pkt.c,v 1.48 2015/09/11 18:08:21 jsing Exp $ */ | 1 | /* $OpenBSD: d1_pkt.c,v 1.49 2016/11/04 18:00:12 guenther Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
| 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
| @@ -126,6 +126,10 @@ | |||
| 126 | #include "pqueue.h" | 126 | #include "pqueue.h" |
| 127 | #include "bytestring.h" | 127 | #include "bytestring.h" |
| 128 | 128 | ||
| 129 | static int do_dtls1_write(SSL *s, int type, const unsigned char *buf, | ||
| 130 | unsigned int len); | ||
| 131 | |||
| 132 | |||
| 129 | /* mod 128 saturating subtract of two 64-bit values in big-endian order */ | 133 | /* mod 128 saturating subtract of two 64-bit values in big-endian order */ |
| 130 | static int | 134 | static int |
| 131 | satsub64be(const unsigned char *v1, const unsigned char *v2) | 135 | satsub64be(const unsigned char *v1, const unsigned char *v2) |
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index b79e9269ce..c3107745c9 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.131 2016/11/03 08:15:22 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.132 2016/11/04 18:00:12 guenther 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 | * |
| @@ -732,8 +732,6 @@ int ssl23_write_bytes(SSL *s); | |||
| 732 | int tls1_new(SSL *s); | 732 | int tls1_new(SSL *s); |
| 733 | void tls1_free(SSL *s); | 733 | void tls1_free(SSL *s); |
| 734 | void tls1_clear(SSL *s); | 734 | void tls1_clear(SSL *s); |
| 735 | long tls1_ctrl(SSL *s, int cmd, long larg, void *parg); | ||
| 736 | long tls1_callback_ctrl(SSL *s, int cmd, void (*fp)(void)); | ||
| 737 | 735 | ||
| 738 | int dtls1_new(SSL *s); | 736 | int dtls1_new(SSL *s); |
| 739 | int dtls1_accept(SSL *s); | 737 | int dtls1_accept(SSL *s); |
| @@ -745,8 +743,6 @@ int dtls1_shutdown(SSL *s); | |||
| 745 | 743 | ||
| 746 | long dtls1_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok); | 744 | long dtls1_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok); |
| 747 | int dtls1_get_record(SSL *s); | 745 | int dtls1_get_record(SSL *s); |
| 748 | int do_dtls1_write(SSL *s, int type, const unsigned char *buf, | ||
| 749 | unsigned int len); | ||
| 750 | int dtls1_dispatch_alert(SSL *s); | 746 | int dtls1_dispatch_alert(SSL *s); |
| 751 | int dtls1_enc(SSL *s, int snd); | 747 | int dtls1_enc(SSL *s, int snd); |
| 752 | 748 | ||
| @@ -774,8 +770,6 @@ int ssl_ok(SSL *s); | |||
| 774 | 770 | ||
| 775 | int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s); | 771 | int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s); |
| 776 | 772 | ||
| 777 | SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n); | ||
| 778 | |||
| 779 | int tls1_ec_curve_id2nid(uint16_t curve_id); | 773 | int tls1_ec_curve_id2nid(uint16_t curve_id); |
| 780 | uint16_t tls1_ec_nid2curve_id(int nid); | 774 | uint16_t tls1_ec_nid2curve_id(int nid); |
| 781 | int tls1_check_curve(SSL *s, const unsigned char *p, size_t len); | 775 | int tls1_check_curve(SSL *s, const unsigned char *p, size_t len); |
