#14465: Update openssl to tag android-4.0.4_r2.1
diff --git a/jni/openssl/crypto/bio/bio.h b/jni/openssl/crypto/bio/bio.h
index 05699ab..152802f 100644
--- a/jni/openssl/crypto/bio/bio.h
+++ b/jni/openssl/crypto/bio/bio.h
@@ -68,14 +68,6 @@
#include <openssl/crypto.h>
-#ifndef OPENSSL_NO_SCTP
-# ifndef OPENSSL_SYS_VMS
-# include <stdint.h>
-# else
-# include <inttypes.h>
-# endif
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -103,9 +95,6 @@
#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 */
@@ -157,7 +146,6 @@
/* #endif */
#define BIO_CTRL_DGRAM_QUERY_MTU 40 /* as kernel for current MTU */
-#define BIO_CTRL_DGRAM_GET_FALLBACK_MTU 47
#define BIO_CTRL_DGRAM_GET_MTU 41 /* get cached value for MTU */
#define BIO_CTRL_DGRAM_SET_MTU 42 /* set cached value for
* MTU. want to use this
@@ -173,22 +161,7 @@
#define BIO_CTRL_DGRAM_SET_PEER 44 /* Destination for the data */
#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
+ * adjust socket timeouts */
/* modifiers */
#define BIO_FP_READ 0x02
@@ -333,15 +306,6 @@
typedef struct bio_f_buffer_ctx_struct
{
- /* Buffers are setup like this:
- *
- * <---------------------- size ----------------------->
- * +---------------------------------------------------+
- * | consumed | remaining | free space |
- * +---------------------------------------------------+
- * <-- off --><------- len ------->
- */
-
/* BIO *bio; */ /* this is now in the BIO struct */
int ibuf_size; /* how big is the input buffer */
int obuf_size; /* how big is the output buffer */
@@ -358,34 +322,6 @@
/* 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
#define BIO_CONN_S_GET_IP 2
@@ -683,9 +619,6 @@
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); */
@@ -728,15 +661,6 @@
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);
@@ -801,7 +725,6 @@
#define BIO_F_BUFFER_CTRL 114
#define BIO_F_CONN_CTRL 127
#define BIO_F_CONN_STATE 115
-#define BIO_F_DGRAM_SCTP_READ 132
#define BIO_F_FILE_CTRL 116
#define BIO_F_FILE_READ 130
#define BIO_F_LINEBUFFER_CTRL 129