.gitignore

@@ -43,12 +43,15 @@ core
 /keymap.h
 /parity.h
 /rotors.h
-/ecc-192.h
-/ecc-224.h
-/ecc-256.h
-/ecc-384.h
-/ecc-521.h
-/ecc-25519.h
+/ecc-curve25519.h
+/ecc-curve448.h
+/ecc-gost-gc256b.h
+/ecc-gost-gc512a.h
+/ecc-secp192r1.h
+/ecc-secp224r1.h
+/ecc-secp256r1.h
+/ecc-secp384r1.h
+/ecc-secp521r1.h
 /version.h
 /nettle.aux
 /nettle.cp

.gitlab-ci.yml

 variables:
-  BUILD_IMAGES_PROJECT: gnutls/build-images
-  DEBIAN_CROSS_BUILD: buildenv-debian-cross
-  FEDORA_BUILD: buildenv-f29
-  DEBIAN_X86_CROSS_BUILD: buildenv-debian-x86-cross
+  BUILDENV_NATIVE_IMAGE: gnutls/nettle-build-images:buildenv-native
+  BUILDENV_CLANG_IMAGE: gnutls/nettle-build-images:buildenv-clang
+  BUILDENV_CROSS_IMAGE: gnutls/nettle-build-images:buildenv-cross
   GET_SOURCES_ATTEMPTS: "3"
 
-# remove any pre-installed headers from nettle
-before_script:
- - yum remove -y nettle-devel
-
-# See http://doc.gitlab.com/ce/ci/yaml/ for documentation.
-build/x86-64:
-  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
-  script:
-  - ./.bootstrap &&
-    ./configure --disable-static --enable-fat --disable-documentation && make -j4 &&
-    make check -j4
-  tags:
-  - shared
-  except:
-  - tags
-build/mini-gmp:
-  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
+# "Native" means x86-64; no jobs run on anything else.
+.native-build:
+  image: $CI_REGISTRY/$BUILDENV_NATIVE_IMAGE
   script:
-  - ./.bootstrap &&
-    ./configure --disable-documentation --enable-mini-gmp && make -j4 &&
-    make check -j4
-  tags:
-  - shared
-  except:
-  - tags
-build/c89:
-  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
-  script:
-  - ./.bootstrap &&
-    ./configure CC='gcc -std=c89' --disable-static --disable-assembler --disable-documentation && make -j4 &&
-    make check -j4
-  tags:
-  - shared
-  except:
-  - tags
-build/ndebug:
-  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
-  script:
-  - ./.bootstrap &&
-    ./configure CPPFLAGS='-DNDEBUG' --disable-static --disable-assembler --disable-documentation && make -j4 &&
-    make check -j4
-  tags:
-  - shared
-  except:
-  - tags
-build/ubsan:
-  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
-  script:
-  - ./.bootstrap && 
-    CXXFLAGS="-fsanitize=undefined -fno-sanitize-recover -g -O2" CFLAGS="-fsanitize=undefined -fno-sanitize-recover -g -O2" ./configure 
-    --disable-documentation && make -j4 && make check -j4
-  tags:
-  - shared
-  except:
-  - tags
-build/asan:
-  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
-  script:
-  - ./.bootstrap && 
-  - CXXFLAGS="-fsanitize=address -g -O2" CFLAGS="-fsanitize=address -g -O2" ./configure --disable-documentation &&
-    make -j4 && make check -j4
+  - ./.bootstrap
+  - './configure $EXTRA_CONFIGURE_ARGS --disable-documentation'
+  - 'make -j$(nproc)'
+  - 'make -j$(nproc) check $EXTRA_CHECK_TARGET'
   tags:
-  - shared
+  - saas-linux-small-amd64
   except:
   - tags
+  variables:
+    NETTLE_TEST_SEED: '0'
+  artifacts:
+    expire_in: 1 week
+    when: always
+    paths:
+    - "config.log"
+
+native/fat:
+  extends: .native-build
+  variables:
+    EXTRA_CHECK_TARGET: check-fat-override
+
+native/no-fat:
+  extends: .native-build
+  variables:
+    EXTRA_CONFIGURE_ARGS: '--disable-fat'
+
+native/no-static:
+  extends: .native-build
+  variables:
+    EXTRA_CONFIGURE_ARGS: '--disable-static'
+
+native/no-shared:
+  extends: .native-build
+  variables:
+    EXTRA_CONFIGURE_ARGS: '--disable-static'
+
+native/32-bit:
+  extends: .native-build
+  variables:
+    EXTRA_CONFIGURE_ARGS: '--enable-mini-gmp'
+    CC: 'gcc -m32'
+    CXX: '/bin/false'
+
+native/mini-gmp:
+  extends: .native-build
+  variables:
+    EXTRA_CONFIGURE_ARGS: '--enable-mini-gmp'
+
+native/c89:
+  extends: .native-build
+  variables:
+    EXTRA_CONFIGURE_ARGS: '--disable-assembler'
+    CC: '$CI_PROJECT_DIR/misc/c89'
+
+native/extra-asserts:
+  extends: .native-build
+  variables:
+    EXTRA_CONFIGURE_ARGS: '--enable-extra-asserts'
+
+native/ndebug:
+  extends: .native-build
+  variables:
+    EXTRA_CONFIGURE_ARGS: 'CPPFLAGS=-DNDEBUG --disable-assembler'
+
+native/ubsan:
+  extends: .native-build
+  variables:
+    EXTRA_CONFIGURE_ARGS: '--disable-assembler'
+    CFLAGS: '-fsanitize=undefined -fno-sanitize-recover -g -O2'
+    CXXFLAGS: '-fsanitize=undefined -fno-sanitize-recover -g -O2'
+
+native/asan:
+  extends: .native-build
+  variables:
+    EXTRA_CONFIGURE_ARGS: '--disable-assembler'
+    CFLAGS: '-fsanitize=address -g -O2'
+    CXXFLAGS: '-fsanitize=address -g -O2'
+
 build/static-analyzers:
-  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
+  image: $CI_REGISTRY/$BUILDENV_CLANG_IMAGE
   script:
   - ./.bootstrap
-  - scan-build ./configure --disable-documentation
+  - scan-build ./configure --disable-documentation --disable-assembler
   - scan-build --status-bugs -o scan-build-lib make -j$(nproc)
   tags:
-  - shared
+  - saas-linux-small-amd64
   except:
   - tags
   artifacts:
@@ -85,18 +101,21 @@ build/static-analyzers:
     when: on_failure
     paths:
       - scan-build-lib/*
+
 build/gnutls:
-  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
+  image: $CI_REGISTRY/$BUILDENV_NATIVE_IMAGE
   script:
   - ./.bootstrap &&
-  - ./configure --disable-documentation --prefix=/usr --libdir=/usr/lib64 &&
+    ./configure --disable-documentation --prefix="$(pwd)/local" --libdir="$(pwd)/local/lib" &&
     make -j4 && make install
   - git clone --depth 1 --branch master https://gitlab.com/gnutls/gnutls.git gnutls-git
   - cd gnutls-git && git submodule update --init && ./bootstrap &&
-    ./configure --disable-cxx --disable-guile --disable-doc && make -j$(nproc) &&
-    make -j $(nproc) check
+    ./configure PKG_CONFIG_PATH="$(pwd)/../local/lib/pkgconfig" CPPFLAGS="-I$(pwd)/../local/include"
+      LDFLAGS="-L$(pwd)/../local/lib -Wl,-rpath,$(pwd)/../local/lib"
+      --disable-cxx --disable-guile --without-p11-kit --disable-doc &&
+    make -j$(nproc) && make -j $(nproc) check
   tags:
-  - shared
+  - saas-linux-small-amd64
   except:
   - tags
   artifacts:
@@ -108,46 +127,107 @@ build/gnutls:
       - gnutls-git/*.log
       - gnutls-git/tests/*/*.log
       - gnutls-git/tests/suite/*/*.log
-Debian.cross.x86:
-  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$DEBIAN_X86_CROSS_BUILD
+
+remote/s390x:
+  image: $CI_REGISTRY/$BUILDENV_NATIVE_IMAGE
   before_script:
-  - apt-get remove -y nettle-dev:i386
+  # File created as world-readable by gitlab ci machinery.
+  - chmod 0600 $SSH_PRIVATE_KEY
+  - ssh -o 'StrictHostKeyChecking no' -i "$SSH_PRIVATE_KEY" "$S390X_ACCOUNT"
+    "mkdir -p ci-work/$CI_PIPELINE_IID"
   script:
-  - build=$(dpkg-architecture -qDEB_HOST_GNU_TYPE)
-  - host=i686-linux-gnu
-  - export CC_FOR_BUILD="gcc"
-  - export CC="$host-gcc"
+  - echo $CI_PIPELINE_IID
   - ./.bootstrap &&
-    CFLAGS="-O2 -g" ./configure --build=$build --host=$host --enable-fat --disable-documentation && make -j4 &&
-    make check -j4
+    ./configure && make PACKAGE_VERSION=snapshot dist &&
+      ls -l *.tar.gz
+  - cat nettle-snapshot.tar.gz |
+    ssh -o 'StrictHostKeyChecking no' -i "$SSH_PRIVATE_KEY" "$S390X_ACCOUNT"
+    "cd ci-work/$CI_PIPELINE_IID && tar xzf -"
+  - ssh -o 'StrictHostKeyChecking no' -i "$SSH_PRIVATE_KEY" "$S390X_ACCOUNT"
+    "cd ci-work/$CI_PIPELINE_IID/nettle-snapshot && ./configure --disable-documentation --enable-s390x-msa"
+  - ssh -o 'StrictHostKeyChecking no' -i "$SSH_PRIVATE_KEY" "$S390X_ACCOUNT"
+    "cd ci-work/$CI_PIPELINE_IID/nettle-snapshot && make"
+  - ssh -o 'StrictHostKeyChecking no' -i "$SSH_PRIVATE_KEY" "$S390X_ACCOUNT"
+    "cd ci-work/$CI_PIPELINE_IID/nettle-snapshot && NETTLE_TEST_SEED=0 make check"
+  after_script:
+  - ssh -o 'StrictHostKeyChecking no' -i "$SSH_PRIVATE_KEY" "$S390X_ACCOUNT"
+    "rm -rf ci-work/$CI_PIPELINE_IID"
+  only:
+    variables:
+    - $SSH_PRIVATE_KEY != ""
+    - $S390X_ACCOUNT != ""
   tags:
-  - shared
+  - saas-linux-small-amd64
   except:
   - tags
-.Debian.cross.template: &Debian_cross_template
-  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$DEBIAN_CROSS_BUILD
-  before_script:
-  # remove any previously installed nettle headers to avoid conflicts
-  - for arch in armhf mips arm64;do apt-get remove -y nettle-dev:$arch;done
+
+.cross-build:
+  image: $CI_REGISTRY/$BUILDENV_CROSS_IMAGE
   script:
   - build=$(dpkg-architecture -qDEB_HOST_GNU_TYPE)
-  - host="${CI_JOB_NAME#*.cross.}"
-  # not setting CC_FOR_BUILD paired with qemu-user/binfmt somehow causes
+  - host="${CI_JOB_NAME#cross/}"
+  # Not setting CC_FOR_BUILD paired with qemu-user/binfmt somehow causes
   # config.guess to detect the target as the build platform and not activate
-  # cross-compile mode even though --build is given
+  # cross-compile mode, even though --build is given.
   - export CC_FOR_BUILD="gcc"
   - export CC="$host-gcc"
+  # Disable C++, to not depend on cross g++.
+  - export CXX=/bin/false
   - ./.bootstrap
-  - ./configure --disable-static --enable-fat --disable-documentation --build=$build --host=$host
+  - ./configure --disable-documentation $EXTRA_CONFIGURE_ARGS --build=$build --host=$host
   - make -j$(nproc)
-  - make -j$(nproc) check
+  - make EMULATOR=${EMULATOR} -j$(nproc) check $EXTRA_CHECK_TARGET
   tags:
-  - shared
+  - saas-linux-small-amd64
   except:
   - tags
-Debian.cross.arm-linux-gnueabihf:
-  <<: *Debian_cross_template
-Debian.cross.mips-linux-gnu:
-  <<: *Debian_cross_template
-Debian.cross.aarch64-linux-gnu:
-  <<: *Debian_cross_template
+  variables:
+    NETTLE_TEST_SEED: '0'
+  artifacts:
+    expire_in: 1 week
+    when: always
+    paths:
+    - "config.log"
+
+cross/arm-linux-gnueabihf:
+  extends: .cross-build
+  variables:
+    EMULATOR: qemu-arm
+    EXTRA_CHECK_TARGET: check-fat-override
+
+cross/aarch64-linux-gnu:
+  extends: .cross-build
+  variables:
+    EMULATOR: qemu-aarch64
+    EXTRA_CHECK_TARGET: check-fat-override
+
+# Setting QEMU_LD_PREFIX works around the error "qemu-ppc64: Could not
+# open '/lib64/ld64.so.1".
+cross/powerpc64-linux-gnu:
+  extends: .cross-build
+  variables:
+    EXTRA_CONFIGURE_ARGS: '--enable-mini-gmp' CC='powerpc64-linux-gnu-gcc -mvsx'
+    QEMU_LD_PREFIX: /usr/powerpc64-linux-gnu
+    EXTRA_CHECK_TARGET: check-fat-override check-fat-emulate
+    EMULATOR: qemu-ppc64
+
+cross/powerpc64le-linux-gnu:
+  extends: .cross-build
+  variables:
+    EXTRA_CHECK_TARGET: check-fat-override check-fat-emulate
+    EMULATOR: qemu-ppc64le
+
+# Disable assembly files, because current qemu doesn't support all
+# needed instructions.
+cross/s390x-linux-gnu:
+  extends: .cross-build
+  variables:
+    EXTRA_CONFIGURE_ARGS: '--disable-assembler'
+    EMULATOR: qemu-s390x
+
+cross/sparc64-linux-gnu:
+  extends: .cross-build
+  variables:
+    EXTRA_CONFIGURE_ARGS: '--enable-mini-gmp'
+    QEMU_LD_PREFIX: /usr/sparc64-linux-gnu
+    EMULATOR: qemu-sparc64

AUTHORS

-Please see the Nettle manual.
+Authors of GNU Nettle
+
+The oldest code in Nettle was copied into precursors of the Nettle
+library from other public domain or LGPLv2 sources.
+
+Steve Reid		Original CAST128 implementation
+Dana L. How		Original DES implementation,
+Colin Plumb		Original MD5 implementation
+Peter Gutmann		Original SHA1 implementation
+Andrew Kuchling		Original MD2 implementation
+
+Free Software Foundation
+			Holds copyrights on code ported from
+			libgcrypt, written by Werner Koch and others.
+
+J.H.M. Dassen		Original port of blowfish to GNU lsh, later
+			split off into Nettle. (This blowfish
+			implementation was replaced later).
+			Twofish tests.
+
+Ruud de Rooij		Twofish implementation for GNU lsh, later split off into Nettle.
+
+Rafael Sevilla		AES C and x86 implementation, original port of
+			Serpent, for GNU lsh, later split off into Nettle.
+
+Authors of Nettle (in roughly chronological order of initial contribution)
+
+Niels Möller		Main author.
+
+Dan Egnor		Base64 conversion.
+
+Andreas Sigfridsson	Port of MD2, from Andrew Kuchling's python
+			cryptography toolkit.
+
+Marcus Comstedt		Implemented MD4.
+
+D. J. Bernstein		Salsa20 public domain reference implementation.
+
+Simon Josefsson		Port of Arctwo, from GnuTLS and libgcrypt. New
+			ports of LGPL Serpent and Blowfish code, from
+			libgcrypt. Port of Salsa20, based on djb's
+			reference. Implementation of PBKDF2 (RFC
+			2898) and drbg-ctr.
+
+Henrik Grubbström	AES assembly for Sparc64.
+
+Magnus Holmgren		Conversion of DSA keys from DER format to SEXP
+			format.
+
+Daniel Kahn Gillmor	Added the lists for nettle_get_ciphers,
+			nettle_get_hashes and nettle_get_armors. Test
+			vectors for hashes and hmac.
+
+Nippon Telegraph and Telephone Corporation
+			LGPL:ed reference implementation of the
+			Camellia cipher.
+
+Andrew M. (floodyberry)
+			The poly1305 code nettle's C implementation is
+			derived from.
+
+Aleksey Kravchenko	The gosthash94 implementation in rhash library.
+
+Stefan Metzmacher, Jeremy Allison, Michael Adam
+			Contributed to the CMAC code, which was added
+			to Nettle by Nikos Mavroyanopoulos.
+
+Nikos Mavroyanopoulos	GCM implementation, RSA blinding code,
+			interface for general rsa-pkcs1 signatures.
+			Port of gosthash94 implementation from rhash. Port of
+			poly1305. Salsa20r12 variant. HKDF (RFC 5869)
+			implementation. CMAC and SIV-CMAV
+			implementation. CTR and GCM optimizations.
+			Implementation of versioned symbols. Setup of
+			.gitlab-ci.yml. Large number of smaller fixes.
+
+Andres Mejia		Ported Ripemd160 from libgcrypt.
+
+Martin Storsjö		Implemented m4 macrology to make x86_64
+			assembly files work with the windows ABI.
+			Several other portability improvements.
+
+Jeronimo Pellegrini	Documentation for base16 and base64 functions.
+
+Tim Ruehsen		Several smaller cleanups and bugfixes.
+
+Fredrik Thulin		Test vectors for pbkdf2-hmac-sha512.
+
+Joachim Strömbergson	Chacha implementation. Support for sha512_224
+			and sha512_256.
+
+Owen Kirby		Implementation of CCM mode.
+
+Amos Jeffries		Implementation of base64url encoding.
+
+Daiki Ueno		Implementation of RSA-PSS signatures,
+			curve448, SHA3 shake, ed448-shake256 signatures,
+			chacha functions for 32-bit nonce, struct
+			nettle_mac interface, siv-gcm, RSA-OAEP.
+
+Dmitry Baryshkov	CFB and CFB8 modes, CMAC64. gosthash94cp and
+			Streebog hash functions, GOST DSA signatures
+			and curves GC256B and GC512A. Various bug
+			fixes and cleanups.
+
+Simo Sorce		Side-channel silent RSA functions. XTS
+			implementation.
+
+H.J. Lu			Assembly annotations for Intel "Control-flow
+			Enforcement Technology".
+
+Stephen R. van den Berg
+			Port of bcrypt.
+
+Mamone Tarsha Kurdi	Powerpc64 assembly and fat build setup,
+			including AES, GCM and poly1305. Arm64 assembly and fat
+			build setup, including AES, Chacha, GCM, SHA1,
+			SHA256. S390x assembly and fat build setup,
+			including AES, Chacha, memxor, memxor3, SHA1,
+			SHA256, SHA512, SHA3.
+
+Nicolas Mora		RFC 3394 keywrap, RSA-OAEP.
+
+Tianjia Zhang		SM3 hash function, SM4 block cipher.
+
+Amitay Isaacs		Powerpc64 assembly for secp192r1, secp224r1
+			and secp256r1.
+
+Martin Schwenke		Powerpc64 assembly for secp384r1, secp521r1,
+			curve25519 and curve448.
+
+Zoltan Fridrich		Balloon password hashing.
+
+Danny Tsen		Powerpc64 assembly for combined GCM-AES.
+
+Eric Richter		Powerpc64 sha256 assembly.

README

@@ -30,7 +30,9 @@ information on how these licenses apply).
 
 If you have downloaded a Nettle release, build it with the usual
 ./configure && make && make check && make install (see the INSTALL
-file for further instructions).
+file for further instructions). Using GNU make is strongly
+recommended. Nettle's support for public key algorithms, such as RSA
+and ECDSA, depends on the GNU GMP library.
 
 You can also get Nettle from git, see
 http://www.lysator.liu.se/~nisse/nettle/ for current instructions. In
@@ -40,7 +42,7 @@ before running ./configure.
 Read the manual. Mail me if you have any questions or suggestions.
 
 You may want to subscribe to the nettle-bugs mailing list. See
-<URL: http://lists.lysator.liu.se/mailman/listinfo/nettle-bugs>.
+<URL: https://lists.lysator.liu.se/mailman3/postorius/lists/nettle-bugs.lists.lysator.liu.se/>.
 
 See CONTRIBUTING.md for information on contibuting patches.
 

aclocal.m4

-dnl Try to detect the type of the third arg to getsockname() et al
-AC_DEFUN([LSH_TYPE_SOCKLEN_T],
-[AH_TEMPLATE([socklen_t], [Length type used by getsockopt])
-AC_CACHE_CHECK([for socklen_t in sys/socket.h], ac_cv_type_socklen_t,
-[AC_EGREP_HEADER(socklen_t, sys/socket.h,
-  [ac_cv_type_socklen_t=yes], [ac_cv_type_socklen_t=no])])
-if test $ac_cv_type_socklen_t = no; then
-        AC_MSG_CHECKING(for AIX)
-        AC_EGREP_CPP(yes, [
-#ifdef _AIX
- yes
-#endif
-],[
-AC_MSG_RESULT(yes)
-AC_DEFINE(socklen_t, size_t)
-],[
-AC_MSG_RESULT(no)
-AC_DEFINE(socklen_t, int)
-])
-fi
-])
-
 dnl Choose cc flags for compiling position independent code
-dnl FIXME: Doesn't do the right thing when crosscompiling.
 AC_DEFUN([LSH_CCPIC],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_MSG_CHECKING(CCPIC)
@@ -32,6 +9,7 @@ AC_CACHE_VAL(lsh_cv_sys_ccpic,[
 	bsdi4.*)	CCPIC="-fPIC" ;;
 	bsdi*)		CCPIC="" ;;
 	darwin*)	CCPIC="-fPIC" ;;
+	freebsd*|netbsd*|openbsd*)	CCPIC="-fPIC" ;;
 	# Could also use -fpic, depending on the number of symbol references
 	solaris*)	CCPIC="-fPIC" ;;
 	cygwin*)	CCPIC="" ;;
@@ -43,7 +21,7 @@ AC_CACHE_VAL(lsh_cv_sys_ccpic,[
 	darwin*)	CCPIC="-fPIC" ;;
         irix*)		CCPIC="-share" ;;
 	hpux*)		CCPIC="+z"; ;;
-	*freebsd*)	CCPIC="-fpic" ;;
+	freebsd*|netbsd*|openbsd*)	CCPIC="-fPIC" ;;
 	sco*|sysv4.*)	CCPIC="-KPIC -dy -Bdynamic" ;;
 	solaris*)	CCPIC="-KPIC -Bdynamic" ;;
 	winnt*)		CCPIC="-shared" ;;
@@ -53,8 +31,8 @@ AC_CACHE_VAL(lsh_cv_sys_ccpic,[
   fi
   OLD_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $CCPIC"
-  AC_TRY_COMPILE([], [exit(0);],
-    lsh_cv_sys_ccpic="$CCPIC", lsh_cv_sys_ccpic='')
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],
+    [lsh_cv_sys_ccpic="$CCPIC"], [lsh_cv_sys_ccpic=''])
   CFLAGS="$OLD_CFLAGS"
 ])
 CCPIC="$lsh_cv_sys_ccpic"
@@ -135,8 +113,8 @@ dnl LSH_RPATH_FIX
 AC_DEFUN([LSH_RPATH_FIX],
 [if test $cross_compiling = no -a "x$RPATHFLAG" != x ; then
   ac_success=no
-  AC_TRY_RUN([int main(int argc, char **argv) { return 0; }],
-    ac_success=yes, ac_success=no, :)
+  AC_RUN_IFELSE([AC_LANG_SOURCE([[int main(int argc, char **argv) { return 0; }]])],
+    [ac_success=yes], [ac_success=no], [:])
   
   if test $ac_success = no ; then
     AC_MSG_CHECKING([Running simple test program failed. Trying -R flags])
@@ -149,12 +127,12 @@ dnl echo RPATH_CANDIDATE_DIRS = $RPATH_CANDIDATE_DIRS
       else
   	LDFLAGS="$RPATHFLAG$d $LDFLAGS"
 dnl echo LDFLAGS = $LDFLAGS
-  	AC_TRY_RUN([int main(int argc, char **argv) { return 0; }],
-  	  [ac_success=yes
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[int main(int argc, char **argv) { return 0; }]])],
+	  [ac_success=yes
   	  ac_rpath_save_LDFLAGS="$LDFLAGS"
-  	  AC_MSG_RESULT([adding $RPATHFLAG$d])
-  	  ],
-  	  [ac_remaining_dirs="$ac_remaining_dirs $d"], :)
+	  AC_MSG_RESULT([adding $RPATHFLAG$d])
+	  ],
+	  [ac_remaining_dirs="$ac_remaining_dirs $d"], [:])
   	LDFLAGS="$ac_rpath_save_LDFLAGS"
       fi
     done
@@ -166,153 +144,13 @@ dnl echo LDFLAGS = $LDFLAGS
 fi
 ])
 
-dnl Like AC_CHECK_LIB, but uses $KRB_LIBS rather than $LIBS.
-dnl LSH_CHECK_KRB_LIB(LIBRARY, FUNCTION, [, ACTION-IF-FOUND [,
-dnl                  ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]])
-
-AC_DEFUN([LSH_CHECK_KRB_LIB],
-[AC_CHECK_LIB([$1], [$2],
-  ifelse([$3], ,
-      [[ac_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-     	    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-        AC_DEFINE_UNQUOTED($ac_tr_lib)
-        KRB_LIBS="-l$1 $KRB_LIBS"
-      ]], [$3]),
-  ifelse([$4], , , [$4
-])dnl
-, [$5 $KRB_LIBS])
-])
-
-dnl LSH_LIB_ARGP(ACTION-IF-OK, ACTION-IF-BAD)
-AC_DEFUN([LSH_LIB_ARGP],
-[ ac_argp_save_LIBS="$LIBS"
-  ac_argp_save_LDFLAGS="$LDFLAGS"
-  ac_argp_ok=no
-  # First check if we can link with argp.
-  AC_SEARCH_LIBS(argp_parse, argp,
-  [ LSH_RPATH_FIX
-    AC_CACHE_CHECK([for working argp],
-      lsh_cv_lib_argp_works,
-      [ AC_TRY_RUN(
-[#include <argp.h>
-#include <stdlib.h>
-
-static const struct argp_option
-options[] =
-{
-  { NULL, 0, NULL, 0, NULL, 0 }
-};
-
-struct child_state
-{
-  int n;
-};
-
-static error_t
-child_parser(int key, char *arg, struct argp_state *state)
-{
-  struct child_state *input = (struct child_state *) state->input;
-  
-  switch(key)
-    {
-    default:
-      return ARGP_ERR_UNKNOWN;
-    case ARGP_KEY_END:
-      if (!input->n)
-	input->n = 1;
-      break;
-    }
-  return 0;
-}
-
-const struct argp child_argp =
-{
-  options,
-  child_parser,
-  NULL, NULL, NULL, NULL, NULL
-};
-
-struct main_state
-{
-  struct child_state child;
-  int m;
-};
-
-static error_t
-main_parser(int key, char *arg, struct argp_state *state)
-{
-  struct main_state *input = (struct main_state *) state->input;
-
-  switch(key)
-    {
-    default:
-      return ARGP_ERR_UNKNOWN;
-    case ARGP_KEY_INIT:
-      state->child_inputs[0] = &input->child;
-      break;
-    case ARGP_KEY_END:
-      if (!input->m)
-	input->m = input->child.n;
-      
-      break;
-    }
-  return 0;
-}
-
-static const struct argp_child
-main_children[] =
-{
-  { &child_argp, 0, "", 0 },
-  { NULL, 0, NULL, 0}
-};
-
-static const struct argp
-main_argp =
-{ options, main_parser, 
-  NULL,
-  NULL,
-  main_children,
-  NULL, NULL
-};
-
-int main(int argc, char **argv)
-{
-  struct main_state input = { { 0 }, 0 };
-  char *v[2] = { "foo", NULL };
-
-  argp_parse(&main_argp, 1, v, 0, NULL, &input);
-
-  if ( (input.m == 1) && (input.child.n == 1) )
-    return 0;
-  else
-    return 1;
-}
-], lsh_cv_lib_argp_works=yes,
-   lsh_cv_lib_argp_works=no,
-   lsh_cv_lib_argp_works=no)])
-
-  if test x$lsh_cv_lib_argp_works = xyes ; then
-    ac_argp_ok=yes
-  else
-    # Reset link flags
-    LIBS="$ac_argp_save_LIBS"
-    LDFLAGS="$ac_argp_save_LDFLAGS"
-  fi])
-
-  if test x$ac_argp_ok = xyes ; then
-    ifelse([$1],, true, [$1])
-  else
-    ifelse([$2],, true, [$2])
-  fi   
-])
-
 dnl LSH_GCC_ATTRIBUTES
 dnl Check for gcc's __attribute__ construction
 
 AC_DEFUN([LSH_GCC_ATTRIBUTES],
 [AC_CACHE_CHECK(for __attribute__,
 	       lsh_cv_c_attribute,
-[ AC_TRY_COMPILE([
+[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <stdlib.h>
 
 static void foo(void) __attribute__ ((noreturn));
@@ -322,9 +160,9 @@ foo(void)
 {
   exit(1);
 }
-],[],
-lsh_cv_c_attribute=yes,
-lsh_cv_c_attribute=no)])
+]], [[]])],
+  [lsh_cv_c_attribute=yes],
+  [lsh_cv_c_attribute=no])])
 
 AH_TEMPLATE([HAVE_GCC_ATTRIBUTE], [Define if the compiler understands __attribute__])
 if test "x$lsh_cv_c_attribute" = "xyes"; then
@@ -377,50 +215,6 @@ char *alloca ();
 #endif
 ])])
 
-AC_DEFUN([LSH_FUNC_STRERROR],
-[AC_CHECK_FUNCS(strerror)
-AH_BOTTOM(
-[#if HAVE_STRERROR
-#define STRERROR strerror
-#else
-#define STRERROR(x) (sys_errlist[x])
-#endif
-])])
-
-AC_DEFUN([LSH_FUNC_STRSIGNAL],
-[AC_CHECK_FUNCS(strsignal)
-AC_CHECK_DECLS([sys_siglist, _sys_siglist])
-AH_BOTTOM(
-[#if HAVE_STRSIGNAL
-# define STRSIGNAL strsignal
-#else /* !HAVE_STRSIGNAL */
-# if HAVE_DECL_SYS_SIGLIST
-#  define STRSIGNAL(x) (sys_siglist[x])
-# else
-#  if HAVE_DECL__SYS_SIGLIST
-#   define STRSIGNAL(x) (_sys_siglist[x])
-#  else
-#   define STRSIGNAL(x) "Unknown signal"
-#   if __GNUC__
-#    warning Using dummy STRSIGNAL
-#   endif
-#  endif
-# endif
-#endif /* !HAVE_STRSIGNAL */
-])])
-
-dnl LSH_MAKE_CONDITIONAL(symbol, test)
-AC_DEFUN([LSH_MAKE_CONDITIONAL],
-[if $2 ; then
-  IF_$1=''
-  UNLESS_$1='# '
-else
-  IF_$1='# '
-  UNLESS_$1=''
-fi 
-AC_SUBST(IF_$1)
-AC_SUBST(UNLESS_$1)])
-
 dnl LSH_DEPENDENCY_TRACKING
 
 dnl Defines compiler flags DEP_FLAGS to generate dependency
@@ -431,8 +225,7 @@ dnl themselves are not treated as targets.
 
 AC_DEFUN([LSH_DEPENDENCY_TRACKING],
 [AC_ARG_ENABLE(dependency_tracking,
-  AC_HELP_STRING([--disable-dependency-tracking],
-    [Disable dependency tracking. Dependency tracking doesn't work with BSD make]),,
+  AS_HELP_STRING([--disable-dependency-tracking], [Disable dependency tracking. Dependency tracking doesn't work with BSD make]),,
   [enable_dependency_tracking=yes])
 
 DEP_FLAGS=''
@@ -456,13 +249,6 @@ if test x$enable_dependency_tracking = xyes ; then
   fi
 fi
 
-if test x$enable_dependency_tracking = xyes ; then
-  DEP_INCLUDE='include '
-else
-  DEP_INCLUDE='# '
-fi
-
-AC_SUBST([DEP_INCLUDE])
 AC_SUBST([DEP_FLAGS])
 AC_SUBST([DEP_PROCESS])])
 
@@ -475,21 +261,21 @@ dnl  conftest.o and conftest.out are available for inspection in
 dnl  "action-success".  If either action does a "break" out of a loop then
 dnl  an explicit "rm -f conftest*" will be necessary.
 dnl
-dnl  This is not unlike AC_TRY_COMPILE, but there's no default includes or
+dnl  This is not unlike AC_COMPILE_IFELSE, but there's no default includes or
 dnl  anything in "asm-code", everything wanted must be given explicitly.
 
 AC_DEFUN([GMP_TRY_ASSEMBLE],
 [cat >conftest.s <<EOF
 [$1]
 EOF
-gmp_assemble="$CC $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1"
+gmp_assemble="$CC $CFLAGS $CPPFLAGS $ASM_FLAGS -c conftest.s >conftest.out 2>&1"
 if AC_TRY_EVAL(gmp_assemble); then
-  cat conftest.out >&AC_FD_CC
+  cat conftest.out >&AS_MESSAGE_LOG_FD
   ifelse([$2],,:,[$2])
 else
-  cat conftest.out >&AC_FD_CC
-  echo "configure: failed program was:" >&AC_FD_CC
-  cat conftest.s >&AC_FD_CC
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
+  cat conftest.s >&AS_MESSAGE_LOG_FD
   ifelse([$3],,:,[$3])
 fi
 rm -f conftest*
@@ -550,13 +336,13 @@ cat >conftest.c <<EOF
 int
 main ()
 {
-  exit(0);
+  return 0;
 }
 EOF
 gmp_compile="$1 conftest.c"
 cc_for_build_works=no
 if AC_TRY_EVAL(gmp_compile); then
-  if (./a.out || ./b.out || ./a.exe || ./a_out.exe || ./conftest) >&AC_FD_CC 2>&1; then
+  if (./a.out || ./b.out || ./a.exe || ./a_out.exe || ./conftest) >&AS_MESSAGE_LOG_FD 2>&1; then
     cc_for_build_works=yes
   fi
 fi
@@ -591,13 +377,13 @@ else
 int
 main ()
 {
-  exit (0);
+  return 0;
 }
 EOF
   for i in .exe ,ff8 ""; do
     gmp_compile="$CC_FOR_BUILD conftest.c -o conftest$i"
     if AC_TRY_EVAL(gmp_compile); then
-      if (./conftest) 2>&AC_FD_CC; then
+      if (./conftest) 2>&AS_MESSAGE_LOG_FD; then
         gmp_cv_prog_exeext_for_build=$i
         break
       fi
@@ -736,3 +522,52 @@ EOF
 	AC_SUBST(EXTRA_HOGWEED_LINKER_FLAGS)
   fi
 ])
+
+dnl  GMP_ASM_POWERPC_R_REGISTERS
+dnl  ---------------------------
+dnl  Determine whether the assembler takes powerpc registers with an "r" as
+dnl  in "r6", or as plain "6".  The latter is standard, but NeXT, Rhapsody,
+dnl  and MacOS-X require the "r" forms.
+dnl
+dnl  See also powerpc64/machine.m4 which uses the result of this
+dnl  test.
+
+AC_DEFUN([GMP_ASM_POWERPC_R_REGISTERS],
+[AC_CACHE_CHECK([if the assembler needs r on registers],
+               gmp_cv_asm_powerpc_r_registers,
+[GMP_TRY_ASSEMBLE(
+[	$gmp_cv_asm_text
+	mtctr	r6],
+[gmp_cv_asm_powerpc_r_registers=yes],
+[GMP_TRY_ASSEMBLE(
+[	.text
+	mtctr	6],
+[gmp_cv_asm_powerpc_r_registers=no],
+[AC_MSG_ERROR([neither "mtctr 6" nor "mtctr r6" works])])])])
+ASM_PPC_WANT_R_REGISTERS="$gmp_cv_asm_powerpc_r_registers"
+])
+
+# Check if valgrind supports the platform we are compiling for.
+AC_DEFUN([NETTLE_PROG_VALGRIND],
+[AC_CACHE_CHECK([if valgrind is working],
+  nettle_cv_prog_valgrind,
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [
+    # Valgrind is known to work poorly and sometimes hang indefinitely
+    # on executables built with gcc's leak-sanitizer and
+    # address-sanitizer, and with clang's memory sanitizer. Attempt to
+    # work around. See https://bugs.kde.org/show_bug.cgi?id=492255
+    if "$NM" ./conftest$EXEEXT 2>&AS_MESSAGE_LOG_FD |
+       grep '_lsan_\|_msan_\|_asan_' >/dev/null; then
+      nettle_cv_prog_valgrind=no
+    elif valgrind -q ./conftest$EXEEXT 2>&AS_MESSAGE_LOG_FD; then
+      nettle_cv_prog_valgrind=yes
+    else
+      nettle_cv_prog_valgrind=no
+    fi], [nettle_cv_prog_valgrind=no])])
+  if test "$nettle_cv_prog_valgrind" = yes ; then
+    IF_VALGRIND=''
+  else
+    IF_VALGRIND='#'
+  fi
+  AC_SUBST(IF_VALGRIND)
+])

aes-decrypt-internal.c

@@ -40,6 +40,16 @@
 #include "aes-internal.h"
 #include "macros.h"
 
+/* For fat builds */
+#if HAVE_NATIVE_aes_decrypt
+void
+_nettle_aes_decrypt_c(unsigned rounds, const uint32_t *keys,
+    const struct aes_table *T,
+    size_t length, uint8_t *dst,
+    const uint8_t *src);
+#define _nettle_aes_decrypt _nettle_aes_decrypt_c
+#endif
+
 void
 _nettle_aes_decrypt(unsigned rounds, const uint32_t *keys,
 		    const struct aes_table *T,
@@ -50,6 +60,7 @@ _nettle_aes_decrypt(unsigned rounds, const uint32_t *keys,
     {
       uint32_t w0, w1, w2, w3;		/* working ciphertext */
       uint32_t t0, t1, t2, t3;
+      const uint32_t *p;
       unsigned i;
       
       /* Get clear text, using little-endian byte order.
@@ -60,12 +71,12 @@ _nettle_aes_decrypt(unsigned rounds, const uint32_t *keys,
       w2 = LE_READ_UINT32(src + 8)  ^ keys[2];
       w3 = LE_READ_UINT32(src + 12) ^ keys[3];
 
-      for (i = 1; i < rounds; i++)
+      for (i = 1, p = keys - 4; i < rounds; i++, p -= 4)
 	{
-	  t0 = AES_ROUND(T, w0, w3, w2, w1, keys[4*i]);
-	  t1 = AES_ROUND(T, w1, w0, w3, w2, keys[4*i + 1]);
-	  t2 = AES_ROUND(T, w2, w1, w0, w3, keys[4*i + 2]);
-	  t3 = AES_ROUND(T, w3, w2, w1, w0, keys[4*i + 3]);
+	  t0 = AES_ROUND(T, w0, w3, w2, w1, p[0]);
+	  t1 = AES_ROUND(T, w1, w0, w3, w2, p[1]);
+	  t2 = AES_ROUND(T, w2, w1, w0, w3, p[2]);
+	  t3 = AES_ROUND(T, w3, w2, w1, w0, p[3]);
 
 	  /* We could unroll the loop twice, to avoid these
 	     assignments. If all eight variables fit in registers,
@@ -78,10 +89,10 @@ _nettle_aes_decrypt(unsigned rounds, const uint32_t *keys,
 
       /* Final round */
 
-      t0 = AES_FINAL_ROUND(T, w0, w3, w2, w1, keys[4*i]);
-      t1 = AES_FINAL_ROUND(T, w1, w0, w3, w2, keys[4*i + 1]);
-      t2 = AES_FINAL_ROUND(T, w2, w1, w0, w3, keys[4*i + 2]);
-      t3 = AES_FINAL_ROUND(T, w3, w2, w1, w0, keys[4*i + 3]);
+      t0 = AES_FINAL_ROUND(T, w0, w3, w2, w1, p[0]);
+      t1 = AES_FINAL_ROUND(T, w1, w0, w3, w2, p[1]);
+      t2 = AES_FINAL_ROUND(T, w2, w1, w0, w3, p[2]);
+      t3 = AES_FINAL_ROUND(T, w3, w2, w1, w0, p[3]);
 
       LE_WRITE_UINT32(dst, t0);
       LE_WRITE_UINT32(dst + 4, t1);

aes-decrypt.c → aes-decrypt-table.c

-/* aes-decrypt.c
+/* aes-decrypt-table.c
 
    Decryption function for aes/rijndael block cipher.
 
@@ -35,13 +35,12 @@
 # include "config.h"
 #endif
 
-#include <assert.h>
 #include <stdlib.h>
 
 #include "aes-internal.h"
 
-static const struct aes_table
-_aes_decrypt_table =
+const struct aes_table
+_nettle_aes_decrypt_table =
   { /* isbox */
     {
       0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38,
@@ -78,7 +77,7 @@ _aes_decrypt_table =
       0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d,
     },
     { /* itable */
-      { 
+      {
 	0x50a7f451,0x5365417e,0xc3a4171a,0x965e273a,
 	0xcb6bab3b,0xf1459d1f,0xab58faac,0x9303e34b,
 	0x55fa3020,0xf66d76ad,0x9176cc88,0x254c02f5,
@@ -341,56 +340,6 @@ _aes_decrypt_table =
 	0x397101a8,0x08deb30c,0xd89ce4b4,0x6490c156,
 	0x7b6184cb,0xd570b632,0x48745c6c,0xd04257b8,
       },
-#endif /* !AES_SMALL */  
+#endif /* !AES_SMALL */
     }
   };
-
-void
-aes_decrypt(const struct aes_ctx *ctx,
-	    size_t length, uint8_t *dst,
-	    const uint8_t *src)
-{
-  switch (ctx->key_size)
-    {
-    default: abort();
-    case AES128_KEY_SIZE:
-      aes128_decrypt(&ctx->u.ctx128, length, dst, src);
-      break;
-    case AES192_KEY_SIZE:
-      aes192_decrypt(&ctx->u.ctx192, length, dst, src);
-      break;
-    case AES256_KEY_SIZE:
-      aes256_decrypt(&ctx->u.ctx256, length, dst, src);
-      break;
-    }
-}
-
-void
-aes128_decrypt(const struct aes128_ctx *ctx,
-	       size_t length, uint8_t *dst,
-	       const uint8_t *src)
-{
-  assert(!(length % AES_BLOCK_SIZE) );
-  _aes_decrypt(_AES128_ROUNDS, ctx->keys, &_aes_decrypt_table,
-	       length, dst, src);
-}
-
-void
-aes192_decrypt(const struct aes192_ctx *ctx,
-	       size_t length, uint8_t *dst,
-	       const uint8_t *src)
-{
-  assert(!(length % AES_BLOCK_SIZE) );
-  _aes_decrypt(_AES192_ROUNDS, ctx->keys, &_aes_decrypt_table,
-	       length, dst, src);
-}
-
-void
-aes256_decrypt(const struct aes256_ctx *ctx,
-	       size_t length, uint8_t *dst,
-	       const uint8_t *src)
-{
-  assert(!(length % AES_BLOCK_SIZE) );
-  _aes_decrypt(_AES256_ROUNDS, ctx->keys, &_aes_decrypt_table,
-	       length, dst, src);
-}

aes-encrypt-table.c

@@ -49,7 +49,7 @@
  * consistent with the row numbering. */
 
 const struct aes_table
-_aes_encrypt_table =
+_nettle_aes_encrypt_table =
   { /* sbox */
     {
       0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5,