--- gvpe/src/hkdf.C	2013/07/16 16:44:36	1.1
+++ gvpe/src/hkdf.C	2013/07/17 04:36:03	1.2
@@ -39,7 +39,7 @@
 #include "util.h"
 #include "hkdf.h"
 
-hkdf::hkdf (const void *salt, int len, const EVP_MD *hash)
+hkdf::hkdf (const void *salt, int len, const EVP_MD *xtr_hash)
 {
   HMAC_CTX_init (&ctx);
 
@@ -47,10 +47,10 @@
     {
       memset (prk, 0, sizeof prk);
       salt = prk;
-      len  = EVP_MD_size (hash);
+      len  = EVP_MD_size (xtr_hash);
     }
 
-  require (HMAC_Init_ex (&ctx, salt, len, hash, 0));
+  require (HMAC_Init_ex (&ctx, salt, len, xtr_hash, 0));
 }
 
 hkdf::~hkdf ()
@@ -65,9 +65,10 @@
 }
 
 void
-hkdf::extract_done ()
+hkdf::extract_done (const EVP_MD *prf_hash)
 {
   require (HMAC_Final (&ctx, prk, 0));
+  require (HMAC_Init_ex (&ctx, 0, 0, prf_hash, 0));
 }
 
 void