1 files changed, 31 insertions, 33 deletions

diff --git a/src/lib/libssl/src/fips/dh/fips_dh_lib.c b/src/lib/libcrypto/dh/dh_asn1.c
index 4a822cf192..0b4357d605 100644
--- a/src/lib/libssl/src/fips/dh/fips_dh_lib.c
+++ b/src/lib/libcrypto/dh/dh_asn1.c
@@ -1,9 +1,9 @@
-/* fips_dh_lib.c */
+/* dh_asn1.c */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 2007.
+ * project 2000.
  */
 /* ====================================================================
- * Copyright (c) 2007 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2000-2005 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -56,40 +56,38 @@
  *
  */
 
-#include <string.h>
+#include <stdio.h>
+#include "cryptlib.h"
 #include <openssl/bn.h>
 #include <openssl/dh.h>
+#include <openssl/objects.h>
+#include <openssl/asn1t.h>
 
-/* Minimal FIPS versions of FIPS_dh_new() and FIPS_dh_free(): to
- * reduce external dependencies. 
- */
-
-DH *FIPS_dh_new(void)
-        {
-        DH *ret;
-        ret = OPENSSL_malloc(sizeof(DH));
-        if (!ret)
-                return NULL;
-        memset(ret, 0, sizeof(DH));
-        ret->meth = DH_OpenSSL();
-        if (ret->meth->init)
-                ret->meth->init(ret);
-        return ret;
+/* Override the default free and new methods */
+static int dh_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
+                                                void *exarg)
+{
+        if(operation == ASN1_OP_NEW_PRE) {
+                *pval = (ASN1_VALUE *)DH_new();
+                if(*pval) return 2;
+                return 0;
+        } else if(operation == ASN1_OP_FREE_PRE) {
+                DH_free((DH *)*pval);
+                *pval = NULL;
+                return 2;
         }
+        return 1;
+}
+
+ASN1_SEQUENCE_cb(DHparams, dh_cb) = {
+        ASN1_SIMPLE(DH, p, BIGNUM),
+        ASN1_SIMPLE(DH, g, BIGNUM),
+        ASN1_OPT(DH, length, ZLONG),
+} ASN1_SEQUENCE_END_cb(DH, DHparams)
+
+IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DH, DHparams, DHparams)
 
-void FIPS_dh_free(DH *r)
+DH *DHparams_dup(DH *dh)
         {
-        if (!r)
-                return;
-        if (r->meth->finish)
-                r->meth->finish(r);
-        if (r->p != NULL) BN_clear_free(r->p);
-        if (r->g != NULL) BN_clear_free(r->g);
-        if (r->q != NULL) BN_clear_free(r->q);
-        if (r->j != NULL) BN_clear_free(r->j);
-        if (r->seed) OPENSSL_free(r->seed);
-        if (r->counter != NULL) BN_clear_free(r->counter);
-        if (r->pub_key != NULL) BN_clear_free(r->pub_key);
-        if (r->priv_key != NULL) BN_clear_free(r->priv_key);
-        OPENSSL_free(r);
+        return ASN1_item_dup(ASN1_ITEM_rptr(DHparams), dh);
         }