shishi/lib crypto-3des.c crypto-aes.c crypto-de...

[shishi-commit]

CVSROOT:        /cvsroot/shishi
Module name:    shishi
Branch:         
Changes by:     Simon Josefsson <address@hidden>        03/10/19 22:09:22

Modified files:
        lib            : crypto-3des.c crypto-aes.c crypto-des.c 
                         crypto-null.c crypto-rc4.c crypto.c crypto.h 
                         shishi.h.in 

Log message:
        Remove minpadsize (not used).
        Fix DES_CBC_NONE.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/lib/crypto-3des.c.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/lib/crypto-aes.c.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/lib/crypto-des.c.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/lib/crypto-null.c.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/lib/crypto-rc4.c.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/lib/crypto.c.diff?tr1=1.91&tr2=1.92&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/lib/crypto.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/lib/shishi.h.in.diff?tr1=1.182&tr2=1.183&r1=text&r2=text

Patches:
Index: shishi/lib/crypto-3des.c
diff -u shishi/lib/crypto-3des.c:1.30 shishi/lib/crypto-3des.c:1.31
--- shishi/lib/crypto-3des.c:1.30       Mon Sep  8 18:58:49 2003
+++ shishi/lib/crypto-3des.c    Sun Oct 19 22:09:22 2003
@@ -281,7 +281,6 @@
   SHISHI_DES3_CBC_NONE,
   "des3-cbc-none",
   8,
-  0,
   8,
   3 * 8,
   3 * 8,
@@ -296,7 +295,6 @@
   SHISHI_DES3_CBC_HMAC_SHA1_KD,
   "des3-cbc-sha1-kd",
   8,
-  0,
   8,
   3 * 8,
   3 * 8,
Index: shishi/lib/crypto-aes.c
diff -u shishi/lib/crypto-aes.c:1.27 shishi/lib/crypto-aes.c:1.28
--- shishi/lib/crypto-aes.c:1.27        Fri Sep 19 13:03:02 2003
+++ shishi/lib/crypto-aes.c     Sun Oct 19 22:09:22 2003
@@ -212,7 +212,6 @@
   SHISHI_AES128_CTS_HMAC_SHA1_96,
   "aes128-cts-hmac-sha1-96",
   16,
-  0,
   16,
   128 / 8,
   128 / 8,
@@ -227,7 +226,6 @@
   SHISHI_AES256_CTS_HMAC_SHA1_96,
   "aes256-cts-hmac-sha1-96",
   16,
-  0,
   16,
   256 / 8,
   256 / 8,
Index: shishi/lib/crypto-des.c
diff -u shishi/lib/crypto-des.c:1.56 shishi/lib/crypto-des.c:1.57
--- shishi/lib/crypto-des.c:1.56        Sun Sep 28 19:38:02 2003
+++ shishi/lib/crypto-des.c     Sun Oct 19 22:09:22 2003
@@ -827,7 +827,6 @@
   SHISHI_DES_CBC_CRC,
   "des-cbc-crc",
   8,
-  4,
   8,
   8,
   8,
@@ -842,7 +841,6 @@
   SHISHI_DES_CBC_MD4,
   "des-cbc-md4",
   8,
-  0,
   8,
   8,
   8,
@@ -857,7 +855,6 @@
   SHISHI_DES_CBC_MD5,
   "des-cbc-md5",
   8,
-  0,
   8,
   8,
   8,
@@ -872,10 +869,9 @@
   SHISHI_DES_CBC_NONE,
   "des-cbc-none",
   8,
-  0,
   8,
-  3 * 8,
-  3 * 8,
+  8,
+  8,
   SHISHI_RSA_MD5_DES,
   des_random_to_key,
   des_string_to_key,
Index: shishi/lib/crypto-null.c
diff -u shishi/lib/crypto-null.c:1.13 shishi/lib/crypto-null.c:1.14
--- shishi/lib/crypto-null.c:1.13       Mon Sep  8 18:58:49 2003
+++ shishi/lib/crypto-null.c    Sun Oct 19 22:09:22 2003
@@ -86,7 +86,6 @@
   0,
   0,
   0,
-  0,
   SHISHI_RSA_MD5,
   null_random_to_key,
   null_string_to_key,
Index: shishi/lib/crypto-rc4.c
diff -u shishi/lib/crypto-rc4.c:1.14 shishi/lib/crypto-rc4.c:1.15
--- shishi/lib/crypto-rc4.c:1.14        Sun Sep 28 19:38:03 2003
+++ shishi/lib/crypto-rc4.c     Sun Oct 19 22:09:22 2003
@@ -512,7 +512,6 @@
   SHISHI_ARCFOUR_HMAC,
   "arcfour-hmac",
   1,
-  0,
   16,
   16,
   16,
@@ -527,7 +526,6 @@
   SHISHI_ARCFOUR_HMAC_EXP,
   "arcfour-hmac-exp",
   1,
-  0,
   16,
   16,
   16,
Index: shishi/lib/crypto.c
diff -u shishi/lib/crypto.c:1.91 shishi/lib/crypto.c:1.92
--- shishi/lib/crypto.c:1.91    Sun Sep 28 19:38:03 2003
+++ shishi/lib/crypto.c Sun Oct 19 22:09:22 2003
@@ -566,25 +566,6 @@
 }
 
 /**
- * shishi_cipher_minpadsize:
- * @type: encryption type, see Shishi_etype.
- *
- * Return value: Return the minimum pad size for encryption type, as
- * defined in the standards.
- **/
-int
-shishi_cipher_minpadsize (int32_t type)
-{
-  size_t i;
-
-  for (i = 0; i < sizeof (ciphers) / sizeof (ciphers[0]); i++)
-    if (type == ciphers[i]->type)
-      return ciphers[i]->minpadsize;
-
-  return -1;
-}
-
-/**
  * shishi_cipher_confoundersize:
  * @type: encryption type, see Shishi_etype.
  *
Index: shishi/lib/crypto.h
diff -u shishi/lib/crypto.h:1.3 shishi/lib/crypto.h:1.4
--- shishi/lib/crypto.h:1.3     Sat Sep 20 05:50:09 2003
+++ shishi/lib/crypto.h Sun Oct 19 22:09:22 2003
@@ -114,7 +114,6 @@
   int32_t type;
   char *name;
   int blocksize;
-  int minpadsize;
   int confoundersize;
   int keylen;
   int randomlen;
Index: shishi/lib/shishi.h.in
diff -u shishi/lib/shishi.h.in:1.182 shishi/lib/shishi.h.in:1.183
--- shishi/lib/shishi.h.in:1.182        Sun Oct 19 20:46:18 2003
+++ shishi/lib/shishi.h.in      Sun Oct 19 22:09:22 2003
@@ -1314,7 +1314,6 @@
 extern int shishi_cipher_supported_p (int type);
 extern const char *shishi_cipher_name (int type);
 extern int shishi_cipher_blocksize (int type);
-extern int shishi_cipher_minpadsize (int type);
 extern int shishi_cipher_confoundersize (int type);
 extern size_t shishi_cipher_keylen (int type);
 extern size_t shishi_cipher_randomlen (int type);