- prf_hmac_sha1 is now a generig prf_hmac

- supports md5

diff --git a/Source/charon/transforms/prfs/prf.c b/Source/charon/transforms/prfs/prf.c
index 2002864..e52c331 100644 (file)
--- a/Source/charon/transforms/prfs/prf.c
+++ b/Source/charon/transforms/prfs/prf.c
@@ -23,7 +23,8 @@
 
 #include "prf.h"
 
-#include "prf_hmac_sha1.h"
+#include "prf_hmac.h"
+#include "../hashers/hasher.h"
 
 
 /*
@@ -35,9 +36,12 @@ prf_t *prf_create(pseudo_random_function_t pseudo_random_function)
        {
                case PRF_HMAC_SHA1:
                {
-                       return (prf_t*)prf_hmac_sha1_create();
+                       return (prf_t*)prf_hmac_create(HASH_SHA1);
                }
                case PRF_HMAC_MD5:
+               {
+                       return (prf_t*)prf_hmac_create(HASH_MD5);
+               }
                case PRF_HMAC_TIGER:
                case PRF_AES128_CBC:
                default:

diff --git a/Source/charon/transforms/prfs/prf_hmac.c b/Source/charon/transforms/prfs/prf_hmac.c
new file mode 100644 (file)
index 0000000..3ebe45d
--- /dev/null
+++ b/Source/charon/transforms/prfs/prf_hmac.c
@@ -0,0 +1,112 @@
+/**
+ * @file prf_hmac.c
+ * 
+ * @brief Implementation of prf_t interface using the
+ * a HMAC algorithm. This simply wraps a hmac in a prf.
+ * 
+ */
+
+/*
+ * Copyright (C) 2005 Jan Hutter, Martin Willi
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include "prf_hmac.h"
+
+#include "../../utils/allocator.h"
+#include "../hmac.h"
+
+typedef struct private_prf_hmac_s private_prf_hmac_t;
+
+struct private_prf_hmac_s {
+       /**
+        * public interface for this prf
+        */
+       prf_hmac_t public;      
+       
+       /**
+        * hmac to use for generation
+        */
+       hmac_t *hmac;
+};
+
+/**
+ * implementation of prf_t.get_bytes
+ */
+static status_t get_bytes(private_prf_hmac_t *this, chunk_t seed, u_int8_t *buffer)
+{
+       return this->hmac->get_mac(this->hmac, seed, buffer);
+}
+
+/**
+ * implementation of prf_t.allocate_bytes
+ */
+static status_t allocate_bytes(private_prf_hmac_t *this, chunk_t seed, chunk_t *chunk)
+{
+       return this->hmac->allocate_mac(this->hmac, seed, chunk);
+}
+
+/**
+ * implementation of prf_t.get_block_size
+ */
+static size_t get_block_size(private_prf_hmac_t *this)
+{
+       return this->hmac->get_block_size(this->hmac);
+}
+
+/**
+ * implementation of prf_t.set_key
+ */
+static status_t set_key(private_prf_hmac_t *this, chunk_t key)
+{
+       this->hmac->set_key(this->hmac, key);
+       return SUCCESS;
+}
+
+/**
+ * implementation of prf_t.destroy
+ */
+static status_t destroy(private_prf_hmac_t *this)
+{
+       allocator_free(this);
+       this->hmac->destroy(this->hmac);
+       return SUCCESS;
+}
+
+/*
+ * Described in header
+ */
+prf_hmac_t *prf_hmac_create(hash_algorithm_t hash_algorithm)
+{
+       private_prf_hmac_t *this = allocator_alloc_thing(private_prf_hmac_t);
+       
+       if (this == NULL)
+       {
+               return NULL;    
+       }
+       
+       this->public.prf_interface.get_bytes = (status_t (*) (prf_t *,chunk_t,u_int8_t*))get_bytes;
+       this->public.prf_interface.allocate_bytes = (status_t (*) (prf_t*,chunk_t,chunk_t*))allocate_bytes;
+       this->public.prf_interface.get_block_size = (size_t (*) (prf_t*))get_block_size;
+       this->public.prf_interface.set_key = (status_t (*) (prf_t *,chunk_t))set_key;
+       this->public.prf_interface.destroy = (status_t (*) (prf_t *))destroy;
+       
+       this->hmac = hmac_create(HASH_SHA1);
+       if (this->hmac == NULL)
+       {
+               allocator_free(this);
+               return NULL;    
+       }
+       
+       return &(this->public);
+}

diff --git a/Source/charon/transforms/prfs/prf_hmac.h b/Source/charon/transforms/prfs/prf_hmac.h
new file mode 100644 (file)
index 0000000..3f5a866
--- /dev/null
+++ b/Source/charon/transforms/prfs/prf_hmac.h
@@ -0,0 +1,56 @@
+/**
+ * @file prf_hmac.h
+ * 
+ * @brief Implementation of prf_t interface using the
+ * a HMAC algorithm. This simply wraps a hmac in a prf.
+ * 
+ */
+
+/*
+ * Copyright (C) 2005 Jan Hutter, Martin Willi
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#ifndef PRF_HMAC_H_
+#define PRF_HMAC_H_
+
+#include "prf.h"
+
+#include "../../types.h"
+#include "../hashers/hasher.h"
+
+/**
+ * Object representing a prf using HMAC
+ * 
+ */
+typedef struct prf_hmac_s prf_hmac_t;
+
+struct prf_hmac_s {
+       
+       /**
+        * generic prf_t interface for this prf
+        */
+       prf_t prf_interface;
+};
+
+/**
+ * Creates a new prf_hmac_t object
+ * 
+ * @param hash_algorithm                       hmac's hash algorithm
+ * @return
+ *                                                                     - prf_hmac_t if successfully
+ *                                                                     - NULL if out of ressources
+ */
+prf_hmac_t *prf_hmac_create(hash_algorithm_t hash_algorithm);
+
+#endif /*PRF_HMAC_SHA1_H_*/

diff --git a/Source/charon/transforms/prfs/prf_hmac_sha1.c b/Source/charon/transforms/prfs/prf_hmac_sha1.c
deleted file mode 100644 (file)
index 6aa7d91..0000000
--- a/Source/charon/transforms/prfs/prf_hmac_sha1.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * @file prf_hmac_sha1.c
- * 
- * @brief Implementation of prf_t interface using the
- * HMAC SHA1 algorithm. This simply wraps hmac-sha1
- * in a prf.
- * 
- */
-
-/*
- * Copyright (C) 2005 Jan Hutter, Martin Willi
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include "prf_hmac_sha1.h"
-
-#include "../../utils/allocator.h"
-#include "../hmac.h"
-
-typedef struct private_prf_hmac_sha1_s private_prf_hmac_sha1_t;
-
-struct private_prf_hmac_sha1_s {
-       /**
-        * public interface for this prf
-        */
-       prf_hmac_sha1_t public; 
-       
-       /**
-        * hmac to use for generation
-        */
-       hmac_t *hmac;
-};
-
-/**
- * implementation of prf_t.get_bytes
- */
-static status_t get_bytes(private_prf_hmac_sha1_t *this, chunk_t seed, u_int8_t *buffer)
-{
-       return this->hmac->get_mac(this->hmac, seed, buffer);
-}
-
-/**
- * implementation of prf_t.allocate_bytes
- */
-static status_t allocate_bytes(private_prf_hmac_sha1_t *this, chunk_t seed, chunk_t *chunk)
-{
-       return this->hmac->allocate_mac(this->hmac, seed, chunk);
-}
-
-/**
- * implementation of prf_t.get_block_size
- */
-static size_t get_block_size(private_prf_hmac_sha1_t *this)
-{
-       return this->hmac->get_block_size(this->hmac);
-}
-
-/**
- * implementation of prf_t.set_key
- */
-static status_t set_key(private_prf_hmac_sha1_t *this, chunk_t key)
-{
-       this->hmac->set_key(this->hmac, key);
-       return SUCCESS;
-}
-
-/**
- * implementation of prf_t.destroy
- */
-static status_t destroy(private_prf_hmac_sha1_t *this)
-{
-       allocator_free(this);
-       this->hmac->destroy(this->hmac);
-       return SUCCESS;
-}
-
-/*
- * Described in header
- */
-prf_hmac_sha1_t *prf_hmac_sha1_create()
-{
-       private_prf_hmac_sha1_t *this = allocator_alloc_thing(private_prf_hmac_sha1_t);
-       
-       if (this == NULL)
-       {
-               return NULL;    
-       }
-       
-       this->public.prf_interface.get_bytes = (status_t (*) (prf_t *,chunk_t,u_int8_t*))get_bytes;
-       this->public.prf_interface.allocate_bytes = (status_t (*) (prf_t*,chunk_t,chunk_t*))allocate_bytes;
-       this->public.prf_interface.get_block_size = (size_t (*) (prf_t*))get_block_size;
-       this->public.prf_interface.set_key = (status_t (*) (prf_t *,chunk_t))set_key;
-       this->public.prf_interface.destroy = (status_t (*) (prf_t *))destroy;
-       
-       this->hmac = hmac_create(HASH_SHA1);
-       if (this->hmac == NULL)
-       {
-               allocator_free(this);
-               return NULL;    
-       }
-       
-       return &(this->public);
-}

diff --git a/Source/charon/transforms/prfs/prf_hmac_sha1.h b/Source/charon/transforms/prfs/prf_hmac_sha1.h
deleted file mode 100644 (file)
index 3b4305c..0000000
--- a/Source/charon/transforms/prfs/prf_hmac_sha1.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * @file prf_hmac_sha1.h
- * 
- * @brief Implementation of prf_t interface using the
- * HMAC SHA1 algorithm. This simply wraps hmac-sha1
- * in a prf.
- * 
- */
-
-/*
- * Copyright (C) 2005 Jan Hutter, Martin Willi
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#ifndef PRF_HMAC_SHA1_H_
-#define PRF_HMAC_SHA1_H_
-
-#include "prf.h"
-
-#include "../../types.h"
-
-/**
- * Object representing a prf using HMAC-SHA1
- * 
- */
-typedef struct prf_hmac_sha1_s prf_hmac_sha1_t;
-
-struct prf_hmac_sha1_s {
-       
-       /**
-        * generic prf_t interface for this prf
-        */
-       prf_t prf_interface;
-};
-
-/**
- * Creates a new prf_hmac_sha1_t object
- * 
- * @return
- *                                                                     - prf_hmac_sha1_t if successfully
- *                                                                     - NULL if out of ressources
- */
-prf_hmac_sha1_t *prf_hmac_sha1_create();
-
-#endif /*PRF_HMAC_SHA1_H_*/