diffie-hellman: Use bool instead of status_t as get_shared_secret() return value

While such a change is not unproblematic, keeping status_t makes the API
inconsistent once we introduce return values for the public value operations.

diff --git a/src/charon-tkm/src/tkm/tkm_diffie_hellman.c b/src/charon-tkm/src/tkm/tkm_diffie_hellman.c
index 836e0b7f088dbdc0cb56e50dd992acda23d6b994..02ae67f73f94b6dac69c5a54b804c9131166aef8 100644 (file)
--- a/src/charon-tkm/src/tkm/tkm_diffie_hellman.c
+++ b/src/charon-tkm/src/tkm/tkm_diffie_hellman.c
@@ -61,11 +61,11 @@ METHOD(diffie_hellman_t, get_my_public_value, void,
        sequence_to_chunk(this->pubvalue.data, this->pubvalue.size, value);
 }
 
-METHOD(diffie_hellman_t, get_shared_secret, status_t,
+METHOD(diffie_hellman_t, get_shared_secret, bool,
        private_tkm_diffie_hellman_t *this, chunk_t *secret)
 {
        *secret = chunk_empty;
-       return SUCCESS;
+       return TRUE;
 }
 
 

diff --git a/src/libcharon/plugins/ha/ha_child.c b/src/libcharon/plugins/ha/ha_child.c
index ed6ca71960e032caa1d2983dff46214ea5c3e160..17f2d50d13e753dd013c505abac4f6f22edff638 100644 (file)
--- a/src/libcharon/plugins/ha/ha_child.c
+++ b/src/libcharon/plugins/ha/ha_child.c
@@ -97,7 +97,7 @@ METHOD(listener_t, child_keys, bool,
        }
        m->add_attribute(m, HA_NONCE_I, nonce_i);
        m->add_attribute(m, HA_NONCE_R, nonce_r);
-       if (dh && dh->get_shared_secret(dh, &secret) == SUCCESS)
+       if (dh && dh->get_shared_secret(dh, &secret))
        {
                m->add_attribute(m, HA_SECRET, secret);
                chunk_clear(&secret);

diff --git a/src/libcharon/plugins/ha/ha_dispatcher.c b/src/libcharon/plugins/ha/ha_dispatcher.c
index 88160fe4f5eb391a4872015bbccc4edfb16483f6..abd08e2fe9b68ca07dc5caea8b2cc4a065d46018 100644 (file)
--- a/src/libcharon/plugins/ha/ha_dispatcher.c
+++ b/src/libcharon/plugins/ha/ha_dispatcher.c
@@ -81,11 +81,11 @@ struct ha_diffie_hellman_t {
        chunk_t pub;
 };
 
-METHOD(diffie_hellman_t, dh_get_shared_secret, status_t,
+METHOD(diffie_hellman_t, dh_get_shared_secret, bool,
        ha_diffie_hellman_t *this, chunk_t *secret)
 {
        *secret = chunk_clone(this->secret);
-       return SUCCESS;
+       return TRUE;
 }
 
 METHOD(diffie_hellman_t, dh_get_my_public_value, void,

diff --git a/src/libcharon/plugins/ha/ha_ike.c b/src/libcharon/plugins/ha/ha_ike.c
index 442a3a23d5eb0cbb1d3ba6544333b17b19459570..815cb53893cb158127a6ac75509ff1be11deb257 100644 (file)
--- a/src/libcharon/plugins/ha/ha_ike.c
+++ b/src/libcharon/plugins/ha/ha_ike.c
@@ -84,7 +84,7 @@ METHOD(listener_t, ike_keys, bool,
        {       /* do not sync SA between nodes */
                return TRUE;
        }
-       if (dh->get_shared_secret(dh, &secret) != SUCCESS)
+       if (!dh->get_shared_secret(dh, &secret))
        {
                return TRUE;
        }

diff --git a/src/libcharon/plugins/load_tester/load_tester_diffie_hellman.c b/src/libcharon/plugins/load_tester/load_tester_diffie_hellman.c
index 94e1acc991d1460c52231f548dd68a0cdce2db57..b248e78c5df693d79cbbff6bf212cef4122c0235 100644 (file)
--- a/src/libcharon/plugins/load_tester/load_tester_diffie_hellman.c
+++ b/src/libcharon/plugins/load_tester/load_tester_diffie_hellman.c
@@ -26,11 +26,11 @@ METHOD(diffie_hellman_t, set_other_public_value, void,
 {
 }
 
-METHOD(diffie_hellman_t, get_shared_secret, status_t,
+METHOD(diffie_hellman_t, get_shared_secret, bool,
        load_tester_diffie_hellman_t *this, chunk_t *secret)
 {
        *secret = chunk_empty;
-       return SUCCESS;
+       return TRUE;
 }
 
 METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t,

diff --git a/src/libcharon/sa/ikev1/keymat_v1.c b/src/libcharon/sa/ikev1/keymat_v1.c
index 619d197bd5206d09fe5a0d0100ed95bf9fc42415..b171adc1e2ff59abaa920f41a415ab18aacd4bbc 100644 (file)
--- a/src/libcharon/sa/ikev1/keymat_v1.c
+++ b/src/libcharon/sa/ikev1/keymat_v1.c
@@ -425,7 +425,7 @@ METHOD(keymat_v1_t, derive_ike_keys, bool,
                return FALSE;
        }
 
-       if (dh->get_shared_secret(dh, &g_xy) != SUCCESS)
+       if (!dh->get_shared_secret(dh, &g_xy))
        {
                return FALSE;
        }
@@ -661,7 +661,7 @@ METHOD(keymat_v1_t, derive_child_keys, bool,
        protocol = proposal->get_protocol(proposal);
        if (dh)
        {
-               if (dh->get_shared_secret(dh, &secret) != SUCCESS)
+               if (!dh->get_shared_secret(dh, &secret))
                {
                        return FALSE;
                }

diff --git a/src/libcharon/sa/ikev2/keymat_v2.c b/src/libcharon/sa/ikev2/keymat_v2.c
index f237f7059240914b4bffe6dcc3e50acd1e263b89..f70f5cfeda0dec9c7f0a8aff98028f55e202109c 100644 (file)
--- a/src/libcharon/sa/ikev2/keymat_v2.c
+++ b/src/libcharon/sa/ikev2/keymat_v2.c
@@ -300,7 +300,7 @@ METHOD(keymat_v2_t, derive_ike_keys, bool,
        spi_i = chunk_alloca(sizeof(u_int64_t));
        spi_r = chunk_alloca(sizeof(u_int64_t));
 
-       if (dh->get_shared_secret(dh, &secret) != SUCCESS)
+       if (!dh->get_shared_secret(dh, &secret))
        {
                return FALSE;
        }
@@ -554,7 +554,7 @@ METHOD(keymat_v2_t, derive_child_keys, bool,
 
        if (dh)
        {
-               if (dh->get_shared_secret(dh, &secret) != SUCCESS)
+               if (!dh->get_shared_secret(dh, &secret))
                {
                        return FALSE;
                }

diff --git a/src/libimcv/pts/pts.c b/src/libimcv/pts/pts.c
index 2fff4c9014c45855166fdba4044f451896768ce9..a7def9b7add072a165137da07b5e0bc56756811d 100644 (file)
--- a/src/libimcv/pts/pts.c
+++ b/src/libimcv/pts/pts.c
@@ -264,7 +264,7 @@ METHOD(pts_t, calculate_secret, bool,
        DBG3(DBG_PTS, "responder nonce: %B", &this->responder_nonce);
 
        /* Calculate the DH secret */
-       if (this->dh->get_shared_secret(this->dh, &shared_secret) != SUCCESS)
+       if (!this->dh->get_shared_secret(this->dh, &shared_secret))
        {
                DBG1(DBG_PTS, "shared DH secret computation failed");
                return FALSE;

diff --git a/src/libstrongswan/crypto/diffie_hellman.h b/src/libstrongswan/crypto/diffie_hellman.h
index d5161d077bb20e8bf1d0ee75ad6e3b74b8a6f971..79977d7da6b2b26d2ca67af3b144b8be2875ca96 100644 (file)
--- a/src/libstrongswan/crypto/diffie_hellman.h
+++ b/src/libstrongswan/crypto/diffie_hellman.h
@@ -89,9 +89,10 @@ struct diffie_hellman_t {
         * Space for returned secret is allocated and must be freed by the caller.
         *
         * @param secret        shared secret will be written into this chunk
-        * @return                      SUCCESS, FAILED if not both DH values are set
+        * @return                      TRUE if shared secret computed successfully
         */
-       status_t (*get_shared_secret) (diffie_hellman_t *this, chunk_t *secret);
+       bool (*get_shared_secret)(diffie_hellman_t *this, chunk_t *secret)
+               __attribute__((warn_unused_result));
 
        /**
         * Sets the public value of partner.

diff --git a/src/libstrongswan/plugins/gcrypt/gcrypt_dh.c b/src/libstrongswan/plugins/gcrypt/gcrypt_dh.c
index 299865da2e09264bfbac8c95720a2f458dbc97df..44f33c9a62a42fc90e56fb10a3edd2fbc9229da5 100644 (file)
--- a/src/libstrongswan/plugins/gcrypt/gcrypt_dh.c
+++ b/src/libstrongswan/plugins/gcrypt/gcrypt_dh.c
@@ -138,15 +138,15 @@ METHOD(diffie_hellman_t, get_my_public_value, void,
        *value = export_mpi(this->ya, this->p_len);
 }
 
-METHOD(diffie_hellman_t, get_shared_secret, status_t,
+METHOD(diffie_hellman_t, get_shared_secret, bool,
        private_gcrypt_dh_t *this, chunk_t *secret)
 {
        if (!this->zz)
        {
-               return FAILED;
+               return FALSE;
        }
        *secret = export_mpi(this->zz, this->p_len);
-       return SUCCESS;
+       return TRUE;
 }
 
 METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t,

diff --git a/src/libstrongswan/plugins/gmp/gmp_diffie_hellman.c b/src/libstrongswan/plugins/gmp/gmp_diffie_hellman.c
index 9936f7e4518fb0f428e38b1a5cab2ae7e8628807..d07999dfb173fd5e26ea2a49be8364a10157871e 100644 (file)
--- a/src/libstrongswan/plugins/gmp/gmp_diffie_hellman.c
+++ b/src/libstrongswan/plugins/gmp/gmp_diffie_hellman.c
@@ -155,20 +155,20 @@ METHOD(diffie_hellman_t, get_my_public_value, void,
        }
 }
 
-METHOD(diffie_hellman_t, get_shared_secret, status_t,
+METHOD(diffie_hellman_t, get_shared_secret, bool,
        private_gmp_diffie_hellman_t *this, chunk_t *secret)
 {
        if (!this->computed)
        {
-               return FAILED;
+               return FALSE;
        }
        secret->len = this->p_len;
        secret->ptr = mpz_export(NULL, NULL, 1, secret->len, 1, 0, this->zz);
        if (secret->ptr == NULL)
        {
-               return FAILED;
+               return FALSE;
        }
-       return SUCCESS;
+       return TRUE;
 }
 
 METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t,

diff --git a/src/libstrongswan/plugins/ntru/ntru_ke.c b/src/libstrongswan/plugins/ntru/ntru_ke.c
index e64f32b91d0e8edc16e70cf39b36fc15bab142a6..0aafd4caf58b8a9a00cd767d9c13191385e0b176 100644 (file)
--- a/src/libstrongswan/plugins/ntru/ntru_ke.c
+++ b/src/libstrongswan/plugins/ntru/ntru_ke.c
@@ -139,17 +139,17 @@ METHOD(diffie_hellman_t, get_my_public_value, void,
        }
 }
 
-METHOD(diffie_hellman_t, get_shared_secret, status_t,
+METHOD(diffie_hellman_t, get_shared_secret, bool,
        private_ntru_ke_t *this, chunk_t *secret)
 {
        if (!this->computed || !this->shared_secret.len)
        {
                *secret = chunk_empty;
-               return FAILED;
+               return FALSE;
        }
        *secret = chunk_clone(this->shared_secret);
 
-       return SUCCESS;
+       return TRUE;
 }
 
 

diff --git a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c
index 1e68ac59b838f064ebca36bfed677c5886a3cb77..603580277b03216ec3081dc11597c712edd182cf 100644 (file)
--- a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c
+++ b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c
@@ -70,19 +70,19 @@ METHOD(diffie_hellman_t, get_my_public_value, void,
                          value->ptr + value->len - BN_num_bytes(this->dh->pub_key));
 }
 
-METHOD(diffie_hellman_t, get_shared_secret, status_t,
+METHOD(diffie_hellman_t, get_shared_secret, bool,
        private_openssl_diffie_hellman_t *this, chunk_t *secret)
 {
        if (!this->computed)
        {
-               return FAILED;
+               return FALSE;
        }
        /* shared secret should requires a len according the DH group */
        *secret = chunk_alloc(DH_size(this->dh));
        memset(secret->ptr, 0, secret->len);
        memcpy(secret->ptr + secret->len - this->shared_secret.len,
                   this->shared_secret.ptr, this->shared_secret.len);
-       return SUCCESS;
+       return TRUE;
 }
 
 

diff --git a/src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c b/src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c
index 50853d6f0bdeefbe58f5e333e94ad680d9dc3adf..625990b0f570a05c7a077d4c88ce37c0a4979002 100644 (file)
--- a/src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c
+++ b/src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c
@@ -241,15 +241,15 @@ METHOD(diffie_hellman_t, get_my_public_value, void,
        ecp2chunk(this->ec_group, EC_KEY_get0_public_key(this->key), value, FALSE);
 }
 
-METHOD(diffie_hellman_t, get_shared_secret, status_t,
+METHOD(diffie_hellman_t, get_shared_secret, bool,
        private_openssl_ec_diffie_hellman_t *this, chunk_t *secret)
 {
        if (!this->computed)
        {
-               return FAILED;
+               return FALSE;
        }
        *secret = chunk_clone(this->shared_secret);
-       return SUCCESS;
+       return TRUE;
 }
 
 METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t,

diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_dh.c b/src/libstrongswan/plugins/pkcs11/pkcs11_dh.c
index 23b63d2386af19a83ef64e7a02451b279f6b4c55..99702f9c5b1ce6d7e8a6967151e8b6740b8537c2 100644 (file)
--- a/src/libstrongswan/plugins/pkcs11/pkcs11_dh.c
+++ b/src/libstrongswan/plugins/pkcs11/pkcs11_dh.c
@@ -154,15 +154,15 @@ METHOD(diffie_hellman_t, get_my_public_value, void,
        *value = chunk_clone(this->pub_key);
 }
 
-METHOD(diffie_hellman_t, get_shared_secret, status_t,
+METHOD(diffie_hellman_t, get_shared_secret, bool,
        private_pkcs11_dh_t *this, chunk_t *secret)
 {
        if (!this->secret.ptr)
        {
-               return FAILED;
+               return FALSE;
        }
        *secret = chunk_clone(this->secret);
-       return SUCCESS;
+       return TRUE;
 }
 
 METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t,

diff --git a/src/libstrongswan/tests/suites/test_ntru.c b/src/libstrongswan/tests/suites/test_ntru.c
index a28b4bc58f207632dc078ad2cac3db2627f6127d..5d5448fcc5d784281e8268eb5365a6a9e9bd99f4 100644 (file)
--- a/src/libstrongswan/tests/suites/test_ntru.c
+++ b/src/libstrongswan/tests/suites/test_ntru.c
@@ -1061,7 +1061,6 @@ START_TEST(test_ntru_ke)
        diffie_hellman_t *i_ntru, *r_ntru;
        char buf[10];
        int k, n, len;
-       status_t status;
 
        k = (_i) / countof(parameter_sets);
        n = (_i) % countof(parameter_sets);
@@ -1088,13 +1087,11 @@ START_TEST(test_ntru_ke)
        r_ntru->get_my_public_value(r_ntru, &cipher_text);
        ck_assert(cipher_text.len > 0);
 
-       status = r_ntru->get_shared_secret(r_ntru, &r_shared_secret);
-       ck_assert(status == SUCCESS);
+       ck_assert(r_ntru->get_shared_secret(r_ntru, &r_shared_secret));
        ck_assert(r_shared_secret.len > 0);
 
        i_ntru->set_other_public_value(i_ntru, cipher_text);
-       status = i_ntru->get_shared_secret(i_ntru, &i_shared_secret);
-       ck_assert(status == SUCCESS);
+       ck_assert(i_ntru->get_shared_secret(i_ntru, &i_shared_secret));
        ck_assert(chunk_equals(i_shared_secret, r_shared_secret));
 
        chunk_clear(&i_shared_secret);
@@ -1195,7 +1192,7 @@ START_TEST(test_ntru_ciphertext)
                i_ntru = lib->crypto->create_dh(lib->crypto, NTRU_128_BIT);
                i_ntru->get_my_public_value(i_ntru, &pub_key);
                i_ntru->set_other_public_value(i_ntru, test[i]);
-               ck_assert(i_ntru->get_shared_secret(i_ntru, &shared_secret) != SUCCESS);
+               ck_assert(!i_ntru->get_shared_secret(i_ntru, &shared_secret));
                ck_assert(shared_secret.len == 0);
 
                chunk_free(&pub_key);
@@ -1218,7 +1215,7 @@ START_TEST(test_ntru_wrong_ciphertext)
        r_ntru->set_other_public_value(r_ntru, pub_key_m);
        r_ntru->get_my_public_value(r_ntru, &cipher_text);
        i_ntru->set_other_public_value(i_ntru, cipher_text);
-       ck_assert(i_ntru->get_shared_secret(i_ntru, &shared_secret) != SUCCESS);
+       ck_assert(!i_ntru->get_shared_secret(i_ntru, &shared_secret));
        ck_assert(shared_secret.len == 0);
 
        chunk_free(&pub_key_i);

diff --git a/src/libtls/tls_peer.c b/src/libtls/tls_peer.c
index 99bc92ac016024bdfc7a00c83c6d410a235ee0ed..82ec262e4daf2e630c377e3f39a4e853957a84a3 100644 (file)
--- a/src/libtls/tls_peer.c
+++ b/src/libtls/tls_peer.c
@@ -973,7 +973,7 @@ static status_t send_key_exchange_dhe(private_tls_peer_t *this,
 {
        chunk_t premaster, pub;
 
-       if (this->dh->get_shared_secret(this->dh, &premaster) != SUCCESS)
+       if (!this->dh->get_shared_secret(this->dh, &premaster))
        {
                DBG1(DBG_TLS, "calculating premaster from DH failed");
                this->alert->add(this->alert, TLS_FATAL, TLS_INTERNAL_ERROR);

diff --git a/src/libtls/tls_server.c b/src/libtls/tls_server.c
index b6e706d23460e05cdf3d5d5a9b190398d8cbefb6..df5d00ab53131bb5cdc345aaaa8add30e4e9acc8 100644 (file)
--- a/src/libtls/tls_server.c
+++ b/src/libtls/tls_server.c
@@ -495,7 +495,7 @@ static status_t process_key_exchange_dhe(private_tls_server_t *this,
                pub = chunk_skip(pub, 1);
        }
        this->dh->set_other_public_value(this->dh, pub);
-       if (this->dh->get_shared_secret(this->dh, &premaster) != SUCCESS)
+       if (!this->dh->get_shared_secret(this->dh, &premaster))
        {
                DBG1(DBG_TLS, "calculating premaster from DH failed");
                this->alert->add(this->alert, TLS_FATAL, TLS_INTERNAL_ERROR);