[vala-extra-vapis/wip/openssl: 3/4] Merge remote-tracking branch 'upstream/wip/openssl'

[Rico Tzschichholz <ricotz src gnome org>]

commit ae9654123ab3bc67b7f540b9e2db05e42672b22c
Merge: c92f66e 92d9986
Author: taozuhong <taozuhong gmail com>
Date:   Sat Jun 27 14:02:19 2020 +0800

    Merge remote-tracking branch 'upstream/wip/openssl'

 libmarkdown.vapi |  2 +-
 openssl.vapi     | 22 +++++-----------------
 sdl2.vapi        |  6 +++---
 3 files changed, 9 insertions(+), 21 deletions(-)
---
diff --cc openssl.vapi
index 1416253,1fd250d..e15dd6b
--- a/openssl.vapi
+++ b/openssl.vapi
@@@ -684,13 -684,13 +684,10 @@@ namespace OpenSS
        public class BIGNUM {
                [CCode (cname = "BN_new", cheader_filename = "openssl/bn.h")]
                public BIGNUM ();
-       
 -
                [CCode (cname = "BN_secure_new", cheader_filename = "openssl/bn.h")]
                public BIGNUM.secure ();
--
                [CCode (cname = "BN_clear", cheader_filename = "openssl/bn.h")]
                public void clear ();
--
                [CCode (cname = "BN_set_word", cheader_filename = "openssl/bn.h")]
                public int set_word (ulong w);
        }
@@@ -786,9 -778,9 +775,8 @@@
                public EVP.PublicKey? read_bio_PrivateKey (BIO bp, out EVP.PublicKey x, PasswordCallback? cb);
                public EVP.PublicKey? read_PrivateKey (GLib.FileStream fp, out EVP.PublicKey x, 
PasswordCallback? cb);
                public int write_bio_PrivateKey (BIO bp, EVP.PublicKey x, EVP.Cipher? enc, uint8[] kstr, 
PasswordCallback? cb);
-               public int write_bio_PrivateKey_traditional (BIO bp, EVP.PublicKey x, EVP.Cipher? enc, 
uint8[] kstr, PasswordCallback? cb);
-               public int write_PrivateKey (GLib.FileStream fp, EVP.PublicKey x, EVP.Cipher? enc, uint8[] 
kstr, PasswordCallback? cb);         
- 
+               public int write_bio_PrivateKey_traditional (BIO bp, EVP.PublicKey x, EVP.Cipher? enc, 
uint8[] kstr, PasswordCallback? cb);
+               public int write_PrivateKey (GLib.FileStream fp, EVP.PublicKey x, EVP.Cipher? enc, uint8[] 
kstr, PasswordCallback? cb);
 -
                public int write_bio_PKCS8PrivateKey (BIO bp, EVP.PublicKey x, EVP.Cipher? enc, uint8[] kstr, 
PasswordCallback? cb);
                public int write_bio_PKCS8PrivateKey_nid (BIO bp, EVP.PublicKey x, int nid, uint8[] kstr, 
PasswordCallback? cb);
                public int write_PKCS8PrivateKey (GLib.FileStream fp, EVP.PublicKey x, EVP.Cipher? enc, 
uint8[] kstr, PasswordCallback? cb);