diff options
| author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2021-09-04 21:06:04 -0500 |
|---|---|---|
| committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2021-09-04 21:11:19 -0500 |
| commit | a65d2f7cdef55aee89e8fc9984df706eff65538a (patch) | |
| tree | 7885a33735b123b6c57f1d890f25b894f1f00422 /security/gvm-libs/files | |
| parent | games/julius: use system png (diff) | |
security/gvm: update to 21.4.2
The following ports part of security gvm were updated
security/gvmd: Update to 21.4.3
security/gvm-libs: Update to 21.4.2
security/openvas: Update to 21.4.2
security/py-ospd-openvas: Update to 21.4.2
security/py-ospd: Update to 21.4.3
security/greenbone-security-assistant: Update to 21.4.2
- Fix build on FreeBSD 11 [1]
PR: 257653
Reported by: John Hein <jcfyecrayz _ at _ liamekaens.com> [1]
Diffstat (limited to 'security/gvm-libs/files')
| -rw-r--r-- | security/gvm-libs/files/patch-util_passwordbasedauthentication.c | 21 | ||||
| -rw-r--r-- | security/gvm-libs/files/patch-util_passwordbasedauthentication.h | 15 |
2 files changed, 33 insertions, 3 deletions
diff --git a/security/gvm-libs/files/patch-util_passwordbasedauthentication.c b/security/gvm-libs/files/patch-util_passwordbasedauthentication.c index 7f58b15edbae..6838446064ad 100644 --- a/security/gvm-libs/files/patch-util_passwordbasedauthentication.c +++ b/security/gvm-libs/files/patch-util_passwordbasedauthentication.c @@ -1,14 +1,29 @@ ---- util/passwordbasedauthentication.c 2021-07-08 17:07:24.145438000 -0500 -+++ util/passwordbasedauthentication.c 2021-07-08 17:08:24.809605000 -0500 -@@ -26,7 +26,11 @@ +--- util/passwordbasedauthentication.c 2021-08-03 06:50:41.000000000 -0500 ++++ util/passwordbasedauthentication.c 2021-09-04 20:54:26.630524000 -0500 +@@ -26,7 +26,13 @@ // UFC_crypt defines crypt_r when only when __USE_GNU is set // this shouldn't affect other implementations #define __USE_GNU +#if defined(__FreeBSD__) ++#if HAS_CRYPT_R +#include <unistd.h> ++#endif +#else #include <crypt.h> +#endif // INVALID_HASH is used on verify when the given hash is a NULL pointer. // This is done to not directly jump to exit with a INVALID_HASH result // but rather keep calculating to make it a little bit harder to guess +@@ -173,6 +179,7 @@ + return strlen (setting) > 1 && setting[0] == '$'; + } + ++#if HAS_CRYPT_R + char * + pba_hash (struct PBASettings *setting, const char *password) + { +@@ -276,3 +283,4 @@ + free (tmp); + return result; + } ++#endif /* #if HAS_CRYPT_R */ diff --git a/security/gvm-libs/files/patch-util_passwordbasedauthentication.h b/security/gvm-libs/files/patch-util_passwordbasedauthentication.h new file mode 100644 index 000000000000..a6be34361e77 --- /dev/null +++ b/security/gvm-libs/files/patch-util_passwordbasedauthentication.h @@ -0,0 +1,15 @@ +--- util/passwordbasedauthentication.h 2021-09-04 20:50:39.448395000 -0500 ++++ util/passwordbasedauthentication.h 2021-09-04 20:50:57.245603000 -0500 +@@ -18,6 +18,12 @@ + #ifndef _GVM_PASSWORDBASEDAUTHENTICATION_H + #define _GVM_PASSWORDBASEDAUTHENTICATION_H + ++#if defined(__FreeBSD__) && __FreeBSD__ < 12 ++#define HAS_CRYPT_R 0 ++#else ++#define HAS_CRYPT_R 1 ++#endif ++ + /* max amount of applied pepper */ + #define MAX_PEPPER_SIZE 4 + /* is used when count is 0 on init*/ |