Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix an inference failure (fn found, different fn expected.) #184

Merged
merged 1 commit into from
Dec 24, 2014
Merged

Fix an inference failure (fn found, different fn expected.) #184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/rust-crypto/aesni.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@ pub struct AesNiDecryptor {
round_keys: [u8, ..240]
}

/// The number of rounds as well as a function to setup an appropriately sized key.
type RoundSetupInfo = (uint, fn(&[u8], KeyType, &mut [u8]));

impl AesNiEncryptor {
pub fn new(key_size: KeySize, key: &[u8]) -> AesNiEncryptor {
let (rounds, setup_function) = match key_size {
let (rounds, setup_function): RoundSetupInfo = match key_size {
KeySize128 => (10, setup_working_key_aesni_128),
KeySize192 => (12, setup_working_key_aesni_192),
KeySize256 => (14, setup_working_key_aesni_256)
Expand All @@ -38,7 +41,7 @@ impl AesNiEncryptor {

impl AesNiDecryptor {
pub fn new(key_size: KeySize, key: &[u8]) -> AesNiDecryptor {
let (rounds, setup_function) = match key_size {
let (rounds, setup_function): RoundSetupInfo = match key_size {
KeySize128 => (10, setup_working_key_aesni_128),
KeySize192 => (12, setup_working_key_aesni_192),
KeySize256 => (14, setup_working_key_aesni_256)
Expand Down