aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2015-01-02 11:12:41 -0500
committerSteven Fackler <[email protected]>2015-01-02 11:12:41 -0500
commitd7e47a2b1f3143d8acdbb677181c933dc97c5593 (patch)
treea4846532626bebcf92a8316d9f4f20a51e0c2070
parentRelease v0.2.10 (diff)
parentArray syntax fallout (diff)
downloadrust-openssl-d7e47a2b1f3143d8acdbb677181c933dc97c5593.tar.xz
rust-openssl-d7e47a2b1f3143d8acdbb677181c933dc97c5593.zip
Merge pull request #135 from vhbit/array-syntax
Array syntax fallout
-rw-r--r--openssl-sys/src/lib.rs2
-rw-r--r--src/crypto/hmac.rs6
2 files changed, 4 insertions, 4 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index f4173aff..0fbbb6f7 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -57,7 +57,7 @@ pub struct HMAC_CTX {
i_ctx: EVP_MD_CTX,
o_ctx: EVP_MD_CTX,
key_length: c_uint,
- key: [c_uchar, ..128]
+ key: [c_uchar; 128]
}
impl Copy for HMAC_CTX {}
diff --git a/src/crypto/hmac.rs b/src/crypto/hmac.rs
index aab0c014..9e8b6361 100644
--- a/src/crypto/hmac.rs
+++ b/src/crypto/hmac.rs
@@ -78,7 +78,7 @@ mod tests {
#[test]
fn test_hmac_md5() {
// test vectors from RFC 2202
- let tests: [(Vec<u8>, Vec<u8>, Vec<u8>), ..7] = [
+ let tests: [(Vec<u8>, Vec<u8>, Vec<u8>); 7] = [
(Vec::from_elem(16, 0x0b_u8), b"Hi There".to_vec(),
"9294727a3638bb1c13f48ef8158bfc9d".from_hex().unwrap()),
(b"Jefe".to_vec(),
@@ -111,7 +111,7 @@ mod tests {
#[test]
fn test_hmac_sha1() {
// test vectors from RFC 2202
- let tests: [(Vec<u8>, Vec<u8>, Vec<u8>), ..7] = [
+ let tests: [(Vec<u8>, Vec<u8>, Vec<u8>); 7] = [
(Vec::from_elem(20, 0x0b_u8), b"Hi There".to_vec(),
"b617318655057264e28bc0b6fb378c8ef146be00".from_hex().unwrap()),
(b"Jefe".to_vec(),
@@ -143,7 +143,7 @@ mod tests {
fn test_sha2(ty: HashType, results: &[Vec<u8>]) {
// test vectors from RFC 4231
- let tests: [(Vec<u8>, Vec<u8>), ..6] = [
+ let tests: [(Vec<u8>, Vec<u8>); 6] = [
(Vec::from_elem(20, 0x0b_u8), b"Hi There".to_vec()),
(b"Jefe".to_vec(),
b"what do ya want for nothing?".to_vec()),