Merge in recent changes from the main trunk.

diff --git a/crypto/evp/evp_test.c b/crypto/evp/evp_test.c
index bf0fc3692be8f07a41e9e8b95e46806ca2e6497f..3607fe777677020f4663d5bb788a2b00e2885e17 100644 (file)
--- a/crypto/evp/evp_test.c
+++ b/crypto/evp/evp_test.c
@@ -73,7 +73,7 @@ static int convert(unsigned char *s)
 
     for(d=s ; *s ; s+=2,++d)
        {
-       int n;
+       unsigned int n;
 
        if(!s[1])
            {