make

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

diff --git a/crypto/ecdsa/ecdsatest.c b/crypto/ecdsa/ecdsatest.c
index 401b23c6947a0bc5eec4201e4e1a4250b8a4e48d..f7fba3b42da9b1031f4484215a3effed9a0c48cd 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,12 +69,6 @@
  *
  */
 
-/* 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>
@@ -92,8 +86,11 @@ 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>
 
@@ -201,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;
@@ -291,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;
@@ -337,9 +333,13 @@ int test_builtin(BIO *out)
                /* 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);
@@ -356,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");
@@ -483,7 +487,7 @@ err:
                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);