From: Adriaan de Jong <dejong@fox-it.com>
Date: Mon, 31 Oct 2011 15:29:14 +0000 (+0100)
Subject: Moved prng_uninit out of crypto_uninit_lib
X-Git-Tag: v2.3-alpha1~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54628d1ac10675d4554b58500341e35e8ac4fcbb;p=thirdparty%2Fopenvpn.git

Moved prng_uninit out of crypto_uninit_lib

Since prng_uninit is SSL-library agnostic, but crypto_uninit_lib isn't,
the function was moved up a level.

Also removed one unused variable (j) in tls1_P_hash().

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
---

diff --git a/crypto.c b/crypto.c
index d17f70654..375d35ac3 100644
--- a/crypto.c
+++ b/crypto.c
@@ -1388,6 +1388,7 @@ void
 free_ssl_lib (void)
 {
   crypto_uninit_lib ();
+  prng_uninit();
   EVP_cleanup ();
   ERR_free_strings ();
 }
diff --git a/crypto_openssl.c b/crypto_openssl.c
index 9906479a8..db6b78e50 100644
--- a/crypto_openssl.c
+++ b/crypto_openssl.c
@@ -277,8 +277,6 @@ crypto_uninit_lib (void)
       engine_initialized = false;
     }
 #endif
-
-  prng_uninit ();
 }
 
 void
diff --git a/crypto_polarssl.c b/crypto_polarssl.c
index 8119d58a2..e7470d50d 100644
--- a/crypto_polarssl.c
+++ b/crypto_polarssl.c
@@ -69,7 +69,6 @@ crypto_init_lib (void)
 void
 crypto_uninit_lib (void)
 {
-  prng_uninit();
 }
 
 void
diff --git a/ssl.c b/ssl.c
index 30f6eb2ca..955a0d1ad 100644
--- a/ssl.c
+++ b/ssl.c
@@ -162,7 +162,8 @@ void
 free_ssl_lib ()
 {
   crypto_uninit_lib ();
-
+  prng_uninit();
+  
   tls_free_lib();
 }
 
@@ -1168,7 +1169,6 @@ tls1_P_hash(const md_kt_t *md_kt,
 {
   struct gc_arena gc = gc_new ();
   int chunk,n;
-  unsigned int j;
   hmac_ctx_t ctx;
   hmac_ctx_t ctx_tmp;
   uint8_t A1[MAX_HMAC_KEY_LENGTH];