removed superfluous get_other_public_value in diffie_hellman_t interface
authorMartin Willi <martin@strongswan.org>
Tue, 4 Nov 2008 13:12:11 +0000 (13:12 -0000)
committerMartin Willi <martin@strongswan.org>
Tue, 4 Nov 2008 13:12:11 +0000 (13:12 -0000)
src/libstrongswan/crypto/diffie_hellman.h
src/libstrongswan/plugins/gmp/gmp_diffie_hellman.c
src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c
src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c

index 145b9c0..65a6714 100644 (file)
@@ -85,16 +85,6 @@ struct diffie_hellman_t {
        void (*set_other_public_value) (diffie_hellman_t *this, chunk_t value);
        
        /**
-        * Gets the public value of partner.
-        *      
-        * Space for returned chunk is allocated and must be freed by the caller.
-        * 
-        * @param value         public value of partner is stored at this location
-        * @return                      SUCCESS, FAILED if other public value not set
-        */
-       status_t (*get_other_public_value) (diffie_hellman_t *this, chunk_t *value);
-       
-       /**
         * Gets the own public value to transmit.
         *      
         * Space for returned chunk is allocated and must be freed by the caller.
index 0f90314..0bb968d 100644 (file)
@@ -440,25 +440,6 @@ static void set_other_public_value(private_gmp_diffie_hellman_t *this, chunk_t v
 }
 
 /**
- * Implementation of gmp_diffie_hellman_t.get_other_public_value.
- */
-static status_t get_other_public_value(private_gmp_diffie_hellman_t *this, 
-                                                                          chunk_t *value)
-{
-       if (!this->computed)
-       {
-               return FAILED;
-       }
-       value->len = this->p_len;
-       value->ptr = mpz_export(NULL, NULL, 1, value->len, 1, 0, this->yb);
-       if (value->ptr == NULL)
-       {
-               return FAILED;
-       }
-       return SUCCESS;
-}
-
-/**
  * Implementation of gmp_diffie_hellman_t.get_my_public_value.
  */
 static void get_my_public_value(private_gmp_diffie_hellman_t *this,chunk_t *value)
@@ -551,7 +532,6 @@ gmp_diffie_hellman_t *gmp_diffie_hellman_create(diffie_hellman_group_t group)
        /* public functions */
        this->public.dh.get_shared_secret = (status_t (*)(diffie_hellman_t *, chunk_t *)) get_shared_secret;
        this->public.dh.set_other_public_value = (void (*)(diffie_hellman_t *, chunk_t )) set_other_public_value;
-       this->public.dh.get_other_public_value = (status_t (*)(diffie_hellman_t *, chunk_t *)) get_other_public_value;
        this->public.dh.get_my_public_value = (void (*)(diffie_hellman_t *, chunk_t *)) get_my_public_value;
        this->public.dh.get_dh_group = (diffie_hellman_group_t (*)(diffie_hellman_t *)) get_dh_group;
        this->public.dh.destroy = (void (*)(diffie_hellman_t *)) destroy;
index 176409f..8abeaa4 100644 (file)
@@ -101,37 +101,15 @@ struct private_openssl_diffie_hellman_t {
 };
 
 /**
- * Convert a BIGNUM to a chunk
- */
-static void bn2chunk(private_openssl_diffie_hellman_t *this,
-                                        BIGNUM *bn, chunk_t *chunk)
-{
-       *chunk = chunk_alloc(DH_size(this->dh));
-       memset(chunk->ptr, 0, chunk->len);
-       BN_bn2bin(bn, chunk->ptr + chunk->len - BN_num_bytes(bn));
-}
-
-/**
- * Implementation of openssl_diffie_hellman_t.get_other_public_value.
- */
-static status_t get_other_public_value(private_openssl_diffie_hellman_t *this, 
-                                                                          chunk_t *value)
-{
-       if (!this->computed)
-       {
-               return FAILED;
-       }
-       bn2chunk(this, this->pub_key, value);
-       return SUCCESS;
-}
-
-/**
  * Implementation of openssl_diffie_hellman_t.get_my_public_value.
  */
 static void get_my_public_value(private_openssl_diffie_hellman_t *this,
                                                                chunk_t *value)
 {
-       bn2chunk(this, this->dh->pub_key, value);
+       *value = chunk_alloc(DH_size(this->dh));
+       memset(value->ptr, 0, value->len);
+       BN_bn2bin(this->dh->pub_key,
+                         value->ptr + value->len - BN_num_bytes(this->dh->pub_key));
 }
 
 /**
@@ -232,7 +210,6 @@ openssl_diffie_hellman_t *openssl_diffie_hellman_create(diffie_hellman_group_t g
        
        this->public.dh.get_shared_secret = (status_t (*)(diffie_hellman_t *, chunk_t *)) get_shared_secret;
        this->public.dh.set_other_public_value = (void (*)(diffie_hellman_t *, chunk_t )) set_other_public_value;
-       this->public.dh.get_other_public_value = (status_t (*)(diffie_hellman_t *, chunk_t *)) get_other_public_value;
        this->public.dh.get_my_public_value = (void (*)(diffie_hellman_t *, chunk_t *)) get_my_public_value;
        this->public.dh.get_dh_group = (diffie_hellman_group_t (*)(diffie_hellman_t *)) get_dh_group;
        this->public.dh.destroy = (void (*)(diffie_hellman_t *)) destroy;
index 3668a17..e34e705 100644 (file)
@@ -217,24 +217,6 @@ static void set_other_public_value(private_openssl_ec_diffie_hellman_t *this, ch
 }
 
 /**
- * Implementation of openssl_ec_diffie_hellman_t.get_other_public_value.
- */
-static status_t get_other_public_value(private_openssl_ec_diffie_hellman_t *this, 
-                                                                          chunk_t *value)
-{
-       if (!this->computed)
-       {
-               return FAILED;
-       }
-       
-       if (!ecp2chunk(this->ec_group, this->pub_key, value))
-       {
-               return FAILED;
-       }
-       return SUCCESS;
-}
-
-/**
  * Implementation of openssl_ec_diffie_hellman_t.get_my_public_value.
  */
 static void get_my_public_value(private_openssl_ec_diffie_hellman_t *this,chunk_t *value)
@@ -283,7 +265,6 @@ openssl_ec_diffie_hellman_t *openssl_ec_diffie_hellman_create(diffie_hellman_gro
        
        this->public.dh.get_shared_secret = (status_t (*)(diffie_hellman_t *, chunk_t *)) get_shared_secret;
        this->public.dh.set_other_public_value = (void (*)(diffie_hellman_t *, chunk_t )) set_other_public_value;
-       this->public.dh.get_other_public_value = (status_t (*)(diffie_hellman_t *, chunk_t *)) get_other_public_value;
        this->public.dh.get_my_public_value = (void (*)(diffie_hellman_t *, chunk_t *)) get_my_public_value;
        this->public.dh.get_dh_group = (diffie_hellman_group_t (*)(diffie_hellman_t *)) get_dh_group;
        this->public.dh.destroy = (void (*)(diffie_hellman_t *)) destroy;