1 files changed, 87 insertions, 78 deletions

diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h
index 05699ab212..4f1d02ada5 100644
--- a/src/lib/libcrypto/bio/bio.h
+++ b/src/lib/libcrypto/bio/bio.h
@@ -151,7 +151,7 @@ extern "C" {
 
 #define BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP 37 /* flag whether the last */
 #define BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP 38 /* I/O operation tiemd out */
-                                        
+
 /* #ifdef IP_MTU_DISCOVER */
 #define BIO_CTRL_DGRAM_MTU_DISCOVER       39 /* set DF bit on egress packets */
 /* #endif */
@@ -282,9 +282,10 @@ void BIO_clear_flags(BIO *b, int flags);
 #define BIO_cb_pre(a)   (!((a)&BIO_CB_RETURN))
 #define BIO_cb_post(a)  ((a)&BIO_CB_RETURN)
 
-long (*BIO_get_callback(const BIO *b)) (struct bio_st *,int,const char *,int, long,long);
-void BIO_set_callback(BIO *b, 
-        long (*callback)(struct bio_st *,int,const char *,int, long,long));
+long (*BIO_get_callback(const BIO *b))(struct bio_st *, int, const char *,
+    int, long, long);
+void BIO_set_callback(BIO *b,
+    long (*callback)(struct bio_st *, int, const char *, int, long, long));
 char *BIO_get_callback_arg(const BIO *b);
 void BIO_set_callback_arg(BIO *b, char *arg);
 
@@ -293,8 +294,7 @@ int BIO_method_type(const BIO *b);
 
 typedef void bio_info_cb(struct bio_st *, int, const char *, int, long, long);
 
-typedef struct bio_method_st
-        {
+typedef struct bio_method_st {
         int type;
         const char *name;
         int (*bwrite)(BIO *, const char *, int);
@@ -304,14 +304,13 @@ typedef struct bio_method_st
         long (*ctrl)(BIO *, int, long, void *);
         int (*create)(BIO *);
         int (*destroy)(BIO *);
-        long (*callback_ctrl)(BIO *, int, bio_info_cb *);
-        } BIO_METHOD;
+        long (*callback_ctrl)(BIO *, int, bio_info_cb *);
+} BIO_METHOD;
 
-struct bio_st
-        {
+struct bio_st {
         BIO_METHOD *method;
         /* bio, mode, argp, argi, argl, ret */
-        long (*callback)(struct bio_st *,int,const char *,int, long,long);
+        long (*callback)(struct bio_st *, int, const char *, int, long, long);
         char *cb_arg; /* first argument for the callback */
 
         int init;
@@ -327,12 +326,11 @@ struct bio_st
         unsigned long num_write;
 
         CRYPTO_EX_DATA ex_data;
-        };
+};
 
 DECLARE_STACK_OF(BIO)
 
-typedef struct bio_f_buffer_ctx_struct
-        {
+typedef struct bio_f_buffer_ctx_struct {
         /* Buffers are setup like this:
          *
          * <---------------------- size ----------------------->
@@ -346,30 +344,28 @@ typedef struct bio_f_buffer_ctx_struct
         int ibuf_size;  /* how big is the input buffer */
         int obuf_size;  /* how big is the output buffer */
 
-        char *ibuf;             /* the char array */
-        int ibuf_len;           /* how many bytes are in it */
-        int ibuf_off;           /* write/read offset */
+        char *ibuf;     /* the char array */
+        int ibuf_len;   /* how many bytes are in it */
+        int ibuf_off;   /* write/read offset */
 
-        char *obuf;             /* the char array */
-        int obuf_len;           /* how many bytes are in it */
-        int obuf_off;           /* write/read offset */
-        } BIO_F_BUFFER_CTX;
+        char *obuf;     /* the char array */
+        int obuf_len;   /* how many bytes are in it */
+        int obuf_off;   /* write/read offset */
+} BIO_F_BUFFER_CTX;
 
 /* 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
-        {
+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
-        {
+struct bio_dgram_sctp_rcvinfo {
         uint16_t rcv_sid;
         uint16_t rcv_ssn;
         uint16_t rcv_flags;
@@ -377,13 +373,12 @@ struct bio_dgram_sctp_rcvinfo
         uint32_t rcv_tsn;
         uint32_t rcv_cumtsn;
         uint32_t rcv_context;
-        };
+};
 
-struct bio_dgram_sctp_prinfo
-        {
+struct bio_dgram_sctp_prinfo {
         uint16_t pr_policy;
         uint32_t pr_value;
-        };
+};
 #endif
 
 /* connect BIO stuff */
@@ -519,7 +514,7 @@ struct bio_dgram_sctp_prinfo
 /* If you are wondering why this isn't defined, its because CONST_STRICT is
  * purely a compile-time kludge to allow const to be checked.
  */
-int BIO_read_filename(BIO *b,const char *name);
+int BIO_read_filename(BIO *b, const char *name);
 #else
 #define BIO_read_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
                 BIO_CLOSE|BIO_FP_READ,(char *)name)
@@ -611,22 +606,27 @@ int BIO_ctrl_reset_read_request(BIO *b);
 /* These two aren't currently implemented */
 /* int BIO_get_ex_num(BIO *bio); */
 /* void BIO_set_ex_free_func(BIO *bio,int idx,void (*cb)()); */
-int BIO_set_ex_data(BIO *bio,int idx,void *data);
-void *BIO_get_ex_data(BIO *bio,int idx);
-int BIO_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-        CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
+int BIO_set_ex_data(BIO *bio, int idx, void *data);
+void *BIO_get_ex_data(BIO *bio, int idx);
+int
+BIO_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
+CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
 unsigned long BIO_number_read(BIO *bio);
 unsigned long BIO_number_written(BIO *bio);
 
 /* For BIO_f_asn1() */
-int BIO_asn1_set_prefix(BIO *b, asn1_ps_func *prefix,
-                                        asn1_ps_func *prefix_free);
-int BIO_asn1_get_prefix(BIO *b, asn1_ps_func **pprefix,
-                                        asn1_ps_func **pprefix_free);
-int BIO_asn1_set_suffix(BIO *b, asn1_ps_func *suffix,
-                                        asn1_ps_func *suffix_free);
-int BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix,
-                                        asn1_ps_func **psuffix_free);
+int
+BIO_asn1_set_prefix(BIO *b, asn1_ps_func *prefix,
+asn1_ps_func *prefix_free);
+int
+BIO_asn1_get_prefix(BIO *b, asn1_ps_func **pprefix,
+asn1_ps_func **pprefix_free);
+int
+BIO_asn1_set_suffix(BIO *b, asn1_ps_func *suffix,
+asn1_ps_func *suffix_free);
+int
+BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix,
+asn1_ps_func **psuffix_free);
 
 # ifndef OPENSSL_NO_FP_API
 BIO_METHOD *BIO_s_file(void );
@@ -635,22 +635,23 @@ BIO *BIO_new_fp(FILE *stream, int close_flag);
 # define BIO_s_file_internal    BIO_s_file
 # endif
 BIO *   BIO_new(BIO_METHOD *type);
-int     BIO_set(BIO *a,BIO_METHOD *type);
+int     BIO_set(BIO *a, BIO_METHOD *type);
 int     BIO_free(BIO *a);
 void    BIO_vfree(BIO *a);
 int     BIO_read(BIO *b, void *data, int len);
-int     BIO_gets(BIO *bp,char *buf, int size);
+int     BIO_gets(BIO *bp, char *buf, int size);
 int     BIO_write(BIO *b, const void *data, int len);
-int     BIO_puts(BIO *bp,const char *buf);
-int     BIO_indent(BIO *b,int indent,int max);
-long    BIO_ctrl(BIO *bp,int cmd,long larg,void *parg);
-long BIO_callback_ctrl(BIO *b, int cmd, void (*fp)(struct bio_st *, int, const char *, int, long, long));
-char *  BIO_ptr_ctrl(BIO *bp,int cmd,long larg);
-long    BIO_int_ctrl(BIO *bp,int cmd,long larg,int iarg);
-BIO *   BIO_push(BIO *b,BIO *append);
+int     BIO_puts(BIO *bp, const char *buf);
+int     BIO_indent(BIO *b, int indent, int max);
+long    BIO_ctrl(BIO *bp, int cmd, long larg, void *parg);
+long    BIO_callback_ctrl(BIO *b, int cmd,
+            void (*fp)(struct bio_st *, int, const char *, int, long, long));
+char *  BIO_ptr_ctrl(BIO *bp, int cmd, long larg);
+long    BIO_int_ctrl(BIO *bp, int cmd, long larg, int iarg);
+BIO *   BIO_push(BIO *b, BIO *append);
 BIO *   BIO_pop(BIO *b);
 void    BIO_free_all(BIO *a);
-BIO *   BIO_find_type(BIO *b,int bio_type);
+BIO *   BIO_find_type(BIO *b, int bio_type);
 BIO *   BIO_next(BIO *b);
 BIO *   BIO_get_retry_BIO(BIO *bio, int *reason);
 int     BIO_get_retry_reason(BIO *bio);
@@ -661,8 +662,8 @@ int BIO_nread(BIO *bio, char **buf, int num);
 int BIO_nwrite0(BIO *bio, char **buf);
 int BIO_nwrite(BIO *bio, char **buf, int num);
 
-long BIO_debug_callback(BIO *bio,int cmd,const char *argp,int argi,
-        long argl,long ret);
+long BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi,
+    long argl, long ret);
 
 BIO_METHOD *BIO_s_mem(void);
 BIO *BIO_new_mem_buf(void *buf, int len);
@@ -696,12 +697,14 @@ int BIO_dgram_non_fatal_error(int error);
 
 int BIO_fd_should_retry(int i);
 int BIO_fd_non_fatal_error(int error);
-int BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u),
-                void *u, const char *s, int len);
-int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
-                       void *u, const char *s, int len, int indent);
-int BIO_dump(BIO *b,const char *bytes,int len);
-int BIO_dump_indent(BIO *b,const char *bytes,int len,int indent);
+int
+BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u),
+void *u, const char *s, int len);
+int
+BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
+void *u, const char *s, int len, int indent);
+int BIO_dump(BIO *b, const char *bytes, int len);
+int BIO_dump_indent(BIO *b, const char *bytes, int len, int indent);
 #ifndef OPENSSL_NO_FP_API
 int BIO_dump_fp(FILE *fp, const char *s, int len);
 int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent);
@@ -717,23 +720,24 @@ struct hostent *BIO_gethostbyname(const char *name);
  */
 int BIO_sock_error(int sock);
 int BIO_socket_ioctl(int fd, long type, void *arg);
-int BIO_socket_nbio(int fd,int mode);
+int BIO_socket_nbio(int fd, int mode);
 int BIO_get_port(const char *str, unsigned short *port_ptr);
 int BIO_get_host_ip(const char *str, unsigned char *ip);
-int BIO_get_accept_socket(char *host_port,int mode);
-int BIO_accept(int sock,char **ip_port);
+int BIO_get_accept_socket(char *host_port, int mode);
+int BIO_accept(int sock, char **ip_port);
 int BIO_sock_init(void );
 void BIO_sock_cleanup(void);
-int BIO_set_tcp_ndelay(int sock,int turn_on);
+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_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
@@ -741,8 +745,9 @@ BIO *BIO_new_fd(int fd, int close_flag);
 BIO *BIO_new_connect(char *host_port);
 BIO *BIO_new_accept(char *host_port);
 
-int BIO_new_bio_pair(BIO **bio1, size_t writebuf1,
-        BIO **bio2, size_t writebuf2);
+int
+BIO_new_bio_pair(BIO **bio1, size_t writebuf1,
+BIO **bio2, size_t writebuf2);
 /* If successful, returns 1 and in *bio1, *bio2 two BIO pair endpoints.
  * Otherwise returns 0 and sets *bio1 and *bio2 to NULL.
  * Size 0 uses default value.
@@ -757,14 +762,18 @@ void BIO_copy_next_retry(BIO *b);
 #else
 #  define __bio_h__attr__(x)
 #endif
-int BIO_printf(BIO *bio, const char *format, ...)
-        __bio_h__attr__((__format__(__printf__,2,3)));
-int BIO_vprintf(BIO *bio, const char *format, va_list args)
-        __bio_h__attr__((__format__(__printf__,2,0)));
-int BIO_snprintf(char *buf, size_t n, const char *format, ...)
-        __bio_h__attr__((__format__(__printf__,3,4)));
-int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args)
-        __bio_h__attr__((__format__(__printf__,3,0)));
+int
+BIO_printf(BIO *bio, const char *format, ...)
+__bio_h__attr__((__format__(__printf__, 2, 3)));
+int
+BIO_vprintf(BIO *bio, const char *format, va_list args)
+__bio_h__attr__((__format__(__printf__, 2, 0)));
+int
+BIO_snprintf(char *buf, size_t n, const char *format, ...)
+__bio_h__attr__((__format__(__printf__, 3, 4)));
+int
+BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args)
+__bio_h__attr__((__format__(__printf__, 3, 0)));
 #undef __bio_h__attr__
 
 /* BEGIN ERROR CODES */