Changeset 772 in openpam

Timestamp:

Mar 9, 2014, 11:45:05 AM (7 years ago)

Author:

Dag-Erling Smørgrav

Message:

Switch from uint8_t to char.

Location:

trunk

Files:

• include/security/oath_rfc4648.h (modified) (2 diffs)
• lib/liboath/oath_base32.c (modified) (3 diffs)
• lib/liboath/oath_base64.c (modified) (3 diffs)
• lib/liboath/oath_key.c (modified) (1 diff)
• lib/liboath/oath_key_from_uri.c (modified) (1 diff)
• t/t_rfc4648.c (modified) (4 diffs)

trunk/include/security/oath_rfc4648.h

@@ -38 +38 @@
 
 /* base32 encoding / decoding */
-int base32_enc(const uint8_t *, size_t, char *, size_t *);
-int base32_dec(const char *, size_t, uint8_t *, size_t *);
+int base32_enc(const char *, size_t, char *, size_t *);
+int base32_dec(const char *, size_t, char *, size_t *);
 
 /* estimate of output length for base64 encoding / decoding */
@@ -46 +46 @@
 
 /* base64 encoding / decoding */
-int base64_enc(const uint8_t *, size_t, char *, size_t *);
-int base64_dec(const char *, size_t, uint8_t *, size_t *);
+int base64_enc(const char *, size_t, char *, size_t *);
+int base64_dec(const char *, size_t, char *, size_t *);
 
 #endif

trunk/lib/liboath/oath_base32.c

@@ -45 +45 @@
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
 
-static const uint8_t b32dec[256] = {
+static const char b32dec[256] = {
         ['A'] =  0, ['B'] =  1, ['C'] =  2, ['D'] =  3,
         ['E'] =  4, ['F'] =  5, ['G'] =  6, ['H'] =  7,
@@ -71 +71 @@
  */
 int
-base32_enc(const uint8_t *in, size_t ilen, char *out, size_t *olen)
+base32_enc(const char *in, size_t ilen, char *out, size_t *olen)
 {
         uint64_t bits;
@@ -144 +144 @@
  */
 int
-base32_dec(const char *in, size_t ilen, uint8_t *out, size_t *olen)
+base32_dec(const char *in, size_t ilen, char *out, size_t *olen)
 {
         size_t len;

trunk/lib/liboath/oath_base64.c

@@ -46 +46 @@
     "0123456789+/";
 
-static const uint8_t b64dec[256] = {
+static const char b64dec[256] = {
         ['A'] =  0, ['B'] =  1, ['C'] =  2, ['D'] =  3,
         ['E'] =  4, ['F'] =  5, ['G'] =  6, ['H'] =  7,
@@ -70 +70 @@
  */
 int
-base64_enc(const uint8_t *in, size_t ilen, char *out, size_t *olen)
+base64_enc(const char *in, size_t ilen, char *out, size_t *olen)
 {
         uint32_t bits;
@@ -127 +127 @@
  */
 int
-base64_dec(const char *in, size_t ilen, uint8_t *out, size_t *olen)
+base64_dec(const char *in, size_t ilen, char *out, size_t *olen)
 {
         size_t len;

trunk/lib/liboath/oath_key.c

@@ -117 +117 @@
         }
         uri = tmp;
-        if (base32_enc(key->key, key->keylen, uri + urilen, &kslen) != 0) {
+        if (base32_enc((char *)key->key, key->keylen, uri + urilen, &kslen) != 0) {
                 free(uri);
                 return (NULL);

trunk/lib/liboath/oath_key_from_uri.c

@@ -108 +108 @@
                                 goto invalid;
                         key->keylen = sizeof key->key;
-                        if (base32_dec(q, r - q, key->key, &key->keylen) != 0)
+                        if (base32_dec(q, r - q, (char *)key->key, &key->keylen) != 0)
                                 goto invalid;
                         if (base32_enclen(key->keylen) != (size_t)(r - q))

trunk/t/t_rfc4648.c

@@ -96 +96 @@
 static int
 t_rfc4648_enc(const char *plain, const char *encoded,
-    int (*enc)(const uint8_t *, size_t, char *, size_t *))
+    int (*enc)(const char *, size_t, char *, size_t *))
 {
         char buf[64];
@@ -104 +104 @@
         ilen = strlen(plain);
         olen = strlen(encoded) + 1;
-        if (enc((const uint8_t *)plain, ilen, buf, &blen) != 0) {
+        if (enc((const char *)plain, ilen, buf, &blen) != 0) {
                 t_verbose("encoding failed\n");
                 return (0);
@@ -147 +147 @@
 static int
 t_rfc4648_dec(const char *encoded, const char *plain,
-    int (*dec)(const char *, size_t, uint8_t *, size_t *))
+    int (*dec)(const char *, size_t, char *, size_t *))
 {
         char buf[64];
@@ -155 +155 @@
         ilen = strlen(encoded);
         olen = strlen(plain);
-        if (dec(encoded, ilen, (uint8_t *)buf, &blen) != 0) {
+        if (dec(encoded, ilen, buf, &blen) != 0) {
                 t_verbose("encoding failed\n");
                 return (0);