resolve conflicts, fix local changes

1 files changed, 2 insertions, 2 deletions

diff --git a/src/lib/libcrypto/sha/shatest.c b/src/lib/libcrypto/sha/shatest.c
index ed0fe06a7b..27614646d1 100644
--- a/src/lib/libcrypto/sha/shatest.c
+++ b/src/lib/libcrypto/sha/shatest.c
@@ -123,9 +123,9 @@ int main(int argc, char *argv[])
         i=1;
         while (*P != NULL)
                 {
-                EVP_Digest(*P,strlen((char *)*P),md,NULL,EVP_sha(), NULL);
+                EVP_Digest(*P,strlen(*P),md,NULL,EVP_sha(), NULL);
                 p=pt(md);
-                if (strcmp(p,(char *)*R) != 0)
+                if (strcmp(p,*R) != 0)
                         {
                         printf("error calculating SHA on '%s'\n",*P);
                         printf("got %s instead of %s\n",p,*R);