===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tcfs/Attic/tcfsputkey.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/tcfs/Attic/tcfsputkey.c	2000/06/18 22:31:03	1.2
--- src/usr.bin/tcfs/Attic/tcfsputkey.c	2000/06/19 14:24:07	1.3
***************
*** 121,128 ****
  
  		treshold = ginfo->soglia;
  
! 		tcfs_decrypt_key(user, password, ginfo->gkey, tcfskey,
! 				 GROUPKEY);
  
  		es = tcfs_group_enable(fspath,uid,gid,treshold,tcfskey);
  
--- 121,128 ----
  
  		treshold = ginfo->soglia;
  
! 		if (!tcfs_decrypt_key(password, ginfo->gkey, tcfskey, GKEYSIZE))
! 			tcfs_error(ER_CUSTOM, "Could not decrypt group key");
  
  		es = tcfs_group_enable(fspath,uid,gid,treshold,tcfskey);
  
***************
*** 148,160 ****
  			tcfs_error(ER_CUSTOM,"Default key non found");
  	
  		if(!strlen(info->upw))
! 			tcfs_error(ER_CUSTOM,"Invalid default key");
  
  		tcfskey = (char*)malloc(UUKEYSIZE);
  		if(!tcfskey)
! 			tcfs_error(ER_MEM,NULL);	
  		
! 		tcfs_decrypt_key (user, password, info->upw, tcfskey, USERKEY);
  		havekey = TRUE;
  	}
  
--- 148,161 ----
  			tcfs_error(ER_CUSTOM,"Default key non found");
  	
  		if(!strlen(info->upw))
! 			tcfs_error(ER_CUSTOM, "Invalid default key");
  
  		tcfskey = (char*)malloc(UUKEYSIZE);
  		if(!tcfskey)
! 			tcfs_error(ER_MEM, NULL);	
  		
! 		if (!tcfs_decrypt_key (password, info->upw, tcfskey, KEYSIZE))
! 			tcfs_error(ER_CUSTOM, "Could not decrypt key");
  		havekey = TRUE;
  	}