1 files changed, 26 insertions, 17 deletions

diff --git a/src/lib/libssl/src/crypto/ec/ec2_smpt.c b/src/lib/libcrypto/dh/dh_depr.c
index 59d52bf663..acc05f252c 100644
--- a/src/lib/libssl/src/crypto/ec/ec2_smpt.c
+++ b/src/lib/libcrypto/dh/dh_depr.c
@@ -1,7 +1,4 @@
-/* crypto/ec/ec2_smpt.c */
-/* This code was originally written by Douglas Stebila 
- * <dstebila@student.math.uwaterloo.ca> for the OpenSSL project.
- */
+/* crypto/dh/dh_depr.c */
 /* ====================================================================
  * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
@@ -57,18 +54,30 @@
  */
 
 
-/* Calaculates and sets the affine coordinates of an EC_POINT from the given
- * compressed coordinates.  Uses algorithm 2.3.4 of SEC 1. 
- * Note that the simple implementation only uses affine coordinates.
- *
- * This algorithm is patented by Certicom Corp. under US Patent 6,141,420
- * (for licensing information, contact licensing@certicom.com).
- * This function is disabled by default and can be enabled by defining the 
- * preprocessor macro OPENSSL_EC_BIN_PT_COMP at Configure-time.
- */
-int ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
-        const BIGNUM *x_, int y_bit, BN_CTX *ctx)
+/* This file contains deprecated functions as wrappers to the new ones */
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include <openssl/bn.h>
+#include <openssl/dh.h>
+
+static void *dummy=&dummy;
+
+#ifndef OPENSSL_NO_DEPRECATED
+DH *DH_generate_parameters(int prime_len, int generator,
+             void (*callback)(int,int,void *), void *cb_arg)
         {
-        ECerr(EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_DISABLED);
-        return 0;
+        BN_GENCB cb;
+        DH *ret=NULL;
+
+        if((ret=DH_new()) == NULL)
+                return NULL;
+
+        BN_GENCB_set_old(&cb, callback, cb_arg);
+
+        if(DH_generate_parameters_ex(ret, prime_len, generator, &cb))
+                return ret;
+        DH_free(ret);
+        return NULL;
         }
+#endif