Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1512?usp=email
to review the following change.
Change subject: crypto_backend: Improve signature of md_full to avoid
conversions
......................................................................
crypto_backend: Improve signature of md_full to avoid conversions
Change-Id: I201abb9ef013c061fb568823098edcca32cb2df3
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M src/openvpn/crypto_backend.h
M src/openvpn/crypto_mbedtls.c
M src/openvpn/crypto_mbedtls_legacy.c
M src/openvpn/crypto_openssl.c
4 files changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/12/1512/1
diff --git a/src/openvpn/crypto_backend.h b/src/openvpn/crypto_backend.h
index 5248614..7f5507a 100644
--- a/src/openvpn/crypto_backend.h
+++ b/src/openvpn/crypto_backend.h
@@ -557,9 +557,9 @@
* @param src_len The length of the incoming buffer.
* @param dst Buffer to write the message digest to. May not be NULL.
*
- * @return \c 1 on success, \c 0 on failure
+ * @return true on success, false on failure
*/
-int md_full(const char *mdname, const uint8_t *src, int src_len, uint8_t *dst);
+bool md_full(const char *mdname, const uint8_t *src, size_t src_len, uint8_t
*dst);
/*
* Allocate a new message digest context
diff --git a/src/openvpn/crypto_mbedtls.c b/src/openvpn/crypto_mbedtls.c
index 02735cd..cba6bb5 100644
--- a/src/openvpn/crypto_mbedtls.c
+++ b/src/openvpn/crypto_mbedtls.c
@@ -696,13 +696,13 @@
return ctx;
}
-int
-md_full(const char *mdname, const uint8_t *src, int src_len, uint8_t *dst)
+bool
+md_full(const char *mdname, const uint8_t *src, size_t src_len, uint8_t *dst)
{
const md_info_t *md = md_get(mdname);
if (md == NULL || src_len < 0)
{
- return 0;
+ return false;
}
/* We depend on the caller to ensure that dst has enough room for the hash,
@@ -710,12 +710,12 @@
size_t dst_size = PSA_HASH_LENGTH(md->psa_alg);
size_t hash_length = 0;
- psa_status_t status = psa_hash_compute(md->psa_alg, src, (size_t)src_len,
dst, dst_size, &hash_length);
+ psa_status_t status = psa_hash_compute(md->psa_alg, src, src_len, dst,
dst_size, &hash_length);
if (status != PSA_SUCCESS || hash_length != dst_size)
{
- return 0;
+ return false;
}
- return 1;
+ return true;
}
void
diff --git a/src/openvpn/crypto_mbedtls_legacy.c
b/src/openvpn/crypto_mbedtls_legacy.c
index a991349..0dad284 100644
--- a/src/openvpn/crypto_mbedtls_legacy.c
+++ b/src/openvpn/crypto_mbedtls_legacy.c
@@ -835,8 +835,8 @@
*
*/
-int
-md_full(const char *mdname, const uint8_t *src, int src_len, uint8_t *dst)
+bool
+md_full(const char *mdname, const uint8_t *src, size_t src_len, uint8_t *dst)
{
const mbedtls_md_info_t *kt = md_get(mdname);
return 0 == mbedtls_md(kt, src, src_len, dst);
diff --git a/src/openvpn/crypto_openssl.c b/src/openvpn/crypto_openssl.c
index ed39efa..0c6de18 100644
--- a/src/openvpn/crypto_openssl.c
+++ b/src/openvpn/crypto_openssl.c
@@ -1104,15 +1104,15 @@
*
*/
-int
-md_full(const char *mdname, const uint8_t *src, int src_len, uint8_t *dst)
+bool
+md_full(const char *mdname, const uint8_t *src, size_t src_len, uint8_t *dst)
{
unsigned int in_md_len = 0;
evp_md_type *kt = md_get(mdname);
int ret = EVP_Digest(src, src_len, dst, &in_md_len, kt, NULL);
EVP_MD_free(kt);
- return ret;
+ return ret == 1;
}
EVP_MD_CTX *
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1512?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I201abb9ef013c061fb568823098edcca32cb2df3
Gerrit-Change-Number: 1512
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
