mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 21:40:12 +00:00
5a82c74822
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
89 lines
2.4 KiB
C
89 lines
2.4 KiB
C
/* Test program for bad DES salt detection in crypt.
|
|
Copyright (C) 2012-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include <stdio.h>
|
|
#include <unistd.h>
|
|
#include <sys/mman.h>
|
|
#include <crypt.h>
|
|
|
|
static const char *tests[][2] =
|
|
{
|
|
{ "no salt", "" },
|
|
{ "single char", "/" },
|
|
{ "first char bad", "!x" },
|
|
{ "second char bad", "Z%" },
|
|
{ "both chars bad", ":@" },
|
|
{ "un$upported algorithm", "$2$" },
|
|
{ "unsupported_algorithm", "_1" },
|
|
{ "end of page", NULL }
|
|
};
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
int result = 0;
|
|
struct crypt_data cd;
|
|
size_t n = sizeof (tests) / sizeof (*tests);
|
|
size_t pagesize = (size_t) sysconf (_SC_PAGESIZE);
|
|
char *page;
|
|
|
|
/* Check that crypt won't look at the second character if the first
|
|
one is invalid. */
|
|
page = mmap (NULL, pagesize * 2, PROT_READ | PROT_WRITE,
|
|
MAP_PRIVATE | MAP_ANON, -1, 0);
|
|
if (page == MAP_FAILED)
|
|
{
|
|
perror ("mmap");
|
|
n--;
|
|
}
|
|
else
|
|
{
|
|
if (mmap (page + pagesize, pagesize, 0,
|
|
MAP_PRIVATE | MAP_ANON | MAP_FIXED,
|
|
-1, 0) != page + pagesize)
|
|
perror ("mmap 2");
|
|
page[pagesize - 1] = '*';
|
|
tests[n - 1][1] = &page[pagesize - 1];
|
|
}
|
|
|
|
/* Mark cd as initialized before first call to crypt_r. */
|
|
cd.initialized = 0;
|
|
|
|
for (size_t i = 0; i < n; i++)
|
|
{
|
|
if (crypt (tests[i][0], tests[i][1]))
|
|
{
|
|
result++;
|
|
printf ("%s: crypt returned non-NULL with salt \"%s\"\n",
|
|
tests[i][0], tests[i][1]);
|
|
}
|
|
|
|
if (crypt_r (tests[i][0], tests[i][1], &cd))
|
|
{
|
|
result++;
|
|
printf ("%s: crypt_r returned non-NULL with salt \"%s\"\n",
|
|
tests[i][0], tests[i][1]);
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
#define TEST_FUNCTION do_test ()
|
|
#include "../test-skeleton.c"
|