summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/bio/bio.h
diff options
context:
space:
mode:
authorjsing <>2015-02-09 10:55:33 +0000
committerjsing <>2015-02-09 10:55:33 +0000
commitb1708fb06623ef1ece520a3f98163861f92085de (patch)
tree648f25d5e344ebd23f976121600816e0d5ef44d7 /src/lib/libcrypto/bio/bio.h
parentb6cf79472f84871a9cffc9c9ee7643d17e8943a4 (diff)
downloadopenbsd-b1708fb06623ef1ece520a3f98163861f92085de.tar.gz
openbsd-b1708fb06623ef1ece520a3f98163861f92085de.tar.bz2
openbsd-b1708fb06623ef1ece520a3f98163861f92085de.zip
Jettison SCTP support in BIO dgram.
OpenBSD does not have SCTP support and it sees little use in the wild. OPENSSL_NO_SCTP is already specified via opensslfeatures.h, hence this is a code removal only and symbols should remain unchanged. ok beck@ miod@ tedu@
Diffstat (limited to 'src/lib/libcrypto/bio/bio.h')
-rw-r--r--src/lib/libcrypto/bio/bio.h59
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 @@
1/* $OpenBSD: bio.h,v 1.27 2014/07/20 02:24:21 guenther Exp $ */ 1/* $OpenBSD: bio.h,v 1.28 2015/02/09 10:55:33 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 *
@@ -68,9 +68,6 @@
68 68
69#include <openssl/crypto.h> 69#include <openssl/crypto.h>
70 70
71#ifndef OPENSSL_NO_SCTP
72# include <stdint.h>
73#endif
74 71
75#ifdef __cplusplus 72#ifdef __cplusplus
76extern "C" { 73extern "C" {
@@ -99,9 +96,6 @@ extern "C" {
99#define BIO_TYPE_BIO (19|0x0400) /* (half a) BIO pair */ 96#define BIO_TYPE_BIO (19|0x0400) /* (half a) BIO pair */
100#define BIO_TYPE_LINEBUFFER (20|0x0200) /* filter */ 97#define BIO_TYPE_LINEBUFFER (20|0x0200) /* filter */
101#define BIO_TYPE_DGRAM (21|0x0400|0x0100) 98#define BIO_TYPE_DGRAM (21|0x0400|0x0100)
102#ifndef OPENSSL_NO_SCTP
103#define BIO_TYPE_DGRAM_SCTP (24|0x0400|0x0100)
104#endif
105#define BIO_TYPE_ASN1 (22|0x0200) /* filter */ 99#define BIO_TYPE_ASN1 (22|0x0200) /* filter */
106#define BIO_TYPE_COMP (23|0x0200) /* filter */ 100#define BIO_TYPE_COMP (23|0x0200) /* filter */
107 101
@@ -171,20 +165,6 @@ extern "C" {
171#define BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT 45 /* Next DTLS handshake timeout to 165#define BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT 45 /* Next DTLS handshake timeout to
172 * adjust socket timeouts */ 166 * adjust socket timeouts */
173 167
174#ifndef OPENSSL_NO_SCTP
175/* SCTP stuff */
176#define BIO_CTRL_DGRAM_SCTP_SET_IN_HANDSHAKE 50
177#define BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY 51
178#define BIO_CTRL_DGRAM_SCTP_NEXT_AUTH_KEY 52
179#define BIO_CTRL_DGRAM_SCTP_AUTH_CCS_RCVD 53
180#define BIO_CTRL_DGRAM_SCTP_GET_SNDINFO 60
181#define BIO_CTRL_DGRAM_SCTP_SET_SNDINFO 61
182#define BIO_CTRL_DGRAM_SCTP_GET_RCVINFO 62
183#define BIO_CTRL_DGRAM_SCTP_SET_RCVINFO 63
184#define BIO_CTRL_DGRAM_SCTP_GET_PRINFO 64
185#define BIO_CTRL_DGRAM_SCTP_SET_PRINFO 65
186#define BIO_CTRL_DGRAM_SCTP_SAVE_SHUTDOWN 70
187#endif
188 168
189/* modifiers */ 169/* modifiers */
190#define BIO_FP_READ 0x02 170#define BIO_FP_READ 0x02
@@ -347,30 +327,6 @@ typedef struct bio_f_buffer_ctx_struct {
347/* Prefix and suffix callback in ASN1 BIO */ 327/* Prefix and suffix callback in ASN1 BIO */
348typedef int asn1_ps_func(BIO *b, unsigned char **pbuf, int *plen, void *parg); 328typedef int asn1_ps_func(BIO *b, unsigned char **pbuf, int *plen, void *parg);
349 329
350#ifndef OPENSSL_NO_SCTP
351/* SCTP parameter structs */
352struct bio_dgram_sctp_sndinfo {
353 uint16_t snd_sid;
354 uint16_t snd_flags;
355 uint32_t snd_ppid;
356 uint32_t snd_context;
357};
358
359struct bio_dgram_sctp_rcvinfo {
360 uint16_t rcv_sid;
361 uint16_t rcv_ssn;
362 uint16_t rcv_flags;
363 uint32_t rcv_ppid;
364 uint32_t rcv_tsn;
365 uint32_t rcv_cumtsn;
366 uint32_t rcv_context;
367};
368
369struct bio_dgram_sctp_prinfo {
370 uint16_t pr_policy;
371 uint32_t pr_value;
372};
373#endif
374 330
375/* connect BIO stuff */ 331/* connect BIO stuff */
376#define BIO_CONN_S_BEFORE 1 332#define BIO_CONN_S_BEFORE 1
@@ -664,9 +620,6 @@ BIO_METHOD *BIO_f_buffer(void);
664BIO_METHOD *BIO_f_nbio_test(void); 620BIO_METHOD *BIO_f_nbio_test(void);
665#ifndef OPENSSL_NO_DGRAM 621#ifndef OPENSSL_NO_DGRAM
666BIO_METHOD *BIO_s_datagram(void); 622BIO_METHOD *BIO_s_datagram(void);
667#ifndef OPENSSL_NO_SCTP
668BIO_METHOD *BIO_s_datagram_sctp(void);
669#endif
670#endif 623#endif
671 624
672/* BIO_METHOD *BIO_f_ber(void); */ 625/* BIO_METHOD *BIO_f_ber(void); */
@@ -709,16 +662,6 @@ int BIO_set_tcp_ndelay(int sock, int turn_on);
709 662
710BIO *BIO_new_socket(int sock, int close_flag); 663BIO *BIO_new_socket(int sock, int close_flag);
711BIO *BIO_new_dgram(int fd, int close_flag); 664BIO *BIO_new_dgram(int fd, int close_flag);
712#ifndef OPENSSL_NO_SCTP
713BIO *BIO_new_dgram_sctp(int fd, int close_flag);
714int BIO_dgram_is_sctp(BIO *bio);
715int
716BIO_dgram_sctp_notification_cb(BIO *b,
717 void (*handle_notifications)(BIO *bio, void *context, void *buf),
718void *context);
719int BIO_dgram_sctp_wait_for_dry(BIO *b);
720int BIO_dgram_sctp_msg_waiting(BIO *b);
721#endif
722BIO *BIO_new_fd(int fd, int close_flag); 665BIO *BIO_new_fd(int fd, int close_flag);
723BIO *BIO_new_connect(char *host_port); 666BIO *BIO_new_connect(char *host_port);
724BIO *BIO_new_accept(char *host_port); 667BIO *BIO_new_accept(char *host_port);