From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Sat, 7 Dec 2013 22:54:53 +0000 (+0100)
Subject: min_MGF_hash_calls parameter is not needed anymore
X-Git-Tag: 5.1.2dr3~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84814a6b7cd3773fd03d3c0a2827c145bc057d42;p=thirdparty%2Fstrongswan.git

min_MGF_hash_calls parameter is not needed anymore
---

diff --git a/src/libstrongswan/plugins/ntru/ntru_crypto/ntru_crypto_ntru_encrypt_param_sets.c b/src/libstrongswan/plugins/ntru/ntru_crypto/ntru_crypto_ntru_encrypt_param_sets.c
index fbbf810ae5..cf3c8620a2 100644
--- a/src/libstrongswan/plugins/ntru/ntru_crypto/ntru_crypto_ntru_encrypt_param_sets.c
+++ b/src/libstrongswan/plugins/ntru/ntru_crypto/ntru_crypto_ntru_encrypt_param_sets.c
@@ -57,7 +57,6 @@ static NTRU_ENCRYPT_PARAM_SET ntruParamSets[] = {
         11,                          /* c */
         1,                           /* lLen */
         32,                          /* min. no. of hash calls for IGF-2 */
-        9,                           /* min. no. of hash calls for MGF-TP-1 */
     },
 
     {
@@ -78,7 +77,6 @@ static NTRU_ENCRYPT_PARAM_SET ntruParamSets[] = {
         9,                           /* c */
         1,                           /* lLen */
         31,                          /* min. no. of hash calls for IGF-2 */
-        9,                           /* min. no. of hash calls for MGF-TP-1 */
     },
 
     {
@@ -99,7 +97,6 @@ static NTRU_ENCRYPT_PARAM_SET ntruParamSets[] = {
         11,                          /* c */
         1,                           /* lLen */
         27,                          /* min. no. of hash calls for IGF-2 */
-        9,                           /* min. no. of hash calls for MGF-TP-1 */
     },
 
     {
@@ -120,7 +117,6 @@ static NTRU_ENCRYPT_PARAM_SET ntruParamSets[] = {
         13,                          /* c */
         1,                           /* lLen */
         25,                          /* min. no. of hash calls for IGF-2 */
-        14,                          /* min. no. of hash calls for MGF-TP-1 */
     },
 
     {
@@ -141,7 +137,6 @@ static NTRU_ENCRYPT_PARAM_SET ntruParamSets[] = {
         12,                          /* c */
         1,                           /* lLen */
         15,                          /* min. no. of hash calls for IGF-2 */
-        11,                          /* min. no. of hash calls for MGF-TP-1 */
     },
 
     {
@@ -162,7 +157,6 @@ static NTRU_ENCRYPT_PARAM_SET ntruParamSets[] = {
         11,                          /* c */
         1,                           /* lLen */
         16,                          /* min. no. of hash calls for IGF-2 */
-        13,                          /* min. no. of hash calls for MGF-TP-1 */
     },
 
     {
@@ -183,7 +177,6 @@ static NTRU_ENCRYPT_PARAM_SET ntruParamSets[] = {
         10,                          /* c */
         1,                           /* lLen */
         13,                          /* min. no. of hash calls for IGF-2 */
-        12,                          /* min. no. of hash calls for MGF-TP-1 */
     },
 
     {
@@ -204,7 +197,6 @@ static NTRU_ENCRYPT_PARAM_SET ntruParamSets[] = {
         12,                          /* c */
         1,                           /* lLen */
         20,                          /* min. no. of hash calls for IGF-2 */
-        15,                          /* min. no. of hash calls for MGF-TP-1 */
     },
 
     {
@@ -225,7 +217,6 @@ static NTRU_ENCRYPT_PARAM_SET ntruParamSets[] = {
         11,                          /* c */
         1,                           /* lLen */
         11,                          /* min. no. of hash calls for IGF-2 */
-        14,                          /* min. no. of hash calls for MGF-TP-1 */
     },
 
     {
@@ -246,7 +237,6 @@ static NTRU_ENCRYPT_PARAM_SET ntruParamSets[] = {
         12,                          /* c */
         1,                           /* lLen */
         13,                          /* min. no. of hash calls for IGF-2 */
-        16,                          /* min. no. of hash calls for MGF-TP-1 */
     },
 
     {
@@ -267,7 +257,6 @@ static NTRU_ENCRYPT_PARAM_SET ntruParamSets[] = {
         13,                          /* c */
         1,                           /* lLen */
         13,                          /* min. no. of hash calls for IGF-2 */
-        14,                          /* min. no. of hash calls for MGF-TP-1 */
     },
 
     {
@@ -288,7 +277,6 @@ static NTRU_ENCRYPT_PARAM_SET ntruParamSets[] = {
         13,                          /* c */
         1,                           /* lLen */
         17,                          /* min. no. of hash calls for IGF-2 */
-        19,                          /* min. no. of hash calls for MGF-TP-1 */
     },
 
     {
@@ -309,7 +297,6 @@ static NTRU_ENCRYPT_PARAM_SET ntruParamSets[] = {
         11,                          /* c */
         1,                           /* lLen */
         10,                          /* min. no. of hash calls for IGF-2 */
-        6,                           /* min. no. of hash calls for MGF-TP-1 */
     },
 
     {
@@ -330,7 +317,6 @@ static NTRU_ENCRYPT_PARAM_SET ntruParamSets[] = {
         9,                           /* c */
         1,                           /* lLen */
         15,                          /* min. no. of hash calls for IGF-2 */
-        6,                           /* min. no. of hash calls for MGF-TP-1 */
     },
 
     {
@@ -351,7 +337,6 @@ static NTRU_ENCRYPT_PARAM_SET ntruParamSets[] = {
         11,                          /* c */
         1,                           /* lLen */
         12,                          /* min. no. of hash calls for IGF-2 */
-        5,                           /* min. no. of hash calls for MGF-TP-1 */
     },
 
     {
@@ -372,7 +357,6 @@ static NTRU_ENCRYPT_PARAM_SET ntruParamSets[] = {
         13,                          /* c */
         1,                           /* lLen */
         12,                          /* min. no. of hash calls for IGF-2 */
-        7,                           /* min. no. of hash calls for MGF-TP-1 */
     },
 
 };
diff --git a/src/libstrongswan/plugins/ntru/ntru_crypto/ntru_crypto_ntru_encrypt_param_sets.h b/src/libstrongswan/plugins/ntru/ntru_crypto/ntru_crypto_ntru_encrypt_param_sets.h
index bdef7f9eae..08c87be1e0 100644
--- a/src/libstrongswan/plugins/ntru/ntru_crypto/ntru_crypto_ntru_encrypt_param_sets.h
+++ b/src/libstrongswan/plugins/ntru/ntru_crypto/ntru_crypto_ntru_encrypt_param_sets.h
@@ -68,8 +68,6 @@ typedef struct _NTRU_ENCRYPT_PARAM_SET {
                                                      mLenOctets */
     uint8_t                   min_IGF_hash_calls; /* min. no. of hash calls for
                                                      IGF-2 */
-    uint8_t                   min_MGF_hash_calls; /* min. no. of hash calls for
-                                                     MGF-TP-1 */
 } NTRU_ENCRYPT_PARAM_SET;