Update digest package to 20160304

+ remove unnecessary _POSIX_C_SOURCE definitions

+ fix up explicit_memset usage in sha3.c

+ bump version to 20160304
This commit is contained in:
agc 2016-03-04 23:09:25 +00:00
parent 7f5db266bf
commit 86beaec17e
4 changed files with 14 additions and 18 deletions

View file

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for nbsd-digest 20160216.
# Generated by GNU Autoconf 2.69 for nbsd-digest 20160304.
#
# Report bugs to <agc@netbsd.org>.
#
@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='nbsd-digest'
PACKAGE_TARNAME='nbsd-digest'
PACKAGE_VERSION='20160216'
PACKAGE_STRING='nbsd-digest 20160216'
PACKAGE_VERSION='20160304'
PACKAGE_STRING='nbsd-digest 20160304'
PACKAGE_BUGREPORT='agc@netbsd.org'
PACKAGE_URL=''
@ -1242,7 +1242,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures nbsd-digest 20160216 to adapt to many kinds of systems.
\`configure' configures nbsd-digest 20160304 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1312,7 +1312,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of nbsd-digest 20160216:";;
short | recursive ) echo "Configuration of nbsd-digest 20160304:";;
esac
cat <<\_ACEOF
@ -1392,7 +1392,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
nbsd-digest configure 20160216
nbsd-digest configure 20160304
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1937,7 +1937,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by nbsd-digest $as_me 20160216, which was
It was created by nbsd-digest $as_me 20160304, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -4707,7 +4707,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by nbsd-digest $as_me 20160216, which was
This file was extended by nbsd-digest $as_me 20160304, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -4769,7 +4769,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
nbsd-digest config.status 20160216
nbsd-digest config.status 20160304
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

View file

@ -1,7 +1,7 @@
dnl $Id: configure.ac,v 1.19 2016/03/03 22:11:07 agc Exp $
dnl $Id: configure.ac,v 1.20 2016/03/04 23:09:25 agc Exp $
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
AC_INIT([nbsd-digest],[20160216],[agc@netbsd.org])
AC_INIT([nbsd-digest],[20160304],[agc@netbsd.org])
AC_CONFIG_SRCDIR([digest.c])
AC_CONFIG_HEADER(config.h)
AC_ARG_PROGRAM

View file

@ -24,8 +24,6 @@
* SUCH DAMAGE.
*/
#define _POSIX_C_SOURCE 200809L
#include <stdint.h>
#include "keccak.h"

View file

@ -28,8 +28,6 @@
* SHA-3: FIPS-202, Permutation-Based Hash and Extendable-Ouptut Functions
*/
#define _POSIX_C_SOURCE 200809L
#include <assert.h>
#include <stddef.h>
#include <stdint.h>
@ -43,7 +41,7 @@
void *(*volatile sha3_explicit_memset_impl)(void *, int, size_t) = &memset;
static void *
explicit_memset(void *buf, int c, size_t n)
sha3_explicit_memset(void *buf, int c, size_t n)
{
return (*sha3_explicit_memset_impl)(buf, c, n);
@ -213,7 +211,7 @@ sha3_final(uint8_t *h, unsigned d, struct sha3 *C, unsigned rw)
T >>= 8;
} while (--d);
}
(void)explicit_memset(C->A, 0, sizeof C->A);
(void)sha3_explicit_memset(C->A, 0, sizeof C->A);
C->nb = 0;
}
@ -264,7 +262,7 @@ shake_final(uint8_t *h, unsigned d, struct sha3 *C, unsigned rw)
}
}
(void)explicit_memset(C->A, 0, sizeof C->A);
(void)sha3_explicit_memset(C->A, 0, sizeof C->A);
C->nb = 0;
}