[vala-extra-vapis/wip/openssl: 4/4] add BIO print function



commit ed4c0de3cc8b26bbf4d5cf979b980a52908b4ef4
Author: taozuhong <taozuhong gmail com>
Date:   Sat Jun 27 14:50:24 2020 +0800

    add BIO print function

 openssl.vapi | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)
---
diff --git a/openssl.vapi b/openssl.vapi
index e15dd6b..28ca534 100644
--- a/openssl.vapi
+++ b/openssl.vapi
@@ -141,9 +141,18 @@ namespace OpenSSL
                public int read (uint8[] data);
                public int write (uint8[] data);
 
+               [PrintfFormat]
                public int printf (string format, ...);
+
+               [PrintfFormat]
                public int vprintf (string format, va_list args);
 
+               [PrintfFormat]
+               public static int snprintf (uint8[] buf, string format, ...);
+
+               [PrintfFormat]
+               public static int vsnprintf (uint8[] buf, string format, va_list args);
+
                public int reset ();
                public int seek (int ofs);
                public int pending ();
@@ -757,30 +766,30 @@ namespace OpenSSL
        {
                [CCode (cname = "pem_password_cb")]
                public delegate int PasswordCallback (uint8[] buf, int flag);
-               public RSA? read_RSAPrivateKey (GLib.FileStream f, out RSA x, PasswordCallback? cb = null);
-               public RSA? read_RSAPublicKey (GLib.FileStream f, out RSA x, PasswordCallback? cb);
-               public int write_RSAPrivateKey (GLib.FileStream f, RSA x, EVP.Cipher? enc, uint8[] kstr, 
PasswordCallback? cb);
+               public void read_RSAPrivateKey (GLib.FileStream f, out RSA x, PasswordCallback? cb = null);
+               public void read_RSAPublicKey (GLib.FileStream f, out RSA x, PasswordCallback? cb = null);
+               public int write_RSAPrivateKey (GLib.FileStream f, RSA x, EVP.Cipher? enc, uint8[] kstr, 
PasswordCallback? cb = null);
                public int write_RSAPublicKey (GLib.FileStream f, RSA x);
 
-               public RSA? read_bio_RSAPublicKey (BIO bp, out RSA x, PasswordCallback? cb);
-               public RSA? read_bio_RSAPrivateKey (BIO bp, out RSA x, PasswordCallback? cb);
+               public void read_bio_RSAPublicKey (BIO bp, out RSA x, PasswordCallback? cb = null);
+               public void read_bio_RSAPrivateKey (BIO bp, out RSA x, PasswordCallback? cb = null);
                public bool write_bio_RSAPublicKey (BIO bp, RSA x);
-               public bool write_bio_RSAPrivateKey (BIO bp, RSA x, EVP.Cipher? enc, uint8[] kstr, 
PasswordCallback? cb);
+               public bool write_bio_RSAPrivateKey (BIO bp, RSA x, EVP.Cipher? enc, uint8[] kstr, 
PasswordCallback? cb = null);
 
-               public EVP.PublicKey? read_bio_PUBKEY (BIO bp, out EVP.PublicKey x, PasswordCallback? cb);
+               public void read_bio_PUBKEY (BIO bp, out EVP.PublicKey x, PasswordCallback? cb = null);
                public int write_bio_PUBKEY (BIO bp, EVP.PublicKey x);
-               public EVP.PublicKey? read_PUBKEY (GLib.FileStream fp, out EVP.PublicKey x, PasswordCallback? 
cb);
+               public void read_PUBKEY (GLib.FileStream fp, out EVP.PublicKey x, PasswordCallback? cb = 
null);
                public int write_PUBKEY (GLib.FileStream fp, EVP.PublicKey x);
 
-               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_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);
-               public int write_PKCS8PrivateKey_nid (GLib.FileStream fp, EVP.PublicKey x, int nid, uint8[] 
kstr, PasswordCallback? cb);
+               public void read_bio_PrivateKey (BIO bp, out EVP.PublicKey x, PasswordCallback? cb = null);
+               public void read_PrivateKey (GLib.FileStream fp, out EVP.PublicKey x, PasswordCallback? cb = 
null);
+               public int write_bio_PrivateKey (BIO bp, EVP.PublicKey x, EVP.Cipher? enc, uint8[] kstr, 
PasswordCallback? cb = null);
+               public int write_bio_PrivateKey_traditional (BIO bp, EVP.PublicKey x, EVP.Cipher? enc, 
uint8[] kstr, PasswordCallback? cb = null);
+               public int write_PrivateKey (GLib.FileStream fp, EVP.PublicKey x, EVP.Cipher? enc, uint8[] 
kstr, PasswordCallback? cb = null);
+               public int write_bio_PKCS8PrivateKey (BIO bp, EVP.PublicKey x, EVP.Cipher? enc, uint8[] kstr, 
PasswordCallback? cb = null);
+               public int write_bio_PKCS8PrivateKey_nid (BIO bp, EVP.PublicKey x, int nid, uint8[] kstr, 
PasswordCallback? cb = null);
+               public int write_PKCS8PrivateKey (GLib.FileStream fp, EVP.PublicKey x, EVP.Cipher? enc, 
uint8[] kstr, PasswordCallback? cb = null);
+               public int write_PKCS8PrivateKey_nid (GLib.FileStream fp, EVP.PublicKey x, int nid, uint8[] 
kstr, PasswordCallback? cb = null);
        }
 
        public RSA? d2i_RSA_PUBKEY (out RSA a, uint8[] ppin);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]