return s-d;
}
-static unsigned char *ustrsep(char **string ,const char *delim)
+static char *sstrsep(char **string, const char *delim)
{
char isdelim[256];
char *token = *string;
isdelim[0] = 1;
while (*delim)
- {
+ {
isdelim[(unsigned char)(*delim)] = 1;
delim++;
- }
+ }
while (!isdelim[(unsigned char)(**string)])
- {
- while (!isdelim[(unsigned char)(**string)])
- {
- (*string)++;
- }
+ {
+ (*string)++;
+ }
- if (**string)
- {
- **string = 0;
- (*string)++;
- }
+ if (**string)
+ {
+ **string = 0;
+ (*string)++;
+ }
- return token;
- }
+ return token;
}
+static unsigned char *ustrsep(char **p,const char *sep)
+ { return (unsigned char *)sstrsep((char **)p,sep); }
+
static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
const unsigned char *iv,int in,
const unsigned char *plaintext,int pn,
if(line[0] == '#' || line[0] == '\n')
continue;
p=line;
- cipher=strsep(&p,":");
+ cipher=sstrsep(&p,":");
key=ustrsep(&p,":");
iv=ustrsep(&p,":");
plaintext=ustrsep(&p,":");