9.2 does not have dst__openssl_toresult()

diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c
index 7314c3a0fcd19937e1c5406f7380fd41b458f9ea..f49f20c4d3af152017efe4b8590a99cc1e0a2b6e 100644 (file)
--- a/lib/dns/openssldh_link.c
+++ b/lib/dns/openssldh_link.c
@@ -18,7 +18,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssldh_link.c,v 1.1.2.6 2007/01/08 02:45:02 marka Exp $
+ * $Id: openssldh_link.c,v 1.1.2.7 2007/01/08 05:57:37 marka Exp $
  */
 
 #ifdef OPENSSL
@@ -153,14 +153,14 @@ openssldh_generate(dst_key_t *key, int generator) {
 #if OPENSSL_VERSION_NUMBER > 0x00908000L
                dh = DH_new();
                if (dh == NULL)
-                       return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
+                       return (DST_R_OPENSSLFAILURE);
 
                BN_GENCB_set_old(&cb, NULL, NULL);
 
                if (!DH_generate_parameters_ex(dh, key->key_size, generator,
                                               &cb)) {
                        DH_free(dh);
-                       return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
+                       return (DST_R_OPENSSLFAILURE);
                }
 #else
                dh = DH_generate_parameters(key->key_size, generator,

diff --git a/lib/dns/openssldsa_link.c b/lib/dns/openssldsa_link.c
index 1e0c221ef9fac4050b10c2fe7c572ad74b1b346c..d14523aebe21c1185e683a788a5265fd42e9e619 100644 (file)
--- a/lib/dns/openssldsa_link.c
+++ b/lib/dns/openssldsa_link.c
@@ -16,7 +16,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: openssldsa_link.c,v 1.1.2.7 2007/01/08 03:33:35 marka Exp $ */
+/* $Id: openssldsa_link.c,v 1.1.2.8 2007/01/08 05:57:37 marka Exp $ */
 
 #ifdef OPENSSL
 
@@ -187,7 +187,7 @@ openssldsa_generate(dst_key_t *key, int unused) {
 #if OPENSSL_VERSION_NUMBER > 0x00908000L
        dsa = DSA_new();
        if (dsa == NULL)
-               return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
+               return (DST_R_OPENSSLFAILURE);
 
        BN_GENCB_set_old(&cb, NULL, NULL);
        
@@ -195,7 +195,7 @@ openssldsa_generate(dst_key_t *key, int unused) {
                                        ISC_SHA1_DIGESTLENGTH, NULL, NULL,
                                        &cb)) {
                DSA_free(dsa);
-               return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
+               return (DST_R_OPENSSLFAILURE);
        }
 #else
        dsa = DSA_generate_parameters(key->key_size, rand_array,