From 22f7344befc026666b48e3153c4dfe4175f052ee Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Wed, 15 Mar 2023 22:38:44 +0100
Subject: Switch kdf type to enum

---
 src/identity.rs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/identity.rs')

diff --git a/src/identity.rs b/src/identity.rs
index d63dc9b..3637d75 100644
--- a/src/identity.rs
+++ b/src/identity.rs
@@ -1,4 +1,4 @@
-use crate::prelude::*;
+use crate::{prelude::*, api::KdfType};
 use sha2::Digest;
 extern crate argon2;
 use argon2::{Config, ThreadMode, Variant, Version};
@@ -13,7 +13,7 @@ impl Identity {
     pub fn new(
         email: &str,
         password: &crate::locked::Password,
-        kdf: u32,
+        kdf: KdfType,
         iterations: u32,
         memory: Option<u32>,
         parallelism: Option<u32>,
@@ -27,7 +27,7 @@ impl Identity {
         let enc_key = &mut keys.data_mut()[0..32];
 
         match kdf {
-            0 => {
+            KdfType::Pbkdf2 => {
                 pbkdf2::pbkdf2::<hmac::Hmac<sha2::Sha256>>(
                     password.password(),
                     email.as_bytes(),
@@ -37,7 +37,7 @@ impl Identity {
                 .map_err(|_| Error::Pbkdf2)?;
             }
 
-            1 => {
+            KdfType::Argon2id => {
                 let mut hasher = sha2::Sha256::new();
                 hasher.update(email.as_bytes());
                 let salt = hasher.finalize();
@@ -56,9 +56,6 @@ impl Identity {
                 let hash = argon2::hash_raw(password.password(), &salt[..], &config).map_err(|_| Error::Argon2)?;
                 enc_key.copy_from_slice(&hash);
             }
-            _ => {
-                // todo throw error or switch to enum?
-            }
         };
         
         let mut hash = crate::locked::Vec::new();
-- 
cgit v1.2.3-54-g00ecf