Update to libtomcrypt 1.18.1, merged with Dropbear changes

3 files changed, 114 insertions, 120 deletions

diff --git a/libtomcrypt/src/pk/asn1/der/ia5/der_decode_ia5_string.c b/libtomcrypt/src/pk/asn1/der/ia5/der_decode_ia5_string.c
index 1880ada..c347251 100644
--- a/libtomcrypt/src/pk/asn1/der/ia5/der_decode_ia5_string.c
+++ b/libtomcrypt/src/pk/asn1/der/ia5/der_decode_ia5_string.c
@@ -5,8 +5,6 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
 
@@ -88,9 +86,9 @@ int der_decode_ia5_string(const unsigned char *in, unsigned long inlen,
 
    return CRYPT_OK;
 }
- 
+
 #endif
 
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */
diff --git a/libtomcrypt/src/pk/asn1/der/ia5/der_encode_ia5_string.c b/libtomcrypt/src/pk/asn1/der/ia5/der_encode_ia5_string.c
index 6009dbc..18b926e 100644
--- a/libtomcrypt/src/pk/asn1/der/ia5/der_encode_ia5_string.c
+++ b/libtomcrypt/src/pk/asn1/der/ia5/der_encode_ia5_string.c
@@ -5,8 +5,6 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
 
@@ -37,7 +35,7 @@ int der_encode_ia5_string(const unsigned char *in, unsigned long inlen,
 
    /* get the size */
    if ((err = der_length_ia5_string(in, inlen, &len)) != CRYPT_OK) {
-      return err; 
+      return err;
    }
 
    /* too big? */
@@ -80,6 +78,6 @@ int der_encode_ia5_string(const unsigned char *in, unsigned long inlen,
 
 #endif
 
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */
diff --git a/libtomcrypt/src/pk/asn1/der/ia5/der_length_ia5_string.c b/libtomcrypt/src/pk/asn1/der/ia5/der_length_ia5_string.c
index f10c1b8..5f1a78d 100644
--- a/libtomcrypt/src/pk/asn1/der/ia5/der_length_ia5_string.c
+++ b/libtomcrypt/src/pk/asn1/der/ia5/der_length_ia5_string.c
@@ -5,8 +5,6 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
 
@@ -21,106 +19,106 @@ static const struct {
    int code, value;
 } ia5_table[] = {
 { '\0', 0 },
-{ '\a', 7 }, 
-{ '\b', 8 }, 
-{ '\t', 9 }, 
-{ '\n', 10 }, 
-{ '\f', 12 }, 
-{ '\r', 13 }, 
-{ ' ', 32 }, 
-{ '!', 33 }, 
-{ '"', 34 }, 
-{ '#', 35 }, 
-{ '$', 36 }, 
-{ '%', 37 }, 
-{ '&', 38 }, 
-{ '\'', 39 }, 
-{ '(', 40 }, 
-{ ')', 41 }, 
-{ '*', 42 }, 
-{ '+', 43 }, 
-{ ',', 44 }, 
-{ '-', 45 }, 
-{ '.', 46 }, 
-{ '/', 47 }, 
-{ '0', 48 }, 
-{ '1', 49 }, 
-{ '2', 50 }, 
-{ '3', 51 }, 
-{ '4', 52 }, 
-{ '5', 53 }, 
-{ '6', 54 }, 
-{ '7', 55 }, 
-{ '8', 56 }, 
-{ '9', 57 }, 
-{ ':', 58 }, 
-{ ';', 59 }, 
-{ '<', 60 }, 
-{ '=', 61 }, 
-{ '>', 62 }, 
-{ '?', 63 }, 
-{ '@', 64 }, 
-{ 'A', 65 }, 
-{ 'B', 66 }, 
-{ 'C', 67 }, 
-{ 'D', 68 }, 
-{ 'E', 69 }, 
-{ 'F', 70 }, 
-{ 'G', 71 }, 
-{ 'H', 72 }, 
-{ 'I', 73 }, 
-{ 'J', 74 }, 
-{ 'K', 75 }, 
-{ 'L', 76 }, 
-{ 'M', 77 }, 
-{ 'N', 78 }, 
-{ 'O', 79 }, 
-{ 'P', 80 }, 
-{ 'Q', 81 }, 
-{ 'R', 82 }, 
-{ 'S', 83 }, 
-{ 'T', 84 }, 
-{ 'U', 85 }, 
-{ 'V', 86 }, 
-{ 'W', 87 }, 
-{ 'X', 88 }, 
-{ 'Y', 89 }, 
-{ 'Z', 90 }, 
-{ '[', 91 }, 
-{ '\\', 92 }, 
-{ ']', 93 }, 
-{ '^', 94 }, 
-{ '_', 95 }, 
-{ '`', 96 }, 
-{ 'a', 97 }, 
-{ 'b', 98 }, 
-{ 'c', 99 }, 
-{ 'd', 100 }, 
-{ 'e', 101 }, 
-{ 'f', 102 }, 
-{ 'g', 103 }, 
-{ 'h', 104 }, 
-{ 'i', 105 }, 
-{ 'j', 106 }, 
-{ 'k', 107 }, 
-{ 'l', 108 }, 
-{ 'm', 109 }, 
-{ 'n', 110 }, 
-{ 'o', 111 }, 
-{ 'p', 112 }, 
-{ 'q', 113 }, 
-{ 'r', 114 }, 
-{ 's', 115 }, 
-{ 't', 116 }, 
-{ 'u', 117 }, 
-{ 'v', 118 }, 
-{ 'w', 119 }, 
-{ 'x', 120 }, 
-{ 'y', 121 }, 
-{ 'z', 122 }, 
-{ '{', 123 }, 
-{ '|', 124 }, 
-{ '}', 125 }, 
+{ '\a', 7 },
+{ '\b', 8 },
+{ '\t', 9 },
+{ '\n', 10 },
+{ '\f', 12 },
+{ '\r', 13 },
+{ ' ', 32 },
+{ '!', 33 },
+{ '"', 34 },
+{ '#', 35 },
+{ '$', 36 },
+{ '%', 37 },
+{ '&', 38 },
+{ '\'', 39 },
+{ '(', 40 },
+{ ')', 41 },
+{ '*', 42 },
+{ '+', 43 },
+{ ',', 44 },
+{ '-', 45 },
+{ '.', 46 },
+{ '/', 47 },
+{ '0', 48 },
+{ '1', 49 },
+{ '2', 50 },
+{ '3', 51 },
+{ '4', 52 },
+{ '5', 53 },
+{ '6', 54 },
+{ '7', 55 },
+{ '8', 56 },
+{ '9', 57 },
+{ ':', 58 },
+{ ';', 59 },
+{ '<', 60 },
+{ '=', 61 },
+{ '>', 62 },
+{ '?', 63 },
+{ '@', 64 },
+{ 'A', 65 },
+{ 'B', 66 },
+{ 'C', 67 },
+{ 'D', 68 },
+{ 'E', 69 },
+{ 'F', 70 },
+{ 'G', 71 },
+{ 'H', 72 },
+{ 'I', 73 },
+{ 'J', 74 },
+{ 'K', 75 },
+{ 'L', 76 },
+{ 'M', 77 },
+{ 'N', 78 },
+{ 'O', 79 },
+{ 'P', 80 },
+{ 'Q', 81 },
+{ 'R', 82 },
+{ 'S', 83 },
+{ 'T', 84 },
+{ 'U', 85 },
+{ 'V', 86 },
+{ 'W', 87 },
+{ 'X', 88 },
+{ 'Y', 89 },
+{ 'Z', 90 },
+{ '[', 91 },
+{ '\\', 92 },
+{ ']', 93 },
+{ '^', 94 },
+{ '_', 95 },
+{ '`', 96 },
+{ 'a', 97 },
+{ 'b', 98 },
+{ 'c', 99 },
+{ 'd', 100 },
+{ 'e', 101 },
+{ 'f', 102 },
+{ 'g', 103 },
+{ 'h', 104 },
+{ 'i', 105 },
+{ 'j', 106 },
+{ 'k', 107 },
+{ 'l', 108 },
+{ 'm', 109 },
+{ 'n', 110 },
+{ 'o', 111 },
+{ 'p', 112 },
+{ 'q', 113 },
+{ 'r', 114 },
+{ 's', 115 },
+{ 't', 116 },
+{ 'u', 117 },
+{ 'v', 118 },
+{ 'w', 119 },
+{ 'x', 120 },
+{ 'y', 121 },
+{ 'z', 122 },
+{ '{', 123 },
+{ '|', 124 },
+{ '}', 125 },
 { '~', 126 }
 };
 
@@ -145,10 +143,10 @@ int der_ia5_value_decode(int v)
    }
    return -1;
 }
-   
+
 /**
-  Gets length of DER encoding of IA5 STRING 
-  @param octets   The values you want to encode 
+  Gets length of DER encoding of IA5 STRING
+  @param octets   The values you want to encode
   @param noctets  The number of octets in the string to encode
   @param outlen   [out] The length of the DER encoding for the given string
   @return CRYPT_OK if successful
@@ -189,6 +187,6 @@ int der_length_ia5_string(const unsigned char *octets, unsigned long noctets, un
 #endif
 
 
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */