Rustfmt

1 files changed, 145 insertions, 117 deletions

diff --git a/openssl-sys/src/ossl110.rs b/openssl-sys/src/ossl110.rs
index 1549b469..ff1e0c7c 100644
--- a/openssl-sys/src/ossl110.rs
+++ b/openssl-sys/src/ossl110.rs
@@ -62,8 +62,8 @@ pub fn init() {
     static INIT: Once = ONCE_INIT;
 
     INIT.call_once(|| unsafe {
-                       OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, ptr::null_mut());
-                   })
+        OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, ptr::null_mut());
+    })
 }
 
 extern "C" {
@@ -89,10 +89,11 @@ extern "C" {
     pub fn HMAC_CTX_new() -> *mut HMAC_CTX;
     pub fn HMAC_CTX_free(ctx: *mut HMAC_CTX);
 
-    pub fn OCSP_cert_to_id(dgst: *const ::EVP_MD,
-                           subject: *const ::X509,
-                           issuer: *const ::X509)
-                           -> *mut ::OCSP_CERTID;
+    pub fn OCSP_cert_to_id(
+        dgst: *const ::EVP_MD,
+        subject: *const ::X509,
+        issuer: *const ::X509,
+    ) -> *mut ::OCSP_CERTID;
 
     pub fn TLS_method() -> *const ::SSL_METHOD;
     pub fn DTLS_method() -> *const ::SSL_METHOD;
@@ -100,75 +101,90 @@ extern "C" {
     pub fn X509_get_subject_name(x: *const ::X509) -> *mut ::X509_NAME;
     pub fn X509_set1_notAfter(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int;
     pub fn X509_set1_notBefore(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int;
-    pub fn X509_get_ext_d2i(x: *const ::X509,
-                            nid: c_int,
-                            crit: *mut c_int,
-                            idx: *mut c_int)
-                            -> *mut c_void;
-    pub fn X509_NAME_add_entry_by_NID(x: *mut ::X509_NAME,
-                                      field: c_int,
-                                      ty: c_int,
-                                      bytes: *const c_uchar,
-                                      len: c_int,
-                                      loc: c_int,
-                                      set: c_int)
-                                      -> c_int;
+    pub fn X509_get_ext_d2i(
+        x: *const ::X509,
+        nid: c_int,
+        crit: *mut c_int,
+        idx: *mut c_int,
+    ) -> *mut c_void;
+    pub fn X509_NAME_add_entry_by_NID(
+        x: *mut ::X509_NAME,
+        field: c_int,
+        ty: c_int,
+        bytes: *const c_uchar,
+        len: c_int,
+        loc: c_int,
+        set: c_int,
+    ) -> c_int;
     pub fn X509_get_signature_nid(x: *const X509) -> c_int;
-    pub fn X509_ALGOR_get0(paobj: *mut *const ::ASN1_OBJECT,
-                           pptype: *mut c_int,
-                           ppval: *mut *const c_void,
-                           alg: *const ::X509_ALGOR);
+    pub fn X509_ALGOR_get0(
+        paobj: *mut *const ::ASN1_OBJECT,
+        pptype: *mut c_int,
+        ppval: *mut *const c_void,
+        alg: *const ::X509_ALGOR,
+    );
     pub fn X509_NAME_get_entry(n: *const ::X509_NAME, loc: c_int) -> *mut ::X509_NAME_ENTRY;
     pub fn X509_NAME_ENTRY_get_data(ne: *const ::X509_NAME_ENTRY) -> *mut ::ASN1_STRING;
-    pub fn X509V3_EXT_nconf_nid(conf: *mut ::CONF,
-                                ctx: *mut ::X509V3_CTX,
-                                ext_nid: c_int,
-                                value: *const c_char)
-                                -> *mut ::X509_EXTENSION;
-    pub fn X509V3_EXT_nconf(conf: *mut ::CONF,
-                            ctx: *mut ::X509V3_CTX,
-                            name: *const c_char,
-                            value: *const c_char)
-                            -> *mut ::X509_EXTENSION;
+    pub fn X509V3_EXT_nconf_nid(
+        conf: *mut ::CONF,
+        ctx: *mut ::X509V3_CTX,
+        ext_nid: c_int,
+        value: *const c_char,
+    ) -> *mut ::X509_EXTENSION;
+    pub fn X509V3_EXT_nconf(
+        conf: *mut ::CONF,
+        ctx: *mut ::X509V3_CTX,
+        name: *const c_char,
+        value: *const c_char,
+    ) -> *mut ::X509_EXTENSION;
     pub fn ASN1_STRING_to_UTF8(out: *mut *mut c_uchar, s: *const ::ASN1_STRING) -> c_int;
     pub fn BN_is_negative(b: *const ::BIGNUM) -> c_int;
     pub fn EVP_CIPHER_key_length(cipher: *const EVP_CIPHER) -> c_int;
     pub fn EVP_CIPHER_block_size(cipher: *const EVP_CIPHER) -> c_int;
     pub fn EVP_CIPHER_iv_length(cipher: *const EVP_CIPHER) -> c_int;
-    pub fn EVP_PBE_scrypt(pass: *const c_char,
-                          passlen: size_t,
-                          salt: *const c_uchar,
-                          saltlen: size_t,
-                          N: u64,
-                          r: u64,
-                          p: u64,
-                          maxmem: u64,
-                          key: *mut c_uchar,
-                          keylen: size_t)
-                          -> c_int;
-    pub fn DSA_get0_pqg(d: *const ::DSA,
-                        p: *mut *const ::BIGNUM,
-                        q: *mut *const ::BIGNUM,
-                        q: *mut *const ::BIGNUM);
-    pub fn DSA_get0_key(d: *const ::DSA,
-                        pub_key: *mut *const ::BIGNUM,
-                        priv_key: *mut *const ::BIGNUM);
-    pub fn RSA_get0_key(r: *const ::RSA,
-                        n: *mut *const ::BIGNUM,
-                        e: *mut *const ::BIGNUM,
-                        d: *mut *const ::BIGNUM);
+    pub fn EVP_PBE_scrypt(
+        pass: *const c_char,
+        passlen: size_t,
+        salt: *const c_uchar,
+        saltlen: size_t,
+        N: u64,
+        r: u64,
+        p: u64,
+        maxmem: u64,
+        key: *mut c_uchar,
+        keylen: size_t,
+    ) -> c_int;
+    pub fn DSA_get0_pqg(
+        d: *const ::DSA,
+        p: *mut *const ::BIGNUM,
+        q: *mut *const ::BIGNUM,
+        q: *mut *const ::BIGNUM,
+    );
+    pub fn DSA_get0_key(
+        d: *const ::DSA,
+        pub_key: *mut *const ::BIGNUM,
+        priv_key: *mut *const ::BIGNUM,
+    );
+    pub fn RSA_get0_key(
+        r: *const ::RSA,
+        n: *mut *const ::BIGNUM,
+        e: *mut *const ::BIGNUM,
+        d: *mut *const ::BIGNUM,
+    );
     pub fn RSA_get0_factors(r: *const ::RSA, p: *mut *const ::BIGNUM, q: *mut *const ::BIGNUM);
-    pub fn RSA_set0_key(r: *mut ::RSA,
-                        n: *mut ::BIGNUM,
-                        e: *mut ::BIGNUM,
-                        d: *mut ::BIGNUM)
-                        -> c_int;
+    pub fn RSA_set0_key(
+        r: *mut ::RSA,
+        n: *mut ::BIGNUM,
+        e: *mut ::BIGNUM,
+        d: *mut ::BIGNUM,
+    ) -> c_int;
     pub fn RSA_set0_factors(r: *mut ::RSA, p: *mut ::BIGNUM, q: *mut ::BIGNUM) -> c_int;
-    pub fn RSA_set0_crt_params(r: *mut ::RSA,
-                               dmp1: *mut ::BIGNUM,
-                               dmq1: *mut ::BIGNUM,
-                               iqmp: *mut ::BIGNUM)
-                               -> c_int;
+    pub fn RSA_set0_crt_params(
+        r: *mut ::RSA,
+        dmp1: *mut ::BIGNUM,
+        dmq1: *mut ::BIGNUM,
+        iqmp: *mut ::BIGNUM,
+    ) -> c_int;
     pub fn ASN1_STRING_get0_data(x: *const ::ASN1_STRING) -> *const c_uchar;
     pub fn OPENSSL_sk_num(stack: *const ::OPENSSL_STACK) -> c_int;
     pub fn OPENSSL_sk_value(stack: *const ::OPENSSL_STACK, idx: c_int) -> *mut c_void;
@@ -177,53 +193,62 @@ extern "C" {
     pub fn SSL_CTX_clear_options(ctx: *mut ::SSL_CTX, op: c_ulong) -> c_ulong;
     pub fn X509_getm_notAfter(x: *const ::X509) -> *mut ::ASN1_TIME;
     pub fn X509_getm_notBefore(x: *const ::X509) -> *mut ::ASN1_TIME;
-    pub fn X509_get0_signature(psig: *mut *const ::ASN1_BIT_STRING,
-                               palg: *mut *const ::X509_ALGOR,
-                               x: *const ::X509);
-    pub fn DH_set0_pqg(dh: *mut ::DH,
-                       p: *mut ::BIGNUM,
-                       q: *mut ::BIGNUM,
-                       g: *mut ::BIGNUM)
-                       -> c_int;
+    pub fn X509_get0_signature(
+        psig: *mut *const ::ASN1_BIT_STRING,
+        palg: *mut *const ::X509_ALGOR,
+        x: *const ::X509,
+    );
+    pub fn DH_set0_pqg(
+        dh: *mut ::DH,
+        p: *mut ::BIGNUM,
+        q: *mut ::BIGNUM,
+        g: *mut ::BIGNUM,
+    ) -> c_int;
     pub fn BIO_set_init(a: *mut ::BIO, init: c_int);
     pub fn BIO_set_data(a: *mut ::BIO, data: *mut c_void);
     pub fn BIO_get_data(a: *mut ::BIO) -> *mut c_void;
     pub fn BIO_meth_new(type_: c_int, name: *const c_char) -> *mut ::BIO_METHOD;
     pub fn BIO_meth_free(biom: *mut ::BIO_METHOD);
-    pub fn BIO_meth_set_write(biom: *mut ::BIO_METHOD,
-                              write: unsafe extern "C" fn(*mut ::BIO, *const c_char, c_int)
-                                                          -> c_int)
-                              -> c_int;
-    pub fn BIO_meth_set_read(biom: *mut ::BIO_METHOD,
-                             read: unsafe extern "C" fn(*mut ::BIO, *mut c_char, c_int) -> c_int)
-                             -> c_int;
-    pub fn BIO_meth_set_puts(biom: *mut ::BIO_METHOD,
-                             read: unsafe extern "C" fn(*mut ::BIO, *const c_char) -> c_int)
-                             -> c_int;
-    pub fn BIO_meth_set_ctrl(biom: *mut ::BIO_METHOD,
-                             read: unsafe extern "C" fn(*mut ::BIO, c_int, c_long, *mut c_void)
-                                                        -> c_long)
-                             -> c_int;
-    pub fn BIO_meth_set_create(biom: *mut ::BIO_METHOD,
-                               create: unsafe extern "C" fn(*mut ::BIO) -> c_int)
-                               -> c_int;
-    pub fn BIO_meth_set_destroy(biom: *mut ::BIO_METHOD,
-                                destroy: unsafe extern "C" fn(*mut ::BIO) -> c_int)
-                                -> c_int;
-    pub fn CRYPTO_get_ex_new_index(class_index: c_int,
-                                   argl: c_long,
-                                   argp: *mut c_void,
-                                   new_func: Option<::CRYPTO_EX_new>,
-                                   dup_func: Option<::CRYPTO_EX_dup>,
-                                   free_func: Option<::CRYPTO_EX_free>)
-                                   -> c_int;
+    pub fn BIO_meth_set_write(
+        biom: *mut ::BIO_METHOD,
+        write: unsafe extern "C" fn(*mut ::BIO, *const c_char, c_int) -> c_int,
+    ) -> c_int;
+    pub fn BIO_meth_set_read(
+        biom: *mut ::BIO_METHOD,
+        read: unsafe extern "C" fn(*mut ::BIO, *mut c_char, c_int) -> c_int,
+    ) -> c_int;
+    pub fn BIO_meth_set_puts(
+        biom: *mut ::BIO_METHOD,
+        read: unsafe extern "C" fn(*mut ::BIO, *const c_char) -> c_int,
+    ) -> c_int;
+    pub fn BIO_meth_set_ctrl(
+        biom: *mut ::BIO_METHOD,
+        read: unsafe extern "C" fn(*mut ::BIO, c_int, c_long, *mut c_void) -> c_long,
+    ) -> c_int;
+    pub fn BIO_meth_set_create(
+        biom: *mut ::BIO_METHOD,
+        create: unsafe extern "C" fn(*mut ::BIO) -> c_int,
+    ) -> c_int;
+    pub fn BIO_meth_set_destroy(
+        biom: *mut ::BIO_METHOD,
+        destroy: unsafe extern "C" fn(*mut ::BIO) -> c_int,
+    ) -> c_int;
+    pub fn CRYPTO_get_ex_new_index(
+        class_index: c_int,
+        argl: c_long,
+        argp: *mut c_void,
+        new_func: Option<::CRYPTO_EX_new>,
+        dup_func: Option<::CRYPTO_EX_dup>,
+        free_func: Option<::CRYPTO_EX_free>,
+    ) -> c_int;
     pub fn X509_up_ref(x: *mut X509) -> c_int;
     pub fn SSL_CTX_up_ref(x: *mut SSL_CTX) -> c_int;
     pub fn SSL_session_reused(ssl: *mut SSL) -> c_int;
-    pub fn SSL_SESSION_get_master_key(session: *const SSL_SESSION,
-                                      out: *mut c_uchar,
-                                      outlen: size_t)
-                                      -> size_t;
+    pub fn SSL_SESSION_get_master_key(
+        session: *const SSL_SESSION,
+        out: *mut c_uchar,
+        outlen: size_t,
+    ) -> size_t;
     pub fn SSL_SESSION_up_ref(ses: *mut SSL_SESSION) -> c_int;
     pub fn X509_get0_extensions(req: *const ::X509) -> *const stack_st_X509_EXTENSION;
     pub fn X509_STORE_CTX_get0_chain(ctx: *mut ::X509_STORE_CTX) -> *mut stack_st_X509;
@@ -236,22 +261,25 @@ extern "C" {
     pub fn OPENSSL_init_ssl(opts: u64, settings: *const OPENSSL_INIT_SETTINGS) -> c_int;
     pub fn OPENSSL_sk_new_null() -> *mut ::OPENSSL_STACK;
     pub fn OPENSSL_sk_free(st: *mut ::OPENSSL_STACK);
-    pub fn OPENSSL_sk_pop_free(st: *mut ::OPENSSL_STACK,
-                               free: Option<unsafe extern "C" fn(*mut c_void)>);
+    pub fn OPENSSL_sk_pop_free(
+        st: *mut ::OPENSSL_STACK,
+        free: Option<unsafe extern "C" fn(*mut c_void)>,
+    );
     pub fn OPENSSL_sk_push(st: *mut ::OPENSSL_STACK, data: *const c_void) -> c_int;
     pub fn OPENSSL_sk_pop(st: *mut ::OPENSSL_STACK) -> *mut c_void;
 
-    pub fn PKCS12_create(pass: *const c_char,
-                         friendly_name: *const c_char,
-                         pkey: *mut EVP_PKEY,
-                         cert: *mut X509,
-                         ca: *mut stack_st_X509,
-                         nid_key: c_int,
-                         nid_cert: c_int,
-                         iter: c_int,
-                         mac_iter: c_int,
-                         keytype: c_int)
-                         -> *mut PKCS12;
+    pub fn PKCS12_create(
+        pass: *const c_char,
+        friendly_name: *const c_char,
+        pkey: *mut EVP_PKEY,
+        cert: *mut X509,
+        ca: *mut stack_st_X509,
+        nid_key: c_int,
+        nid_cert: c_int,
+        iter: c_int,
+        mac_iter: c_int,
+        keytype: c_int,
+    ) -> *mut PKCS12;
     pub fn X509_REQ_get_version(req: *const X509_REQ) -> c_long;
     pub fn X509_REQ_get_subject_name(req: *const X509_REQ) -> *mut ::X509_NAME;
 }