summaryrefslogtreecommitdiffhomepage
path: root/libtomcrypt/src/encauth/gcm/gcm_add_aad.c
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2017-06-24 17:50:50 +0800
committerMatt Johnston <matt@ucc.asn.au>2017-06-24 17:50:50 +0800
commita79b61517bc7123250d0e2dc21dc18deccf0bb64 (patch)
treef95c80c6801abd286eaf370dd794859235d1be82 /libtomcrypt/src/encauth/gcm/gcm_add_aad.c
parent99361f54ca77e0d1ff821c02d7d8df3a87aafde5 (diff)
update to libtomcrypt 1.17 (with Dropbear changes)
Diffstat (limited to 'libtomcrypt/src/encauth/gcm/gcm_add_aad.c')
-rw-r--r--libtomcrypt/src/encauth/gcm/gcm_add_aad.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/libtomcrypt/src/encauth/gcm/gcm_add_aad.c b/libtomcrypt/src/encauth/gcm/gcm_add_aad.c
index 6037c6c..26e47f6 100644
--- a/libtomcrypt/src/encauth/gcm/gcm_add_aad.c
+++ b/libtomcrypt/src/encauth/gcm/gcm_add_aad.c
@@ -6,7 +6,7 @@
* The library is free for all purposes without any express
* guarantee it works.
*
- * Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.com
+ * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
*/
/**
@@ -15,7 +15,7 @@
*/
#include "tomcrypt.h"
-#ifdef GCM_MODE
+#ifdef LTC_GCM_MODE
/**
Add AAD to the GCM state
@@ -47,7 +47,7 @@ int gcm_add_aad(gcm_state *gcm,
}
/* in IV mode? */
- if (gcm->mode == GCM_MODE_IV) {
+ if (gcm->mode == LTC_GCM_MODE_IV) {
/* let's process the IV */
if (gcm->ivmode || gcm->buflen != 12) {
for (x = 0; x < (unsigned long)gcm->buflen; x++) {
@@ -80,10 +80,10 @@ int gcm_add_aad(gcm_state *gcm,
zeromem(gcm->buf, 16);
gcm->buflen = 0;
gcm->totlen = 0;
- gcm->mode = GCM_MODE_AAD;
+ gcm->mode = LTC_GCM_MODE_AAD;
}
- if (gcm->mode != GCM_MODE_AAD || gcm->buflen >= 16) {
+ if (gcm->mode != LTC_GCM_MODE_AAD || gcm->buflen >= 16) {
return CRYPT_INVALID_ARG;
}
@@ -119,6 +119,6 @@ int gcm_add_aad(gcm_state *gcm,
#endif
-/* $Source: /cvs/libtom/libtomcrypt/src/encauth/gcm/gcm_add_aad.c,v $ */
-/* $Revision: 1.16 $ */
-/* $Date: 2006/09/23 19:24:21 $ */
+/* $Source$ */
+/* $Revision$ */
+/* $Date$ */