Browse Source
			
			
			clear kdf memory and parallelism with pbkdf2
			
				when changing back from argon2id to PBKDF2 the unused parameters
should be set to 0.
also fix small bug in _register
			
			
				pull/3398/head
			
			
		 
		
			
				
					
						 Stefan Melmuk
					
					3 years ago
						Stefan Melmuk
					
					3 years ago
					
				 
				
			 
		 
		
			
				
					
					No known key found for this signature in database
					
						
							GPG Key ID: 817020C608FE9C09
						
					
				
			
		
		
		
	
		
			
				 1 changed files with 
5 additions and 
2 deletions
			 
			
		 
		
			
				- 
					
					
					 
					src/api/core/accounts.rs
				
				
				
					
						
							
								
									
	
		
			
				
					|  |  | @ -169,8 +169,8 @@ pub async fn _register(data: JsonUpcase<RegisterData>, mut conn: DbConn) -> Json | 
			
		
	
		
			
				
					|  |  |  |         user.client_kdf_iter = client_kdf_iter; | 
			
		
	
		
			
				
					|  |  |  |     } | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |     user.client_kdf_parallelism = data.KdfMemory; | 
			
		
	
		
			
				
					|  |  |  |     user.client_kdf_memory = data.KdfParallelism; | 
			
		
	
		
			
				
					|  |  |  |     user.client_kdf_memory = data.KdfMemory; | 
			
		
	
		
			
				
					|  |  |  |     user.client_kdf_parallelism = data.KdfParallelism; | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |     user.set_password(&data.MasterPasswordHash, Some(data.Key), true, None); | 
			
		
	
		
			
				
					|  |  |  |     user.password_hint = password_hint; | 
			
		
	
	
		
			
				
					|  |  | @ -389,6 +389,9 @@ async fn post_kdf(data: JsonUpcase<ChangeKdfData>, headers: Headers, mut conn: D | 
			
		
	
		
			
				
					|  |  |  |         } else { | 
			
		
	
		
			
				
					|  |  |  |             err!("Argon2 parallelism parameter is required.") | 
			
		
	
		
			
				
					|  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  |     } else { | 
			
		
	
		
			
				
					|  |  |  |         user.client_kdf_memory = None; | 
			
		
	
		
			
				
					|  |  |  |         user.client_kdf_parallelism = None; | 
			
		
	
		
			
				
					|  |  |  |     } | 
			
		
	
		
			
				
					|  |  |  |     user.client_kdf_iter = data.KdfIterations; | 
			
		
	
		
			
				
					|  |  |  |     user.client_kdf_type = data.Kdf; | 
			
		
	
	
		
			
				
					|  |  | 
 |