Attachment 228679 Details for Bug 257866 – Check for mempcpy

[patch] Check for mempcpy

sssd-mempcpy.diff (text/plain), 2.06 KB, created by Mikhail Teterin on 2021-10-13 20:41:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail Teterin

Created: 2021-10-13 20:41:23 UTC

Size: 2.06 KB

patch

obsolete

>diff --git a/security/sssd/files/patch-configure.ac b/security/sssd/files/patch-configure.ac
>index 26284c2f63..bf41998720 100644
>--- a/security/sssd/files/patch-configure.ac
>+++ b/security/sssd/files/patch-configure.ac
>@@ -1,7 +1,7 @@
> diff --git configure.ac configure.ac
> index 9df463d9c..17d0d9ea7 100644
> --- configure.ac
>-+++ configure.ac
>++++ configure.ac	2021-10-13 16:29:18.263955000 -0400
> @@ -44,8 +44,6 @@ AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes])
>  AC_CHECK_HEADERS(stdint.h dlfcn.h)
>  AC_CONFIG_HEADER(config.h)
>@@ -11,3 +11,19 @@ index 9df463d9c..17d0d9ea7 100644
>  m4_include([src/build_macros.m4])
>  BUILD_WITH_SHARED_BUILD_DIR
>  
>+@@ -62,4 +60,15 @@
>+ 
>+ AM_CONDITIONAL([HAVE_PTHREAD], [test x"$HAVE_PTHREAD" != "x"])
>++
>++AC_COMPILE_IFELSE(
>++    [AC_LANG_PROGRAM([[#include <string.h>]],
>++        [[(void)mempcpy(NULL, NULL, 0);]])],
>++    [AC_DEFINE([HAVE_MEMPCPY], [1], [mempcpy() available])
>++     HAVE_MEMPCPY=1
>++    ],
>++    [AC_MSG_WARN([mempcpy() not found, will use private implementation])])
>++
>++
>++AM_CONDITIONAL([HAVE_MEMPCPY], [test x"$HAVE_MEMPCPY" != "x"])
>+ 
>+ # Check library for the timer_create function
>diff --git a/security/sssd/files/patch-src__util__crypto__nss__nss_sha512crypt.c b/security/sssd/files/patch-src__util__crypto__nss__nss_sha512crypt.c
>index aa1efee665..fbce0c0e29 100644
>--- a/security/sssd/files/patch-src__util__crypto__nss__nss_sha512crypt.c
>+++ b/security/sssd/files/patch-src__util__crypto__nss__nss_sha512crypt.c
>@@ -2,15 +2,17 @@ diff --git src/util/crypto/nss/nss_sha512crypt.c src/util/crypto/nss/nss_sha512c
> index 4d0594d9f..49801222d 100644
> --- src/util/crypto/nss/nss_sha512crypt.c
> +++ src/util/crypto/nss/nss_sha512crypt.c
>-@@ -29,6 +29,12 @@
>+@@ -29,6 +29,14 @@
>  #include <sechash.h>
>  #include <pk11func.h>
>  
>++#ifndef HAVE_MEMPCPY
> +static void *
> +mempcpy (void *dest, const void *src, size_t n)
> +{
> +  return (char *) memcpy (dest, src, n) + n;
> +}
>++#endif /* HAVE_MEMPCPY */
> +
>  /* Define our magic string to mark salt for SHA512 "encryption" replacement. */
>  const char sha512_salt_prefix[] = "$6$";

Flags:

mi: maintainer-approval?

Actions: View | Diff

Attachments on bug 257866: 227226 | 228679 | 228718