1 files changed, 1 insertions, 58 deletions

diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h
index 6868959599..339a5c456b 100644
--- a/src/lib/libcrypto/bio/bio.h
+++ b/src/lib/libcrypto/bio/bio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio.h,v 1.27 2014/07/20 02:24:21 guenther Exp $ */
+/* $OpenBSD: bio.h,v 1.28 2015/02/09 10:55:33 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -68,9 +68,6 @@
 
 #include <openssl/crypto.h>
 
-#ifndef OPENSSL_NO_SCTP
-# include <stdint.h>
-#endif
 
 #ifdef  __cplusplus
 extern "C" {
@@ -99,9 +96,6 @@ extern "C" {
 #define BIO_TYPE_BIO            (19|0x0400)             /* (half a) BIO pair */
 #define BIO_TYPE_LINEBUFFER     (20|0x0200)             /* filter */
 #define BIO_TYPE_DGRAM          (21|0x0400|0x0100)
-#ifndef OPENSSL_NO_SCTP
-#define BIO_TYPE_DGRAM_SCTP     (24|0x0400|0x0100)
-#endif
 #define BIO_TYPE_ASN1           (22|0x0200)             /* filter */
 #define BIO_TYPE_COMP           (23|0x0200)             /* filter */
 
@@ -171,20 +165,6 @@ extern "C" {
 #define BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT   45 /* Next DTLS handshake timeout to
                                               * adjust socket timeouts */
 
-#ifndef OPENSSL_NO_SCTP
-/* SCTP stuff */
-#define BIO_CTRL_DGRAM_SCTP_SET_IN_HANDSHAKE    50
-#define BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY                51
-#define BIO_CTRL_DGRAM_SCTP_NEXT_AUTH_KEY               52
-#define BIO_CTRL_DGRAM_SCTP_AUTH_CCS_RCVD               53
-#define BIO_CTRL_DGRAM_SCTP_GET_SNDINFO         60
-#define BIO_CTRL_DGRAM_SCTP_SET_SNDINFO         61
-#define BIO_CTRL_DGRAM_SCTP_GET_RCVINFO         62
-#define BIO_CTRL_DGRAM_SCTP_SET_RCVINFO         63
-#define BIO_CTRL_DGRAM_SCTP_GET_PRINFO                  64
-#define BIO_CTRL_DGRAM_SCTP_SET_PRINFO                  65
-#define BIO_CTRL_DGRAM_SCTP_SAVE_SHUTDOWN               70
-#endif
 
 /* modifiers */
 #define BIO_FP_READ             0x02
@@ -347,30 +327,6 @@ typedef struct bio_f_buffer_ctx_struct {
 /* Prefix and suffix callback in ASN1 BIO */
 typedef int asn1_ps_func(BIO *b, unsigned char **pbuf, int *plen, void *parg);
 
-#ifndef OPENSSL_NO_SCTP
-/* SCTP parameter structs */
-struct bio_dgram_sctp_sndinfo {
-        uint16_t snd_sid;
-        uint16_t snd_flags;
-        uint32_t snd_ppid;
-        uint32_t snd_context;
-};
-
-struct bio_dgram_sctp_rcvinfo {
-        uint16_t rcv_sid;
-        uint16_t rcv_ssn;
-        uint16_t rcv_flags;
-        uint32_t rcv_ppid;
-        uint32_t rcv_tsn;
-        uint32_t rcv_cumtsn;
-        uint32_t rcv_context;
-};
-
-struct bio_dgram_sctp_prinfo {
-        uint16_t pr_policy;
-        uint32_t pr_value;
-};
-#endif
 
 /* connect BIO stuff */
 #define BIO_CONN_S_BEFORE               1
@@ -664,9 +620,6 @@ BIO_METHOD *BIO_f_buffer(void);
 BIO_METHOD *BIO_f_nbio_test(void);
 #ifndef OPENSSL_NO_DGRAM
 BIO_METHOD *BIO_s_datagram(void);
-#ifndef OPENSSL_NO_SCTP
-BIO_METHOD *BIO_s_datagram_sctp(void);
-#endif
 #endif
 
 /* BIO_METHOD *BIO_f_ber(void); */
@@ -709,16 +662,6 @@ int BIO_set_tcp_ndelay(int sock, int turn_on);
 
 BIO *BIO_new_socket(int sock, int close_flag);
 BIO *BIO_new_dgram(int fd, int close_flag);
-#ifndef OPENSSL_NO_SCTP
-BIO *BIO_new_dgram_sctp(int fd, int close_flag);
-int BIO_dgram_is_sctp(BIO *bio);
-int
-BIO_dgram_sctp_notification_cb(BIO *b,
-    void (*handle_notifications)(BIO *bio, void *context, void *buf),
-void *context);
-int BIO_dgram_sctp_wait_for_dry(BIO *b);
-int BIO_dgram_sctp_msg_waiting(BIO *b);
-#endif
 BIO *BIO_new_fd(int fd, int close_flag);
 BIO *BIO_new_connect(char *host_port);
 BIO *BIO_new_accept(char *host_port);