Move the REF_PRINT support from e_os.h to internal/refcount.h.

[openssl.git] / crypto / dh / dh_lib.c

diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c
index adf177151486b73ce18418148e225f2740f9fa6f..4530ce734535c229601ccaa8f4483af24b686085 100644 (file)
--- a/crypto/dh/dh_lib.c
+++ b/crypto/dh/dh_lib.c
@@ -9,24 +9,11 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
 
 #include <stdio.h>
 #include "internal/cryptlib.h"

+#include "internal/refcount.h"

 #include <openssl/bn.h>
 #include "dh_locl.h"
 #include <openssl/engine.h>
 
 #include <openssl/bn.h>
 #include "dh_locl.h"
 #include <openssl/engine.h>
 

-static const DH_METHOD *default_DH_method = NULL;
-
-void DH_set_default_method(const DH_METHOD *meth)
-{
-    default_DH_method = meth;
-}
-
-const DH_METHOD *DH_get_default_method(void)
-{
-    if (!default_DH_method)
-        default_DH_method = DH_OpenSSL();
-    return default_DH_method;
-}
-

 int DH_set_method(DH *dh, const DH_METHOD *meth)
 {
     /*
 int DH_set_method(DH *dh, const DH_METHOD *meth)
 {
     /*


@@ -111,7 +98,7 @@ void DH_free(DH *r)
     if (r == NULL)
         return;
 
     if (r == NULL)
         return;
 

-    CRYPTO_atomic_add(&r->references, -1, &i, r->lock);
+    CRYPTO_DOWN_REF(&r->references, &i, r->lock);

     REF_PRINT_COUNT("DH", r);
     if (i > 0)
         return;
     REF_PRINT_COUNT("DH", r);
     if (i > 0)
         return;


@@ -142,7 +129,7 @@ int DH_up_ref(DH *r)
 {
     int i;
 
 {
     int i;
 

-    if (CRYPTO_atomic_add(&r->references, 1, &i, r->lock) <= 0)
+    if (CRYPTO_UP_REF(&r->references, &i, r->lock) <= 0)

         return 0;
 
     REF_PRINT_COUNT("DH", r);
         return 0;
 
     REF_PRINT_COUNT("DH", r);