fix typo

[openssl.git] / crypto / ecdsa / ecdsatest.c

diff --git a/crypto/ecdsa/ecdsatest.c b/crypto/ecdsa/ecdsatest.c
index 402e988f46cab332ec99606b5625014e07c141e8..59be39bb41c08541f3d65ea7e88d276620905901 100644 (file)
--- a/crypto/ecdsa/ecdsatest.c
+++ b/crypto/ecdsa/ecdsatest.c
@@ -3,7 +3,7 @@
  * Written by Nils Larsch for the OpenSSL project.
  */
 /* ====================================================================
- * Copyright (c) 2000-2002 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2000-2005 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -69,16 +69,12 @@
  *
  */
 
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * deprecated functions for openssl-internal code */
-#ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_ECDSA is defined */
+
 #ifdef OPENSSL_NO_ECDSA
 int main(int argc, char * argv[])
        {
@@ -90,9 +86,13 @@ int main(int argc, char * argv[])
 #include <openssl/crypto.h>
 #include <openssl/bio.h>
 #include <openssl/evp.h>
+#include <openssl/bn.h>
 #include <openssl/ecdsa.h>
+#ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
+#endif
 #include <openssl/err.h>
+#include <openssl/rand.h>
 
 static const char rnd_seed[] = "string to make the random number generator "
        "think it has entropy";
@@ -122,7 +122,7 @@ int change_rand(void)
        fake_rand.status  = old_rand->status;
        /* use own random function */
        fake_rand.bytes      = fbytes;
-       fake_rand.pseudorand = fbytes;
+       fake_rand.pseudorand = old_rand->bytes;
        /* set new RAND_METHOD */
        if (!RAND_set_rand_method(&fake_rand))
                return 0;
@@ -198,9 +198,7 @@ int x9_62_test_internal(BIO *out, int nid, const char *r_in, const char *s_in)
 
        BIO_printf(out, "testing %s: ", OBJ_nid2sn(nid));
        /* create the key */
-       if ((key = EC_KEY_new()) == NULL)
-               goto x962_int_err;
-       if ((key->group = EC_GROUP_new_by_nid(nid)) == NULL)
+       if ((key = EC_KEY_new_by_curve_name(nid)) == NULL)
                goto x962_int_err;
        if (!EC_KEY_generate_key(key))
                goto x962_int_err;
@@ -288,6 +286,7 @@ int test_builtin(BIO *out)
        EC_builtin_curve *curves = NULL;
        size_t          crv_len = 0, n = 0;
        EC_KEY          *eckey = NULL, *wrong_eckey = NULL;
+       EC_GROUP        *group;
        unsigned char   digest[20], wrong_digest[20];
        unsigned char   *signature = NULL; 
        unsigned int    sig_len;
@@ -326,13 +325,21 @@ int test_builtin(BIO *out)
        /* now create and verify a signature for every curve */
        for (n = 0; n < crv_len; n++)
                {
+               unsigned char dirt, offset;
+
                nid = curves[n].nid;
+               if (nid == NID_ipsec4)
+                       continue;
                /* create new ecdsa key (== EC_KEY) */
                if ((eckey = EC_KEY_new()) == NULL)
                        goto builtin_err;
-               if ((eckey->group = EC_GROUP_new_by_nid(nid)) == NULL)
+               group = EC_GROUP_new_by_curve_name(nid);
+               if (group == NULL)
                        goto builtin_err;
-               if (EC_GROUP_get_degree(eckey->group) < 160)
+               if (EC_KEY_set_group(eckey, group) == 0)
+                       goto builtin_err;
+               EC_GROUP_free(group);
+               if (EC_GROUP_get_degree(EC_KEY_get0_group(eckey)) < 160)
                        /* drop the curve */ 
                        {
                        EC_KEY_free(eckey);
@@ -349,8 +356,12 @@ int test_builtin(BIO *out)
                /* create second key */
                if ((wrong_eckey = EC_KEY_new()) == NULL)
                        goto builtin_err;
-               if ((wrong_eckey->group = EC_GROUP_new_by_nid(nid)) == NULL)
+               group = EC_GROUP_new_by_curve_name(nid);
+               if (group == NULL)
+                       goto builtin_err;
+               if (EC_KEY_set_group(wrong_eckey, group) == 0)
                        goto builtin_err;
+               EC_GROUP_free(group);
                if (!EC_KEY_generate_key(wrong_eckey))
                        {
                        BIO_printf(out, " failed\n");
@@ -404,9 +415,10 @@ int test_builtin(BIO *out)
                        }
                BIO_printf(out, ".");
                BIO_flush(out);
-               /* modify signature */
-               signature[((int)signature[0])%sig_len] ^= 
-                       signature[((int)signature[1])%sig_len];
+               /* modify a single byte of the signature */
+               offset = signature[10] % sig_len;
+               dirt   = signature[11];
+               signature[offset] ^= dirt ? dirt : 1; 
                if (ECDSA_verify(0, digest, 20, signature, sig_len, eckey) == 1)
                        {
                        BIO_printf(out, " failed\n");
@@ -431,7 +443,7 @@ builtin_err:
                EC_KEY_free(eckey);
        if (wrong_eckey)
                EC_KEY_free(wrong_eckey);
-       if (signature);
+       if (signature)
                OPENSSL_free(signature);
        if (curves)
                OPENSSL_free(curves);
@@ -441,7 +453,7 @@ builtin_err:
 
 int main(void)
        {
-       int     ret = 0;
+       int     ret = 1;
        BIO     *out;
 
        out = BIO_new_fp(stdout, BIO_NOCLOSE);
@@ -469,13 +481,13 @@ int main(void)
        if (!x9_62_tests(out))  goto err;
        if (!test_builtin(out)) goto err;
        
-       ret = 1;
+       ret = 0;
 err:   
-       if (!ret)       
+       if (ret)        
                BIO_printf(out, "\nECDSA test failed\n");
        else 
                BIO_printf(out, "\nECDSA test passed\n");
-       if (!ret)
+       if (ret)
                ERR_print_errors(out);
        CRYPTO_cleanup_all_ex_data();
        ERR_remove_state(0);
@@ -483,6 +495,6 @@ err:
        CRYPTO_mem_leaks(out);
        if (out != NULL)
                BIO_free(out);
-       return(0);
+       return ret;
        }       
 #endif