If memory debugging enabled return error on leaks.

[openssl.git] / test / ecdsatest.c

diff --git a/test/ecdsatest.c b/test/ecdsatest.c
index 975486956528b6ae0a06693ed30967074311f142..feb9f0a6eb1554f23c29deea6463eb9df87be750 100644 (file)
--- a/test/ecdsatest.c
+++ b/test/ecdsatest.c
@@ -1,4 +1,3 @@
-/* crypto/ecdsa/ecdsatest.c */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -87,7 +86,7 @@ int main(int argc, char *argv[])
 # include <openssl/bio.h>
 # include <openssl/evp.h>
 # include <openssl/bn.h>
-# include <openssl/ecdsa.h>
+# include <openssl/ec.h>
 # ifndef OPENSSL_NO_ENGINE
 #  include <openssl/engine.h>
 # endif
@@ -188,17 +187,20 @@ int x9_62_test_internal(BIO *out, int nid, const char *r_in, const char *s_in)
     const char message[] = "abc";
     unsigned char digest[20];
     unsigned int dgst_len = 0;
-    EVP_MD_CTX md_ctx;
+    EVP_MD_CTX *md_ctx = EVP_MD_CTX_new();
     EC_KEY *key = NULL;
     ECDSA_SIG *signature = NULL;
     BIGNUM *r = NULL, *s = NULL;
     BIGNUM *kinv = NULL, *rp = NULL;
+    BIGNUM *sig_r, *sig_s;
+
+    if (md_ctx == NULL)
+        goto x962_int_err;
 
-    EVP_MD_CTX_init(&md_ctx);
     /* get the message digest */
-    if (!EVP_DigestInit(&md_ctx, EVP_ecdsa())
-        || !EVP_DigestUpdate(&md_ctx, (const void *)message, 3)
-        || !EVP_DigestFinal(&md_ctx, digest, &dgst_len))
+    if (!EVP_DigestInit(md_ctx, EVP_sha1())
+        || !EVP_DigestUpdate(md_ctx, (const void *)message, 3)
+        || !EVP_DigestFinal(md_ctx, digest, &dgst_len))
         goto x962_int_err;
 
     BIO_printf(out, "testing %s: ", OBJ_nid2sn(nid));
@@ -225,7 +227,8 @@ int x9_62_test_internal(BIO *out, int nid, const char *r_in, const char *s_in)
         goto x962_int_err;
     if (!BN_dec2bn(&r, r_in) || !BN_dec2bn(&s, s_in))
         goto x962_int_err;
-    if (BN_cmp(signature->r, r) || BN_cmp(signature->s, s))
+    ECDSA_SIG_get0(&sig_r, &sig_s, signature);
+    if (BN_cmp(sig_r, r) || BN_cmp(sig_s, s))
         goto x962_int_err;
     BIO_printf(out, ".");
     (void)BIO_flush(out);
@@ -244,7 +247,7 @@ int x9_62_test_internal(BIO *out, int nid, const char *r_in, const char *s_in)
     ECDSA_SIG_free(signature);
     BN_free(r);
     BN_free(s);
-    EVP_MD_CTX_cleanup(&md_ctx);
+    EVP_MD_CTX_free(md_ctx);
     BN_clear_free(kinv);
     BN_clear_free(rp);
     return ret;
@@ -301,6 +304,7 @@ int test_builtin(BIO *out)
     const unsigned char *sig_ptr;
     unsigned char *sig_ptr2;
     unsigned char *raw_buf = NULL;
+    BIGNUM *sig_r, *sig_s;
     unsigned int sig_len, degree, r_len, s_len, bn_len, buf_len;
     int nid, ret = 0;
 
@@ -431,9 +435,11 @@ int test_builtin(BIO *out)
             goto builtin_err;
         }
 
+        ECDSA_SIG_get0(&sig_r, &sig_s, ecdsa_sig);
+
         /* Store the two BIGNUMs in raw_buf. */
-        r_len = BN_num_bytes(ecdsa_sig->r);
-        s_len = BN_num_bytes(ecdsa_sig->s);
+        r_len = BN_num_bytes(sig_r);
+        s_len = BN_num_bytes(sig_s);
         bn_len = (degree + 7) / 8;
         if ((r_len > bn_len) || (s_len > bn_len)) {
             BIO_printf(out, " failed\n");
@@ -442,16 +448,16 @@ int test_builtin(BIO *out)
         buf_len = 2 * bn_len;
         if ((raw_buf = OPENSSL_zalloc(buf_len)) == NULL)
             goto builtin_err;
-        BN_bn2bin(ecdsa_sig->r, raw_buf + bn_len - r_len);
-        BN_bn2bin(ecdsa_sig->s, raw_buf + buf_len - s_len);
+        BN_bn2bin(sig_r, raw_buf + bn_len - r_len);
+        BN_bn2bin(sig_s, raw_buf + buf_len - s_len);
 
         /* Modify a single byte in the buffer. */
         offset = raw_buf[10] % buf_len;
         dirt = raw_buf[11] ? raw_buf[11] : 1;
         raw_buf[offset] ^= dirt;
         /* Now read the BIGNUMs back in from raw_buf. */
-        if ((BN_bin2bn(raw_buf, bn_len, ecdsa_sig->r) == NULL) ||
-            (BN_bin2bn(raw_buf + bn_len, bn_len, ecdsa_sig->s) == NULL))
+        if ((BN_bin2bn(raw_buf, bn_len, sig_r) == NULL) ||
+            (BN_bin2bn(raw_buf + bn_len, bn_len, sig_s) == NULL))
             goto builtin_err;
 
         sig_ptr2 = signature;
@@ -464,8 +470,8 @@ int test_builtin(BIO *out)
          * Sanity check: undo the modification and verify signature.
          */
         raw_buf[offset] ^= dirt;
-        if ((BN_bin2bn(raw_buf, bn_len, ecdsa_sig->r) == NULL) ||
-            (BN_bin2bn(raw_buf + bn_len, bn_len, ecdsa_sig->s) == NULL))
+        if ((BN_bin2bn(raw_buf, bn_len, sig_r) == NULL) ||
+            (BN_bin2bn(raw_buf + bn_len, bn_len, sig_s) == NULL))
             goto builtin_err;
 
         sig_ptr2 = signature;
@@ -509,20 +515,13 @@ int main(void)
 {
     int ret = 1;
     BIO *out;
+    char *p;
 
     out = BIO_new_fp(stdout, BIO_NOCLOSE | BIO_FP_TEXT);
 
-    /* enable memory leak checking unless explicitly disabled */
-    if (!((getenv("OPENSSL_DEBUG_MEMORY") != NULL) &&
-          (0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off")))) {
-        CRYPTO_malloc_debug_init();
-        CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
-    } else {
-        /* OPENSSL_DEBUG_MEMORY=off */
-        CRYPTO_set_mem_debug_functions(0, 0, 0, 0, 0);
-    }
-    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-
+    p = getenv("OPENSSL_DEBUG_MEMORY");
+    if (p != NULL && strcmp(p, "on") == 0)
+        CRYPTO_set_mem_debug(1);
     ERR_load_crypto_strings();
 
     /* initialize the prng */
@@ -545,7 +544,10 @@ int main(void)
     CRYPTO_cleanup_all_ex_data();
     ERR_remove_thread_state(NULL);
     ERR_free_strings();
-    CRYPTO_mem_leaks(out);
+#ifndef OPENSSL_NO_CRYPTO_MDEBUG
+    if (CRYPTO_mem_leaks(out) <= 0)
+        ret = 1;
+#endif
     BIO_free(out);
     return ret;
 }