iv_gen: Add IV generator that allocates IVs sequentially
authorTobias Brunner <tobias@strongswan.org>
Mon, 5 Aug 2013 12:43:50 +0000 (14:43 +0200)
committerTobias Brunner <tobias@strongswan.org>
Fri, 11 Oct 2013 13:55:40 +0000 (15:55 +0200)
src/libstrongswan/Android.mk
src/libstrongswan/Makefile.am
src/libstrongswan/crypto/iv/iv_gen_seq.c [new file with mode: 0644]
src/libstrongswan/crypto/iv/iv_gen_seq.h [new file with mode: 0644]

index a108312..1a13fdd 100644 (file)
@@ -13,7 +13,7 @@ crypto/prfs/prf.c crypto/prfs/mac_prf.c crypto/pkcs5.c \
 crypto/rngs/rng.c crypto/prf_plus.c crypto/signers/signer.c \
 crypto/signers/mac_signer.c crypto/crypto_factory.c crypto/crypto_tester.c \
 crypto/diffie_hellman.c crypto/aead.c crypto/transform.c \
-crypto/iv/iv_gen_rand.c \
+crypto/iv/iv_gen_rand.c crypto/iv/iv_gen_seq.c \
 credentials/credential_factory.c credentials/builder.c \
 credentials/cred_encoding.c credentials/keys/private_key.c \
 credentials/keys/public_key.c credentials/keys/shared_key.c \
index f5c373c..677701c 100644 (file)
@@ -11,7 +11,7 @@ crypto/prfs/prf.c crypto/prfs/mac_prf.c crypto/pkcs5.c \
 crypto/rngs/rng.c crypto/prf_plus.c crypto/signers/signer.c \
 crypto/signers/mac_signer.c crypto/crypto_factory.c crypto/crypto_tester.c \
 crypto/diffie_hellman.c crypto/aead.c crypto/transform.c \
-crypto/iv/iv_gen_rand.c \
+crypto/iv/iv_gen_rand.c crypto/iv/iv_gen_seq.c \
 credentials/credential_factory.c credentials/builder.c \
 credentials/cred_encoding.c credentials/keys/private_key.c \
 credentials/keys/public_key.c credentials/keys/shared_key.c \
diff --git a/src/libstrongswan/crypto/iv/iv_gen_seq.c b/src/libstrongswan/crypto/iv/iv_gen_seq.c
new file mode 100644 (file)
index 0000000..d8a5a29
--- /dev/null
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2013 Tobias Brunner
+ * 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 "iv_gen_seq.h"
+
+typedef struct private_iv_gen_t private_iv_gen_t;
+
+/**
+ * Private data of an iv_gen_t object.
+ */
+struct private_iv_gen_t {
+
+       /**
+        * Public iv_gen_t interface.
+        */
+       iv_gen_t public;
+
+       /**
+        * sequence number
+        */
+       u_int64_t seq;
+};
+
+METHOD(iv_gen_t, get_iv, bool,
+       private_iv_gen_t *this, size_t size, u_int8_t *buffer)
+{
+       u_int8_t iv[sizeof(u_int64_t)];
+       size_t len = size;
+
+       if (this->seq == UINT64_MAX || len < sizeof(u_int64_t))
+       {
+               return FALSE;
+       }
+       if (len > sizeof(u_int64_t))
+       {
+               len = sizeof(u_int64_t);
+               memset(buffer, 0, size - len);
+       }
+       htoun64(iv, this->seq++);
+       memcpy(buffer + size - len, iv + sizeof(u_int64_t) - len, len);
+       return TRUE;
+}
+
+METHOD(iv_gen_t, allocate_iv, bool,
+       private_iv_gen_t *this, size_t size, chunk_t *chunk)
+{
+       *chunk = chunk_alloc(size);
+       if (!get_iv(this, chunk->len, chunk->ptr))
+       {
+               chunk_free(chunk);
+               return FALSE;
+       }
+       return TRUE;
+}
+
+METHOD(iv_gen_t, destroy, void,
+       private_iv_gen_t *this)
+{
+       free(this);
+}
+
+iv_gen_t *iv_gen_seq_create()
+{
+       private_iv_gen_t *this;
+
+       INIT(this,
+               .public = {
+                       .get_iv = _get_iv,
+                       .allocate_iv = _allocate_iv,
+                       .destroy = _destroy,
+               },
+       );
+
+       return &this->public;
+}
diff --git a/src/libstrongswan/crypto/iv/iv_gen_seq.h b/src/libstrongswan/crypto/iv/iv_gen_seq.h
new file mode 100644 (file)
index 0000000..329dcca
--- /dev/null
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2013 Tobias Brunner
+ * 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.
+ */
+
+/**
+ * @{ @ingroup iv
+ */
+
+#ifndef IV_GEN_SEQ_H_
+#define IV_GEN_SEQ_H_
+
+#include <crypto/iv/iv_gen.h>
+
+/**
+ * Create an IV generator that generates sequential IVs (counter).
+ *
+ * @return             IV generator
+ */
+iv_gen_t *iv_gen_seq_create();
+
+#endif /** IV_GEN_SEQ_H_ @}*/