diff mbox

[for-2.9,v2,3/7] configure: add CONFIG_GCRYPT_SUPPORT_HMAC item

Message ID 1481530092-20240-4-git-send-email-longpeng2@huawei.com (mailing list archive)
State New, archived
Headers show

Commit Message

Longpeng(Mike) Dec. 12, 2016, 8:08 a.m. UTC
This item will be used for support libcrypt-backed HMAC algorithms.

Support for hmac has been added in Libgcrypt 1.6.0, but we cannot
use pkg-config to get libcrypt's version. However we can make a
in configure to know whether current libcrypt support hmac.

Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com>
---
 configure | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

Comments

Daniel P. Berrangé Dec. 12, 2016, 10:19 a.m. UTC | #1
On Mon, Dec 12, 2016 at 04:08:08PM +0800, Longpeng(Mike) wrote:
> This item will be used for support libcrypt-backed HMAC algorithms.
> 
> Support for hmac has been added in Libgcrypt 1.6.0, but we cannot
> use pkg-config to get libcrypt's version. However we can make a
> in configure to know whether current libcrypt support hmac.
> 
> Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com>
> ---
>  configure | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/configure b/configure
> index 3770d7c..6eb5f5c 100755
> --- a/configure
> +++ b/configure
> @@ -2417,6 +2417,21 @@ EOF
>          if compile_prog "$gcrypt_cflags" "$gcrypt_libs" ; then
>              gcrypt_kdf=yes
>          fi
> +
> +        cat > $TMPC << EOF
> +#include <gcrypt.h>
> +int main(void) {
> +  gcry_mac_hd_t handle;
> +  gcry_mac_open(&handle, GCRY_MAC_HMAC_MD5,
> +                GCRY_MAC_FLAG_SECURE, NULL);
> +  return 0;
> +}
> +EOF
> +        if compile_prog "$gcrypt_cflags" "$gcrypt_libs" ; then
> +            gcrypy_support_hmac="yes"

Typo,   s/gcrypy/gcrypt/, and repeated a few lines later too

> +        else
> +            gcrypy_support_hmac="no"
> +        fi

For consistency with the KDF probe, just remove the word 'support_'
from this

>      else
>          if test "$gcrypt" = "yes"; then
>              feature_not_found "gcrypt" "Install gcrypt devel"
> @@ -5387,6 +5402,9 @@ if test "$gnutls_rnd" = "yes" ; then
>  fi
>  if test "$gcrypt" = "yes" ; then
>    echo "CONFIG_GCRYPT=y" >> $config_host_mak
> +  if test "gcrypy_support_hmac" = "yes" ; then
> +    echo "CONFIG_GCRYPT_SUPPORT_HMAC=y" >> $config_host_mak
> +  fi

And again  s/support//

>    if test "$gcrypt_kdf" = "yes" ; then
>      echo "CONFIG_GCRYPT_KDF=y" >> $config_host_mak
>    fi
> -- 
> 1.8.3.1
> 
> 

Regards,
Daniel
diff mbox

Patch

diff --git a/configure b/configure
index 3770d7c..6eb5f5c 100755
--- a/configure
+++ b/configure
@@ -2417,6 +2417,21 @@  EOF
         if compile_prog "$gcrypt_cflags" "$gcrypt_libs" ; then
             gcrypt_kdf=yes
         fi
+
+        cat > $TMPC << EOF
+#include <gcrypt.h>
+int main(void) {
+  gcry_mac_hd_t handle;
+  gcry_mac_open(&handle, GCRY_MAC_HMAC_MD5,
+                GCRY_MAC_FLAG_SECURE, NULL);
+  return 0;
+}
+EOF
+        if compile_prog "$gcrypt_cflags" "$gcrypt_libs" ; then
+            gcrypy_support_hmac="yes"
+        else
+            gcrypy_support_hmac="no"
+        fi
     else
         if test "$gcrypt" = "yes"; then
             feature_not_found "gcrypt" "Install gcrypt devel"
@@ -5387,6 +5402,9 @@  if test "$gnutls_rnd" = "yes" ; then
 fi
 if test "$gcrypt" = "yes" ; then
   echo "CONFIG_GCRYPT=y" >> $config_host_mak
+  if test "gcrypy_support_hmac" = "yes" ; then
+    echo "CONFIG_GCRYPT_SUPPORT_HMAC=y" >> $config_host_mak
+  fi
   if test "$gcrypt_kdf" = "yes" ; then
     echo "CONFIG_GCRYPT_KDF=y" >> $config_host_mak
   fi