diff options
Diffstat (limited to '3rd_party/libsrp6a-sha512/t_conv.c')
-rw-r--r-- | 3rd_party/libsrp6a-sha512/t_conv.c | 35 |
1 files changed, 8 insertions, 27 deletions
diff --git a/3rd_party/libsrp6a-sha512/t_conv.c b/3rd_party/libsrp6a-sha512/t_conv.c index f7f50e2..76d4e58 100644 --- a/3rd_party/libsrp6a-sha512/t_conv.c +++ b/3rd_party/libsrp6a-sha512/t_conv.c | |||
@@ -33,8 +33,7 @@ | |||
33 | #include "cstr.h" | 33 | #include "cstr.h" |
34 | 34 | ||
35 | static int | 35 | static int |
36 | hexDigitToInt(c) | 36 | hexDigitToInt(char c) |
37 | char c; | ||
38 | { | 37 | { |
39 | if(c >= '0' && c <= '9') | 38 | if(c >= '0' && c <= '9') |
40 | return c - '0'; | 39 | return c - '0'; |
@@ -50,9 +49,7 @@ hexDigitToInt(c) | |||
50 | * Convert a hex string to a string of bytes; return size of dst | 49 | * Convert a hex string to a string of bytes; return size of dst |
51 | */ | 50 | */ |
52 | _TYPE( int ) | 51 | _TYPE( int ) |
53 | t_fromhex(dst, src) | 52 | t_fromhex(char *dst, const char *src) |
54 | char * dst; | ||
55 | const char * src; | ||
56 | { | 53 | { |
57 | register char *chp = dst; | 54 | register char *chp = dst; |
58 | register unsigned size = strlen(src); | 55 | register unsigned size = strlen(src); |
@@ -76,10 +73,7 @@ t_fromhex(dst, src) | |||
76 | * Convert a string of bytes to their hex representation | 73 | * Convert a string of bytes to their hex representation |
77 | */ | 74 | */ |
78 | _TYPE( char * ) | 75 | _TYPE( char * ) |
79 | t_tohex(dst, src, size) | 76 | t_tohex(char *dst, const char *src, unsigned size) |
80 | char * dst; | ||
81 | const char * src; | ||
82 | unsigned size; | ||
83 | { | 77 | { |
84 | int notleading = 0; | 78 | int notleading = 0; |
85 | 79 | ||
@@ -103,10 +97,7 @@ t_tohex(dst, src, size) | |||
103 | } | 97 | } |
104 | 98 | ||
105 | _TYPE( char * ) | 99 | _TYPE( char * ) |
106 | t_tohexcstr(dst, src, size) | 100 | t_tohexcstr(cstr *dst, const char *src, unsigned size) |
107 | cstr * dst; | ||
108 | const char * src; | ||
109 | unsigned size; | ||
110 | { | 101 | { |
111 | cstr_set_length(dst, 2 * size + 1); | 102 | cstr_set_length(dst, 2 * size + 1); |
112 | return t_tohex(dst->data, src, size); | 103 | return t_tohex(dst->data, src, size); |
@@ -119,9 +110,7 @@ static char b64table[] = | |||
119 | * Convert a base64 string into raw byte array representation. | 110 | * Convert a base64 string into raw byte array representation. |
120 | */ | 111 | */ |
121 | _TYPE( int ) | 112 | _TYPE( int ) |
122 | t_fromb64(dst, src) | 113 | t_fromb64(char *dst, const char *src) |
123 | char * dst; | ||
124 | const char * src; | ||
125 | { | 114 | { |
126 | unsigned char *a; | 115 | unsigned char *a; |
127 | char *loc; | 116 | char *loc; |
@@ -179,9 +168,7 @@ t_fromb64(dst, src) | |||
179 | } | 168 | } |
180 | 169 | ||
181 | _TYPE( int ) | 170 | _TYPE( int ) |
182 | t_cstrfromb64(dst, src) | 171 | t_cstrfromb64(cstr *dst, const char *src) |
183 | cstr * dst; | ||
184 | const char * src; | ||
185 | { | 172 | { |
186 | int len; | 173 | int len; |
187 | cstr_set_length(dst, (strlen(src) * 6 + 7) / 8); | 174 | cstr_set_length(dst, (strlen(src) * 6 + 7) / 8); |
@@ -194,10 +181,7 @@ t_cstrfromb64(dst, src) | |||
194 | * Convert a raw byte string into a null-terminated base64 ASCII string. | 181 | * Convert a raw byte string into a null-terminated base64 ASCII string. |
195 | */ | 182 | */ |
196 | _TYPE( char * ) | 183 | _TYPE( char * ) |
197 | t_tob64(dst, src, size) | 184 | t_tob64(char *dst, const char *src, unsigned size) |
198 | char * dst; | ||
199 | const char * src; | ||
200 | unsigned size; | ||
201 | { | 185 | { |
202 | int c, pos = size % 3; | 186 | int c, pos = size % 3; |
203 | unsigned char b0 = 0, b1 = 0, b2 = 0, notleading = 0; | 187 | unsigned char b0 = 0, b1 = 0, b2 = 0, notleading = 0; |
@@ -248,10 +232,7 @@ t_tob64(dst, src, size) | |||
248 | } | 232 | } |
249 | 233 | ||
250 | _TYPE( char * ) | 234 | _TYPE( char * ) |
251 | t_tob64cstr(dst, src, sz) | 235 | t_tob64cstr(cstr *dst, const char *src, unsigned int sz) |
252 | cstr * dst; | ||
253 | const char * src; | ||
254 | unsigned int sz; | ||
255 | { | 236 | { |
256 | cstr_set_length(dst, (sz * 8 + 5) / 6 + 1); | 237 | cstr_set_length(dst, (sz * 8 + 5) / 6 + 1); |
257 | return t_tob64(dst->data, src, sz); | 238 | return t_tob64(dst->data, src, sz); |