[openssl-commits] [openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  e26f653defd08334ebfa517b6715a338f543fbf1 (commit)
      from  7835e97b6ff5cd94a10c5aeac439f4aa145a77b2 (commit)


- Log -----------------------------------------------------------------
commit e26f653defd08334ebfa517b6715a338f543fbf1
Author: Anna Henningsen <anna at addaleax.net>
Date:   Sun Jan 13 18:26:43 2019 +0100

    Fix compilation with `-DREF_PRINT`
    
    CLA: trivial
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/8016)

-----------------------------------------------------------------------

Summary of changes:
 crypto/dso/dso_lib.c     | 2 +-
 crypto/ec/ecp_nistz256.c | 2 +-
 crypto/x509/x509_lu.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
index f426be0..f1b193b 100644
--- a/crypto/dso/dso_lib.c
+++ b/crypto/dso/dso_lib.c
@@ -111,7 +111,7 @@ int DSO_up_ref(DSO *dso)
     if (CRYPTO_UP_REF(&dso->references, &i, dso->lock) <= 0)
         return 0;
 
-    REF_PRINT_COUNT("DSO", r);
+    REF_PRINT_COUNT("DSO", dso);
     REF_ASSERT_ISNT(i < 2);
     return ((i > 1) ? 1 : 0);
 }
diff --git a/crypto/ec/ecp_nistz256.c b/crypto/ec/ecp_nistz256.c
index 2db7d19..82affd6 100644
--- a/crypto/ec/ecp_nistz256.c
+++ b/crypto/ec/ecp_nistz256.c
@@ -1432,7 +1432,7 @@ void EC_nistz256_pre_comp_free(NISTZ256_PRE_COMP *pre)
         return;
 
     CRYPTO_DOWN_REF(&pre->references, &i, pre->lock);
-    REF_PRINT_COUNT("EC_nistz256", x);
+    REF_PRINT_COUNT("EC_nistz256", pre);
     if (i > 0)
         return;
     REF_ASSERT_ISNT(i < 0);
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index 6bcdafb..fa8153d 100644
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -237,7 +237,7 @@ int X509_STORE_up_ref(X509_STORE *vfy)
     if (CRYPTO_UP_REF(&vfy->references, &i, vfy->lock) <= 0)
         return 0;
 
-    REF_PRINT_COUNT("X509_STORE", a);
+    REF_PRINT_COUNT("X509_STORE", vfy);
     REF_ASSERT_ISNT(i < 2);
     return ((i > 1) ? 1 : 0);
 }