Changeset 772 in openpam
- Timestamp:
- Mar 9, 2014, 11:45:05 AM (7 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/security/oath_rfc4648.h
r655 r772 38 38 39 39 /* base32 encoding / decoding */ 40 int base32_enc(const uint8_t*, size_t, char *, size_t *);41 int base32_dec(const char *, size_t, uint8_t*, size_t *);40 int base32_enc(const char *, size_t, char *, size_t *); 41 int base32_dec(const char *, size_t, char *, size_t *); 42 42 43 43 /* estimate of output length for base64 encoding / decoding */ … … 46 46 47 47 /* base64 encoding / decoding */ 48 int base64_enc(const uint8_t*, size_t, char *, size_t *);49 int base64_dec(const char *, size_t, uint8_t*, size_t *);48 int base64_enc(const char *, size_t, char *, size_t *); 49 int base64_dec(const char *, size_t, char *, size_t *); 50 50 51 51 #endif -
trunk/lib/liboath/oath_base32.c
r771 r772 45 45 "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"; 46 46 47 static const uint8_tb32dec[256] = {47 static const char b32dec[256] = { 48 48 ['A'] = 0, ['B'] = 1, ['C'] = 2, ['D'] = 3, 49 49 ['E'] = 4, ['F'] = 5, ['G'] = 6, ['H'] = 7, … … 71 71 */ 72 72 int 73 base32_enc(const uint8_t*in, size_t ilen, char *out, size_t *olen)73 base32_enc(const char *in, size_t ilen, char *out, size_t *olen) 74 74 { 75 75 uint64_t bits; … … 144 144 */ 145 145 int 146 base32_dec(const char *in, size_t ilen, uint8_t*out, size_t *olen)146 base32_dec(const char *in, size_t ilen, char *out, size_t *olen) 147 147 { 148 148 size_t len; -
trunk/lib/liboath/oath_base64.c
r771 r772 46 46 "0123456789+/"; 47 47 48 static const uint8_tb64dec[256] = {48 static const char b64dec[256] = { 49 49 ['A'] = 0, ['B'] = 1, ['C'] = 2, ['D'] = 3, 50 50 ['E'] = 4, ['F'] = 5, ['G'] = 6, ['H'] = 7, … … 70 70 */ 71 71 int 72 base64_enc(const uint8_t*in, size_t ilen, char *out, size_t *olen)72 base64_enc(const char *in, size_t ilen, char *out, size_t *olen) 73 73 { 74 74 uint32_t bits; … … 127 127 */ 128 128 int 129 base64_dec(const char *in, size_t ilen, uint8_t*out, size_t *olen)129 base64_dec(const char *in, size_t ilen, char *out, size_t *olen) 130 130 { 131 131 size_t len; -
trunk/lib/liboath/oath_key.c
r758 r772 117 117 } 118 118 uri = tmp; 119 if (base32_enc( key->key, key->keylen, uri + urilen, &kslen) != 0) {119 if (base32_enc((char *)key->key, key->keylen, uri + urilen, &kslen) != 0) { 120 120 free(uri); 121 121 return (NULL); -
trunk/lib/liboath/oath_key_from_uri.c
r758 r772 108 108 goto invalid; 109 109 key->keylen = sizeof key->key; 110 if (base32_dec(q, r - q, key->key, &key->keylen) != 0)110 if (base32_dec(q, r - q, (char *)key->key, &key->keylen) != 0) 111 111 goto invalid; 112 112 if (base32_enclen(key->keylen) != (size_t)(r - q)) -
trunk/t/t_rfc4648.c
r769 r772 96 96 static int 97 97 t_rfc4648_enc(const char *plain, const char *encoded, 98 int (*enc)(const uint8_t*, size_t, char *, size_t *))98 int (*enc)(const char *, size_t, char *, size_t *)) 99 99 { 100 100 char buf[64]; … … 104 104 ilen = strlen(plain); 105 105 olen = strlen(encoded) + 1; 106 if (enc((const uint8_t*)plain, ilen, buf, &blen) != 0) {106 if (enc((const char *)plain, ilen, buf, &blen) != 0) { 107 107 t_verbose("encoding failed\n"); 108 108 return (0); … … 147 147 static int 148 148 t_rfc4648_dec(const char *encoded, const char *plain, 149 int (*dec)(const char *, size_t, uint8_t*, size_t *))149 int (*dec)(const char *, size_t, char *, size_t *)) 150 150 { 151 151 char buf[64]; … … 155 155 ilen = strlen(encoded); 156 156 olen = strlen(plain); 157 if (dec(encoded, ilen, (uint8_t *)buf, &blen) != 0) {157 if (dec(encoded, ilen, buf, &blen) != 0) { 158 158 t_verbose("encoding failed\n"); 159 159 return (0);
Note: See TracChangeset
for help on using the changeset viewer.