[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  3cd3f0024bd432f5396979757a5cf075cc0955d2 (commit)
       via  83f2695c318613cb22e11e8c5e5a7c9d89ceff56 (commit)
      from  be4ba1b06c9532996f57246d5f46bc7c8711732d (commit)


- Log -----------------------------------------------------------------
commit 3cd3f0024bd432f5396979757a5cf075cc0955d2
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Apr 29 18:59:20 2016 +0200

    Remove BIO_dummy, it's old cruft
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 83f2695c318613cb22e11e8c5e5a7c9d89ceff56
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Apr 29 18:57:58 2016 +0200

    Change 'struct bio_st' in all public header where applicable
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/bio.h    | 9 ++++-----
 include/openssl/crypto.h | 3 ---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index 42468b0..03a6f04 100644
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -284,10 +284,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 *,
+long (*BIO_get_callback(const BIO *b)) (BIO *, int, const char *,
                                         int, long, long);
 void BIO_set_callback(BIO *b,
-                      long (*callback) (struct bio_st *, int, const char *,
+                      long (*callback) (BIO *, int, const char *,
                                         int, long, long));
 char *BIO_get_callback_arg(const BIO *b);
 void BIO_set_callback_arg(BIO *b, char *arg);
@@ -297,7 +297,7 @@ typedef struct bio_method_st BIO_METHOD;
 const char *BIO_method_name(const BIO *b);
 int BIO_method_type(const BIO *b);
 
-typedef void bio_info_cb (struct bio_st *, int, const char *, int, long,
+typedef void bio_info_cb (BIO *, int, const char *, int, long,
                           long);
 
 DEFINE_STACK_OF(BIO)
@@ -601,8 +601,7 @@ 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));
+                       void (*fp) (BIO *, int, const char *, int, long, long));
 void *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);
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index 2cee894..0eaf6b1 100644
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -188,9 +188,6 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock);
 # define CRYPTO_MEM_CHECK_ENABLE  0x2   /* Control and mode bit */
 # define CRYPTO_MEM_CHECK_DISABLE 0x3   /* Control only */
 
-/* predec of the BIO type */
-typedef struct bio_st BIO_dummy;
-
 struct crypto_ex_data_st {
     STACK_OF(void) *sk;
 };