diff options
| author | Samuel Fredrickson <[email protected]> | 2014-10-09 00:34:51 -0700 |
|---|---|---|
| committer | Samuel Fredrickson <[email protected]> | 2014-10-09 01:05:41 -0700 |
| commit | 95b9cf39c93d73e977b682e2287f275690180f3a (patch) | |
| tree | 37e5247308eeb78a0984981f05709d4e5a65a1e8 /src/crypto/symm.rs | |
| parent | Merge pull request #74 from vhbit/doc-samples (diff) | |
| download | rust-openssl-95b9cf39c93d73e977b682e2287f275690180f3a.tar.xz rust-openssl-95b9cf39c93d73e977b682e2287f275690180f3a.zip | |
"final" is now a reserved word, so change occurrences to "finalize".
Diffstat (limited to 'src/crypto/symm.rs')
| -rw-r--r-- | src/crypto/symm.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/crypto/symm.rs b/src/crypto/symm.rs index a92f7753..9953ac7b 100644 --- a/src/crypto/symm.rs +++ b/src/crypto/symm.rs @@ -114,7 +114,7 @@ impl Crypter { /** * Finish crypting. Returns the remaining partial block of output, if any. */ - pub fn final(&self) -> Vec<u8> { + pub fn finalize(&self) -> Vec<u8> { unsafe { let mut res = Vec::from_elem(self.blocksize, 0u8); let mut reslen = self.blocksize as c_int; @@ -145,7 +145,7 @@ pub fn encrypt(t: Type, key: &[u8], iv: Vec<u8>, data: &[u8]) -> Vec<u8> { let c = Crypter::new(t); c.init(Encrypt, key, iv); let mut r = c.update(data); - let rest = c.final(); + let rest = c.finalize(); r.extend(rest.into_iter()); r } @@ -158,7 +158,7 @@ pub fn decrypt(t: Type, key: &[u8], iv: Vec<u8>, data: &[u8]) -> Vec<u8> { let c = Crypter::new(t); c.init(Decrypt, key, iv); let mut r = c.update(data); - let rest = c.final(); + let rest = c.finalize(); r.extend(rest.into_iter()); r } @@ -186,12 +186,12 @@ mod tests { c.init(super::Encrypt, k0.as_slice(), vec![]); c.pad(false); let mut r0 = c.update(p0.as_slice()); - r0.extend(c.final().into_iter()); + r0.extend(c.finalize().into_iter()); assert!(r0 == c0); c.init(super::Decrypt, k0.as_slice(), vec![]); c.pad(false); let mut p1 = c.update(r0.as_slice()); - p1.extend(c.final().into_iter()); + p1.extend(c.finalize().into_iter()); assert!(p1 == p0); } @@ -203,7 +203,7 @@ mod tests { let expected = ct.from_hex().unwrap().as_slice().to_vec(); let mut computed = cipher.update(pt.from_hex().unwrap().as_slice()); - computed.extend(cipher.final().into_iter()); + computed.extend(cipher.finalize().into_iter()); if computed != expected { println!("Computed: {}", computed.as_slice().to_hex()); |