diff options
author | djm <> | 2008-09-06 12:17:54 +0000 |
---|---|---|
committer | djm <> | 2008-09-06 12:17:54 +0000 |
commit | 38ce604e3cc97706b876b0525ddff0121115456d (patch) | |
tree | 7ccc28afe1789ea3dbedf72365f955d5b8e105b5 /src/lib/libcrypto/ripemd/rmdtest.c | |
parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/ripemd/rmdtest.c')
-rw-r--r-- | src/lib/libcrypto/ripemd/rmdtest.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/ripemd/rmdtest.c b/src/lib/libcrypto/ripemd/rmdtest.c index d4c709e646..fb34e0e836 100644 --- a/src/lib/libcrypto/ripemd/rmdtest.c +++ b/src/lib/libcrypto/ripemd/rmdtest.c | |||
@@ -103,19 +103,19 @@ static char *pt(unsigned char *md); | |||
103 | int main(int argc, char *argv[]) | 103 | int main(int argc, char *argv[]) |
104 | { | 104 | { |
105 | int i,err=0; | 105 | int i,err=0; |
106 | unsigned char **P,**R; | 106 | char **P,**R; |
107 | char *p; | 107 | char *p; |
108 | unsigned char md[RIPEMD160_DIGEST_LENGTH]; | 108 | unsigned char md[RIPEMD160_DIGEST_LENGTH]; |
109 | 109 | ||
110 | P=(unsigned char **)test; | 110 | P=test; |
111 | R=(unsigned char **)ret; | 111 | R=ret; |
112 | i=1; | 112 | i=1; |
113 | while (*P != NULL) | 113 | while (*P != NULL) |
114 | { | 114 | { |
115 | #ifdef CHARSET_EBCDIC | 115 | #ifdef CHARSET_EBCDIC |
116 | ebcdic2ascii((char *)*P, (char *)*P, strlen((char *)*P)); | 116 | ebcdic2ascii((char *)*P, (char *)*P, strlen((char *)*P)); |
117 | #endif | 117 | #endif |
118 | EVP_Digest(&(P[0][0]),(unsigned long)strlen((char *)*P),md,NULL,EVP_ripemd160(), NULL); | 118 | EVP_Digest(&(P[0][0]),strlen((char *)*P),md,NULL,EVP_ripemd160(), NULL); |
119 | p=pt(md); | 119 | p=pt(md); |
120 | if (strcmp(p,(char *)*R) != 0) | 120 | if (strcmp(p,(char *)*R) != 0) |
121 | { | 121 | { |