commit 83f3fc0d772d1137b225a9c9bacec084177f2e70
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Sep 04 12:07:24 2013 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Sep 04 12:14:13 2013 +0200
tree 8a336c8140265c60664e4e208c7efd250d4234dc
parent f7ce67f0d2322f218347f43e172f1f9a055a54b9

Add AES-192-GCM

include/polarssl/cipher.h

diff --git a/include/polarssl/cipher.h b/include/polarssl/cipher.h
index b7d4492..cc69208 100644
--- a/include/polarssl/cipher.h
+++ b/include/polarssl/cipher.h
@@ -80,6 +80,7 @@
     POLARSSL_CIPHER_AES_192_CTR,
     POLARSSL_CIPHER_AES_256_CTR,
     POLARSSL_CIPHER_AES_128_GCM,
+    POLARSSL_CIPHER_AES_192_GCM,
     POLARSSL_CIPHER_AES_256_GCM,
     POLARSSL_CIPHER_CAMELLIA_128_CBC,
     POLARSSL_CIPHER_CAMELLIA_192_CBC,

include/polarssl/cipher_wrap.h

diff --git a/include/polarssl/cipher_wrap.h b/include/polarssl/cipher_wrap.h
index 4dabb44..8485256 100644
--- a/include/polarssl/cipher_wrap.h
+++ b/include/polarssl/cipher_wrap.h
@@ -56,6 +56,7 @@
 
 #if defined(POLARSSL_GCM_C)
 extern const cipher_info_t aes_128_gcm_info;
+extern const cipher_info_t aes_192_gcm_info;
 extern const cipher_info_t aes_256_gcm_info;
 #endif /* POLARSSL_GCM_C */
 

library/cipher.c

diff --git a/library/cipher.c b/library/cipher.c
index 160f4bc..a014eca 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -67,6 +67,12 @@
         POLARSSL_CIPHER_AES_256_CTR,
 #endif /* defined(POLARSSL_CIPHER_MODE_CTR) */
 
+#if defined(POLARSSL_GCM_C)
+        POLARSSL_CIPHER_AES_128_GCM,
+        POLARSSL_CIPHER_AES_192_GCM,
+        POLARSSL_CIPHER_AES_256_GCM,
+#endif /* defined(POLARSSL_GCM_C) */
+
 #endif /* defined(POLARSSL_AES_C) */
 
 #if defined(POLARSSL_ARC4_C)
@@ -157,6 +163,8 @@
 #if defined(POLARSSL_GCM_C)
         case POLARSSL_CIPHER_AES_128_GCM:
             return &aes_128_gcm_info;
+        case POLARSSL_CIPHER_AES_192_GCM:
+            return &aes_192_gcm_info;
         case POLARSSL_CIPHER_AES_256_GCM:
             return &aes_256_gcm_info;
 #endif /* defined(POLARSSL_GCM_C) */
@@ -293,6 +301,8 @@
 #if defined(POLARSSL_GCM_C)
     if( !strcasecmp( "AES-128-GCM", cipher_name ) )
         return cipher_info_from_type( POLARSSL_CIPHER_AES_128_GCM );
+    if( !strcasecmp( "AES-192-GCM", cipher_name ) )
+        return cipher_info_from_type( POLARSSL_CIPHER_AES_192_GCM );
     if( !strcasecmp( "AES-256-GCM", cipher_name ) )
         return cipher_info_from_type( POLARSSL_CIPHER_AES_256_GCM );
 #endif

library/cipher_wrap.c

diff --git a/library/cipher_wrap.c b/library/cipher_wrap.c
index ebe60cf..79daaf9 100644
--- a/library/cipher_wrap.c
+++ b/library/cipher_wrap.c
@@ -286,6 +286,17 @@
     &gcm_aes_info
 };
 
+const cipher_info_t aes_192_gcm_info = {
+    POLARSSL_CIPHER_AES_192_GCM,
+    POLARSSL_MODE_GCM,
+    192,
+    "AES-192-GCM",
+    12,
+    1,
+    16,
+    &gcm_aes_info
+};
+
 const cipher_info_t aes_256_gcm_info = {
     POLARSSL_CIPHER_AES_256_GCM,
     POLARSSL_MODE_GCM,