Skip to content

Commit 8c40c2e

Browse files
sfacklersfackler
committed
Update for * -> *const change
1 parent bfd8fa2 commit 8c40c2e

File tree

7 files changed

+120
-120
lines changed

7 files changed

+120
-120
lines changed

‎crypto/hash.rs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ pub enum HashType {
1414
#[allow(dead_code)]
1515
#[allow(non_camel_case_types)]
1616
pub struct EVP_MD_CTX {
17-
digest: *EVP_MD,
18-
engine: *libc::c_void,
17+
digest: *mut EVP_MD,
18+
engine: *mut libc::c_void,
1919
flags: libc::c_ulong,
20-
md_data: *libc::c_void,
21-
pctx: *EVP_PKEY_CTX,
22-
update: *libc::c_void
20+
md_data: *mut libc::c_void,
21+
pctx: *mut EVP_PKEY_CTX,
22+
update: *mut libc::c_void
2323
}
2424

2525
#[allow(non_camel_case_types)]
@@ -30,22 +30,22 @@ pub struct EVP_PKEY_CTX;
3030

3131
#[link(name = "crypto")]
3232
extern {
33-
fn EVP_MD_CTX_create() -> *EVP_MD_CTX;
34-
fn EVP_MD_CTX_destroy(ctx: *EVP_MD_CTX);
35-
36-
fn EVP_md5() -> *EVP_MD;
37-
fn EVP_sha1() -> *EVP_MD;
38-
fn EVP_sha224() -> *EVP_MD;
39-
fn EVP_sha256() -> *EVP_MD;
40-
fn EVP_sha384() -> *EVP_MD;
41-
fn EVP_sha512() -> *EVP_MD;
42-
43-
fn EVP_DigestInit(ctx: *EVP_MD_CTX, typ: *EVP_MD);
44-
fn EVP_DigestUpdate(ctx: *EVP_MD_CTX, data: *u8, n: c_uint);
45-
fn EVP_DigestFinal(ctx: *EVP_MD_CTX, res: *mut u8, n: *u32);
33+
fn EVP_MD_CTX_create() -> *mut EVP_MD_CTX;
34+
fn EVP_MD_CTX_destroy(ctx: *mut EVP_MD_CTX);
35+
36+
fn EVP_md5() -> *const EVP_MD;
37+
fn EVP_sha1() -> *const EVP_MD;
38+
fn EVP_sha224() -> *const EVP_MD;
39+
fn EVP_sha256() -> *const EVP_MD;
40+
fn EVP_sha384() -> *const EVP_MD;
41+
fn EVP_sha512() -> *const EVP_MD;
42+
43+
fn EVP_DigestInit(ctx: *mut EVP_MD_CTX, typ: *const EVP_MD);
44+
fn EVP_DigestUpdate(ctx: *mut EVP_MD_CTX, data: *const u8, n: c_uint);
45+
fn EVP_DigestFinal(ctx: *mut EVP_MD_CTX, res: *mut u8, n: *mut u32);
4646
}
4747

48-
pub fn evpmd(t: HashType) -> (*EVP_MD, uint) {
48+
pub fn evpmd(t: HashType) -> (*const EVP_MD, uint) {
4949
unsafe {
5050
match t {
5151
MD5 => (EVP_md5(), 16u),
@@ -60,8 +60,8 @@ pub fn evpmd(t: HashType) -> (*EVP_MD, uint) {
6060

6161
#[allow(dead_code)]
6262
pub struct Hasher {
63-
evp: *EVP_MD,
64-
ctx: *EVP_MD_CTX,
63+
evp: *const EVP_MD,
64+
ctx: *mut EVP_MD_CTX,
6565
len: uint,
6666
}
6767

@@ -90,7 +90,7 @@ impl Hasher {
9090
pub fn final(&self) -> Vec<u8> {
9191
unsafe {
9292
let mut res = Vec::from_elem(self.len, 0u8);
93-
EVP_DigestFinal(self.ctx, res.as_mut_ptr(), ptr::null());
93+
EVP_DigestFinal(self.ctx, res.as_mut_ptr(), ptr::mut_null());
9494
res
9595
}
9696
}

‎crypto/hmac.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use crypto::hash;
2020
#[allow(dead_code)]
2121
#[allow(non_camel_case_types)]
2222
pub struct HMAC_CTX {
23-
md: *hash::EVP_MD,
23+
md: *mut hash::EVP_MD,
2424
md_ctx: hash::EVP_MD_CTX,
2525
i_ctx: hash::EVP_MD_CTX,
2626
o_ctx: hash::EVP_MD_CTX,
@@ -31,8 +31,8 @@ pub struct HMAC_CTX {
3131
#[link(name = "crypto")]
3232
extern {
3333
fn HMAC_CTX_init(ctx: *mut HMAC_CTX);
34-
fn HMAC_Init_ex(ctx: *mut HMAC_CTX, key: *u8, keylen: c_int, md: *hash::EVP_MD, imple: *ENGINE);
35-
fn HMAC_Update(ctx: *mut HMAC_CTX, input: *u8, len: c_uint);
34+
fn HMAC_Init_ex(ctx: *mut HMAC_CTX, key: *const u8, keylen: c_int, md: *const hash::EVP_MD, imple: *const ENGINE);
35+
fn HMAC_Update(ctx: *mut HMAC_CTX, input: *const u8, len: c_uint);
3636
fn HMAC_Final(ctx: *mut HMAC_CTX, output: *mut u8, len: *mut c_uint);
3737
}
3838

@@ -55,7 +55,7 @@ pub fn HMAC(ht: hash::HashType, key: &[u8]) -> HMAC {
5555
HMAC_Init_ex(&mut ctx,
5656
key.as_ptr(),
5757
key.len() as c_int,
58-
evp, 0 as *_);
58+
evp, 0 as *const _);
5959

6060
HMAC { ctx: ctx, len: mdlen }
6161
}

‎crypto/pkcs5.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use libc::c_int;
22

33
#[link(name = "crypto")]
44
extern {
5-
fn PKCS5_PBKDF2_HMAC_SHA1(pass: *u8, passlen: c_int,
6-
salt: *u8, saltlen: c_int,
5+
fn PKCS5_PBKDF2_HMAC_SHA1(pass: *const u8, passlen: c_int,
6+
salt: *const u8, saltlen: c_int,
77
iter: c_int, keylen: c_int,
88
out: *mut u8) -> c_int;
99
}

‎crypto/pkey.rs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,34 @@ use std::ptr;
55
use crypto::hash::{HashType, MD5, SHA1, SHA224, SHA256, SHA384, SHA512};
66

77
#[allow(non_camel_case_types)]
8-
pub type EVP_PKEY = *libc::c_void;
8+
pub type EVP_PKEY = *mut libc::c_void;
99

1010
#[allow(non_camel_case_types)]
11-
pub type RSA = *libc::c_void;
11+
pub type RSA = *mut libc::c_void;
1212

1313
#[link(name = "crypto")]
1414
extern {
15-
fn EVP_PKEY_new() -> *EVP_PKEY;
16-
fn EVP_PKEY_free(k: *EVP_PKEY);
17-
fn EVP_PKEY_assign(pkey: *EVP_PKEY, typ: c_int, key: *c_char) -> c_int;
18-
fn EVP_PKEY_get1_RSA(k: *EVP_PKEY) -> *RSA;
15+
fn EVP_PKEY_new() -> *mut EVP_PKEY;
16+
fn EVP_PKEY_free(k: *mut EVP_PKEY);
17+
fn EVP_PKEY_assign(pkey: *mut EVP_PKEY, typ: c_int, key: *const c_char) -> c_int;
18+
fn EVP_PKEY_get1_RSA(k: *mut EVP_PKEY) -> *mut RSA;
1919

20-
fn i2d_PublicKey(k: *EVP_PKEY, buf: **mut u8) -> c_int;
21-
fn d2i_PublicKey(t: c_int, k: **EVP_PKEY, buf: **u8, len: c_uint) -> *EVP_PKEY;
22-
fn i2d_PrivateKey(k: *EVP_PKEY, buf: **mut u8) -> c_int;
23-
fn d2i_PrivateKey(t: c_int, k: **EVP_PKEY, buf: **u8, len: c_uint) -> *EVP_PKEY;
20+
fn i2d_PublicKey(k: *mut EVP_PKEY, buf: *const *mut u8) -> c_int;
21+
fn d2i_PublicKey(t: c_int, k: *const *mut EVP_PKEY, buf: *const *const u8, len: c_uint) -> *mut EVP_PKEY;
22+
fn i2d_PrivateKey(k: *mut EVP_PKEY, buf: *const *mut u8) -> c_int;
23+
fn d2i_PrivateKey(t: c_int, k: *const *mut EVP_PKEY, buf: *const *const u8, len: c_uint) -> *mut EVP_PKEY;
2424

25-
fn RSA_generate_key(modsz: c_uint, e: c_uint, cb: *u8, cbarg: *u8) -> *RSA;
26-
fn RSA_size(k: *RSA) -> c_uint;
25+
fn RSA_generate_key(modsz: c_uint, e: c_uint, cb: *const u8, cbarg: *const u8) -> *mut RSA;
26+
fn RSA_size(k: *mut RSA) -> c_uint;
2727

28-
fn RSA_public_encrypt(flen: c_uint, from: *u8, to: *mut u8, k: *RSA,
28+
fn RSA_public_encrypt(flen: c_uint, from: *const u8, to: *mut u8, k: *mut RSA,
2929
pad: c_int) -> c_int;
30-
fn RSA_private_decrypt(flen: c_uint, from: *u8, to: *mut u8, k: *RSA,
30+
fn RSA_private_decrypt(flen: c_uint, from: *const u8, to: *mut u8, k: *mut RSA,
3131
pad: c_int) -> c_int;
32-
fn RSA_sign(t: c_int, m: *u8, mlen: c_uint, sig: *mut u8, siglen: *mut c_uint,
33-
k: *RSA) -> c_int;
34-
fn RSA_verify(t: c_int, m: *u8, mlen: c_uint, sig: *u8, siglen: c_uint,
35-
k: *RSA) -> c_int;
32+
fn RSA_sign(t: c_int, m: *const u8, mlen: c_uint, sig: *mut u8, siglen: *mut c_uint,
33+
k: *mut RSA) -> c_int;
34+
fn RSA_verify(t: c_int, m: *const u8, mlen: c_uint, sig: *const u8, siglen: c_uint,
35+
k: *mut RSA) -> c_int;
3636
}
3737

3838
enum Parts {
@@ -74,7 +74,7 @@ fn openssl_hash_nid(hash: HashType) -> c_int {
7474
}
7575

7676
pub struct PKey {
77-
evp: *EVP_PKEY,
77+
evp: *mut EVP_PKEY,
7878
parts: Parts,
7979
}
8080

@@ -89,7 +89,7 @@ impl PKey {
8989
}
9090
}
9191

92-
fn _tostr(&self, f: unsafe extern "C" fn(*EVP_PKEY, **mut u8) -> c_int) -> Vec<u8> {
92+
fn _tostr(&self, f: unsafe extern "C" fn(*mut EVP_PKEY, *const *mut u8) -> c_int) -> Vec<u8> {
9393
unsafe {
9494
let len = f(self.evp, ptr::null());
9595
if len < 0 as c_int { return vec!(); }
@@ -102,9 +102,9 @@ impl PKey {
102102
}
103103
}
104104

105-
fn _fromstr(&mut self, s: &[u8], f: unsafe extern "C" fn(c_int, **EVP_PKEY, **u8, c_uint) -> *EVP_PKEY) {
105+
fn _fromstr(&mut self, s: &[u8], f: unsafe extern "C" fn(c_int, *const *mut EVP_PKEY, *const *const u8, c_uint) -> *mut EVP_PKEY) {
106106
unsafe {
107-
let evp = ptr::null();
107+
let evp = ptr::mut_null();
108108
f(6 as c_int, &evp, &s.as_ptr(), s.len() as c_uint);
109109
self.evp = evp;
110110
}

‎crypto/symm.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ use libc::{c_int, c_uint};
22
use libc;
33

44
#[allow(non_camel_case_types)]
5-
pub type EVP_CIPHER_CTX = *libc::c_void;
5+
pub type EVP_CIPHER_CTX = *mut libc::c_void;
66

77
#[allow(non_camel_case_types)]
8-
pub type EVP_CIPHER = *libc::c_void;
8+
pub type EVP_CIPHER = *mut libc::c_void;
99

1010
#[link(name = "crypto")]
1111
extern {
@@ -26,9 +26,9 @@ extern {
2626
fn EVP_rc4() -> EVP_CIPHER;
2727

2828
fn EVP_CipherInit(ctx: EVP_CIPHER_CTX, evp: EVP_CIPHER,
29-
key: *u8, iv: *u8, mode: c_int);
29+
key: *const u8, iv: *const u8, mode: c_int);
3030
fn EVP_CipherUpdate(ctx: EVP_CIPHER_CTX, outbuf: *mut u8,
31-
outlen: &mut c_uint, inbuf: *u8, inlen: c_int);
31+
outlen: &mut c_uint, inbuf: *const u8, inlen: c_int);
3232
fn EVP_CipherFinal(ctx: EVP_CIPHER_CTX, res: *mut u8, len: &mut c_int);
3333
}
3434

‎ssl/ffi.rs‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ pub type X509 = c_void;
1212
pub type X509_NAME = c_void;
1313
pub type CRYPTO_EX_DATA = c_void;
1414

15-
pub type CRYPTO_EX_new = extern "C" fn(parent: *c_void, ptr: *c_void,
16-
ad: *CRYPTO_EX_DATA, idx: c_int,
17-
argl: c_long, argp: *c_void) -> c_int;
18-
pub type CRYPTO_EX_dup = extern "C" fn(to: *CRYPTO_EX_DATA,
19-
from: *CRYPTO_EX_DATA, from_d: *c_void,
20-
idx: c_int, argl: c_long, argp: *c_void)
15+
pub type CRYPTO_EX_new = extern "C" fn(parent: *mut c_void, ptr: *mut c_void,
16+
ad: *const CRYPTO_EX_DATA, idx: c_int,
17+
argl: c_long, argp: *const c_void) -> c_int;
18+
pub type CRYPTO_EX_dup = extern "C" fn(to: *mut CRYPTO_EX_DATA,
19+
from: *mut CRYPTO_EX_DATA, from_d: *mut c_void,
20+
idx: c_int, argl: c_long, argp: *mut c_void)
2121
-> c_int;
22-
pub type CRYPTO_EX_free = extern "C" fn(parent: *c_void, ptr: *c_void,
23-
ad: *CRYPTO_EX_DATA, idx: c_int,
24-
argl: c_long, argp: *c_void);
22+
pub type CRYPTO_EX_free = extern "C" fn(parent: *mut c_void, ptr: *mut c_void,
23+
ad: *mut CRYPTO_EX_DATA, idx: c_int,
24+
argl: c_long, argp: *mut c_void);
2525

2626
pub static CRYPTO_LOCK: c_int = 1;
2727

@@ -103,58 +103,58 @@ extern "C" {
103103
pub fn CRYPTO_num_locks() -> c_int;
104104
pub fn CRYPTO_set_locking_callback(func: extern "C" fn(mode: c_int,
105105
n: c_int,
106-
file: *c_char,
106+
file: *const c_char,
107107
line: c_int));
108108

109109
pub fn ERR_get_error() -> c_ulong;
110110

111111
pub fn SSL_library_init() -> c_int;
112112

113113
#[cfg(sslv2)]
114-
pub fn SSLv2_method() -> *SSL_METHOD;
115-
pub fn SSLv3_method() -> *SSL_METHOD;
116-
pub fn TLSv1_method() -> *SSL_METHOD;
117-
pub fn SSLv23_method() -> *SSL_METHOD;
118-
119-
pub fn SSL_CTX_new(method: *SSL_METHOD) -> *SSL_CTX;
120-
pub fn SSL_CTX_free(ctx: *SSL_CTX);
121-
pub fn SSL_CTX_set_verify(ctx: *SSL_CTX, mode: c_int,
122-
verify_callback: Option<extern fn(c_int, *X509_STORE_CTX) -> c_int>);
123-
pub fn SSL_CTX_load_verify_locations(ctx: *SSL_CTX, CAfile: *c_char,
124-
CApath: *c_char) -> c_int;
125-
pub fn SSL_CTX_get_ex_new_index(argl: c_long, argp: *c_void,
114+
pub fn SSLv2_method() -> *const SSL_METHOD;
115+
pub fn SSLv3_method() -> *const SSL_METHOD;
116+
pub fn TLSv1_method() -> *const SSL_METHOD;
117+
pub fn SSLv23_method() -> *const SSL_METHOD;
118+
119+
pub fn SSL_CTX_new(method: *const SSL_METHOD) -> *mut SSL_CTX;
120+
pub fn SSL_CTX_free(ctx: *mut SSL_CTX);
121+
pub fn SSL_CTX_set_verify(ctx: *mut SSL_CTX, mode: c_int,
122+
verify_callback: Option<extern fn(c_int, *mut X509_STORE_CTX) -> c_int>);
123+
pub fn SSL_CTX_load_verify_locations(ctx: *mut SSL_CTX, CAfile: *const c_char,
124+
CApath: *const c_char) -> c_int;
125+
pub fn SSL_CTX_get_ex_new_index(argl: c_long, argp: *const c_void,
126126
new_func: Option<CRYPTO_EX_new>,
127127
dup_func: Option<CRYPTO_EX_dup>,
128128
free_func: Option<CRYPTO_EX_free>)
129129
-> c_int;
130-
pub fn SSL_CTX_set_ex_data(ctx: *SSL_CTX, idx: c_int, data: *c_void)
130+
pub fn SSL_CTX_set_ex_data(ctx: *mut SSL_CTX, idx: c_int, data: *mut c_void)
131131
-> c_int;
132-
pub fn SSL_CTX_get_ex_data(ctx: *SSL_CTX, idx: c_int) -> *c_void;
133-
134-
pub fn X509_STORE_CTX_get_ex_data(ctx: *X509_STORE_CTX, idx: c_int)
135-
-> *c_void;
136-
pub fn X509_STORE_CTX_get_current_cert(ct: *X509_STORE_CTX) -> *X509;
137-
pub fn X509_STORE_CTX_get_error(ctx: *X509_STORE_CTX) -> c_int;
138-
139-
pub fn X509_get_subject_name(x: *X509) -> *X509_NAME;
140-
141-
pub fn SSL_new(ctx: *SSL_CTX) -> *SSL;
142-
pub fn SSL_free(ssl: *SSL);
143-
pub fn SSL_set_bio(ssl: *SSL, rbio: *BIO, wbio: *BIO);
144-
pub fn SSL_get_rbio(ssl: *SSL) -> *BIO;
145-
pub fn SSL_get_wbio(ssl: *SSL) -> *BIO;
146-
pub fn SSL_connect(ssl: *SSL) -> c_int;
147-
pub fn SSL_get_error(ssl: *SSL, ret: c_int) -> c_int;
148-
pub fn SSL_read(ssl: *SSL, buf: *c_void, num: c_int) -> c_int;
149-
pub fn SSL_write(ssl: *SSL, buf: *c_void, num: c_int) -> c_int;
132+
pub fn SSL_CTX_get_ex_data(ctx: *mut SSL_CTX, idx: c_int) -> *mut c_void;
133+
134+
pub fn X509_STORE_CTX_get_ex_data(ctx: *mut X509_STORE_CTX, idx: c_int)
135+
-> *mut c_void;
136+
pub fn X509_STORE_CTX_get_current_cert(ct: *mut X509_STORE_CTX) -> *mut X509;
137+
pub fn X509_STORE_CTX_get_error(ctx: *mut X509_STORE_CTX) -> c_int;
138+
139+
pub fn X509_get_subject_name(x: *mut X509) -> *mut X509_NAME;
140+
141+
pub fn SSL_new(ctx: *mut SSL_CTX) -> *mut SSL;
142+
pub fn SSL_free(ssl: *mut SSL);
143+
pub fn SSL_set_bio(ssl: *mut SSL, rbio: *mut BIO, wbio: *mut BIO);
144+
pub fn SSL_get_rbio(ssl: *mut SSL) -> *mut BIO;
145+
pub fn SSL_get_wbio(ssl: *mut SSL) -> *mut BIO;
146+
pub fn SSL_connect(ssl: *mut SSL) -> c_int;
147+
pub fn SSL_get_error(ssl: *mut SSL, ret: c_int) -> c_int;
148+
pub fn SSL_read(ssl: *mut SSL, buf: *mut c_void, num: c_int) -> c_int;
149+
pub fn SSL_write(ssl: *mut SSL, buf: *const c_void, num: c_int) -> c_int;
150150
pub fn SSL_get_ex_data_X509_STORE_CTX_idx() -> c_int;
151-
pub fn SSL_get_SSL_CTX(ssl: *SSL) -> *SSL_CTX;
151+
pub fn SSL_get_SSL_CTX(ssl: *mut SSL) -> *mut SSL_CTX;
152152

153-
pub fn BIO_s_mem() -> *BIO_METHOD;
154-
pub fn BIO_new(type_: *BIO_METHOD) -> *BIO;
155-
pub fn BIO_free_all(a: *BIO);
156-
pub fn BIO_read(b: *BIO, buf: *c_void, len: c_int) -> c_int;
157-
pub fn BIO_write(b: *BIO, buf: *c_void, len: c_int) -> c_int;
153+
pub fn BIO_s_mem() -> *const BIO_METHOD;
154+
pub fn BIO_new(type_: *const BIO_METHOD) -> *mut BIO;
155+
pub fn BIO_free_all(a: *mut BIO);
156+
pub fn BIO_read(b: *mut BIO, buf: *mut c_void, len: c_int) -> c_int;
157+
pub fn BIO_write(b: *mut BIO, buf: *const c_void, len: c_int) -> c_int;
158158
}
159159

160160
#[cfg(target_os = "win32")]

0 commit comments

Comments
 (0)