1 files changed, 67 insertions, 4 deletions

diff --git a/source4/heimdal/lib/hcrypto/dh.c b/source4/heimdal/lib/hcrypto/dh.c
index d42ac34fd2..43e1d6ac1b 100644
--- a/source4/heimdal/lib/hcrypto/dh.c
+++ b/source4/heimdal/lib/hcrypto/dh.c
@@ -37,6 +37,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <krb5-types.h>
+#include <rfc2459_asn1.h>
+
 #include <dh.h>
 
 #include <roken.h>
@@ -301,7 +304,7 @@ DH_check_pubkey(const DH *dh, const BIGNUM *pub_key, int *codes)
     if (!BN_set_word(bn, 2))
 	goto out;
 
-    if (BN_cmp(bn, pub_key) == 0) {
+    if (BN_cmp(bn, dh->g) == 0) {
 	unsigned i, n = BN_num_bits(pub_key);
 	unsigned bits = 0;
 
@@ -309,7 +312,7 @@ DH_check_pubkey(const DH *dh, const BIGNUM *pub_key, int *codes)
 	    if (BN_is_bit_set(pub_key, i))
 		bits++;
 
-	if (bits > 1) {
+	if (bits < 2) {
 	    *codes |= DH_CHECK_PUBKEY_TOO_SMALL;
 	    goto out;
 	}
@@ -442,8 +445,8 @@ static const DH_METHOD dh_null_method = {
     dh_null_generate_params
 };
 
-extern const DH_METHOD _hc_dh_imath_method;
-static const DH_METHOD *dh_default_method = &_hc_dh_imath_method;
+extern const DH_METHOD _hc_dh_ltm_method;
+static const DH_METHOD *dh_default_method = &_hc_dh_ltm_method;
 
 /**
  * Return the dummy DH implementation.
@@ -487,3 +490,63 @@ DH_get_default_method(void)
     return dh_default_method;
 }
 
+/*
+ *
+ */
+
+static int
+bn2heim_int(BIGNUM *bn, heim_integer *integer)
+{
+    integer->length = BN_num_bytes(bn);
+    integer->data = malloc(integer->length);
+    if (integer->data == NULL) {
+	integer->length = 0;
+	return ENOMEM;
+    }
+    BN_bn2bin(bn, integer->data);
+    integer->negative = BN_is_negative(bn);
+    return 0;
+}
+
+/**
+ *
+ */
+
+int
+i2d_DHparams(DH *dh, unsigned char **pp)
+{
+    DHParameter data;
+    size_t size;
+    int ret;
+
+    memset(&data, 0, sizeof(data));
+
+    if (bn2heim_int(dh->p, &data.prime) ||
+	bn2heim_int(dh->g, &data.base))
+    {
+	free_DHParameter(&data);
+	return -1;
+    }
+
+    if (pp == NULL) {
+	size = length_DHParameter(&data);
+	free_DHParameter(&data);
+    } else {
+	void *p;
+	size_t len;
+
+	ASN1_MALLOC_ENCODE(DHParameter, p, len, &data, &size, ret);
+	free_DHParameter(&data);
+	if (ret)
+	    return -1;
+	if (len != size)
+	    abort();
+
+	memcpy(*pp, p, size);
+	free(p);
+
+	*pp += size;
+    }
+
+    return size;
+}