diff --git a/vendor/README b/vendor/README index 7ca85751..5c4947b2 100644 --- a/vendor/README +++ b/vendor/README @@ -1,4 +1,4 @@ This directory contains external projects, taken from the following locations: scrypt: http://www.tarsnap.com/scrypt.html googletest: https://github.com/google/googletest/tree/release-1.8.0 -spdlog: https://github.com/gabime/spdlog/tree/v0.12.0/include/spdlog +spdlog: https://github.com/gabime/spdlog/tree/v0.13.0/include/spdlog diff --git a/vendor/scrypt/CMakeLists.txt b/vendor/scrypt/CMakeLists.txt index fdd6826f..3f57ecdb 100644 --- a/vendor/scrypt/CMakeLists.txt +++ b/vendor/scrypt/CMakeLists.txt @@ -13,33 +13,33 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ExternalProject_Add(scrypt_original - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.0/scrypt - CONFIGURE_COMMAND /usr/bin/env CC=${CMAKE_C_COMPILER} CFLAGS=${SCRYPT_CFLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.0/scrypt/configure --prefix=${CMAKE_BINARY_DIR}/vendor/scrypt/ + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.1/scrypt + CONFIGURE_COMMAND /usr/bin/env CC=${CMAKE_C_COMPILER} CFLAGS=${SCRYPT_CFLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.1/scrypt/configure --prefix=${CMAKE_BINARY_DIR}/vendor/scrypt/ PREFIX ${CMAKE_BINARY_DIR}/vendor/scrypt/ BUILD_COMMAND ${MAKE} ) add_library(${PROJECT_NAME} STATIC - ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt.c - ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt_smix.c - ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.0/scrypt/libcperciva/util/warnp.c - ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.0/scrypt/libcperciva/util/insecure_memzero.c - ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.0/scrypt/libcperciva/alg/sha256.c - ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.0/scrypt/libcperciva/cpusupport/cpusupport_x86_aesni.c - ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.0/scrypt/libcperciva/cpusupport/cpusupport_x86_sse2.c + ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt.c + ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt_smix.c + ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.1/scrypt/libcperciva/util/warnp.c + ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.1/scrypt/libcperciva/util/insecure_memzero.c + ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.1/scrypt/libcperciva/alg/sha256.c + ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.1/scrypt/libcperciva/cpusupport/cpusupport_x86_aesni.c + ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.1/scrypt/libcperciva/cpusupport/cpusupport_x86_sse2.c ) target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR}/src/scrypt_original-build/libscrypt_sse2.a ${CMAKE_CURRENT_BINARY_DIR}/src/scrypt_original-build/libcperciva_aesni.a ) target_include_directories(${PROJECT_NAME} PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.0/scrypt - ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.0/scrypt/libcperciva/cpusupport - ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.0/scrypt/libcperciva/alg - ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.0/scrypt/libcperciva/util + ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.1/scrypt + ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.1/scrypt/libcperciva/cpusupport + ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.1/scrypt/libcperciva/alg + ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.1/scrypt/libcperciva/util ) target_compile_options(${PROJECT_NAME} PRIVATE -DCONFIG_H_FILE=\"${CMAKE_CURRENT_BINARY_DIR}/src/scrypt_original-build/config.h\" -DCPUSUPPORT_CONFIG_FILE=\"${CMAKE_CURRENT_BINARY_DIR}/src/scrypt_original-build/cpusupport-config.h\" ) add_dependencies(${PROJECT_NAME} scrypt_original) -target_include_directories(${PROJECT_NAME} SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.0) +target_include_directories(${PROJECT_NAME} SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/scrypt-1.2.1) diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/Makefile.in b/vendor/scrypt/scrypt-1.2.0/scrypt/Makefile.in deleted file mode 100644 index b26caa2e..00000000 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/Makefile.in +++ /dev/null @@ -1,1318 +0,0 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2014 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -am__is_gnu_make = { \ - if test -z '$(MAKELEVEL)'; then \ - false; \ - elif test -n '$(MAKE_HOST)'; then \ - true; \ - elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ - true; \ - else \ - false; \ - fi; \ -} -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -bin_PROGRAMS = scrypt$(EXEEXT) -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scrypt-version \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(am__DIST_COMMON) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -LIBRARIES = $(noinst_LIBRARIES) -AR = ar -ARFLAGS = cru -AM_V_AR = $(am__v_AR_@AM_V@) -am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -am__v_AR_1 = -libcperciva_aesni_a_AR = $(AR) $(ARFLAGS) -libcperciva_aesni_a_LIBADD = -am__dirstamp = $(am__leading_dot)dirstamp -am_libcperciva_aesni_a_OBJECTS = libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.$(OBJEXT) -libcperciva_aesni_a_OBJECTS = $(am_libcperciva_aesni_a_OBJECTS) -libscrypt_sse2_a_AR = $(AR) $(ARFLAGS) -libscrypt_sse2_a_LIBADD = -am_libscrypt_sse2_a_OBJECTS = \ - lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.$(OBJEXT) -libscrypt_sse2_a_OBJECTS = $(am_libscrypt_sse2_a_OBJECTS) -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" -PROGRAMS = $(bin_PROGRAMS) -am_scrypt_OBJECTS = scrypt-main.$(OBJEXT) \ - libcperciva/alg/scrypt-sha256.$(OBJEXT) \ - libcperciva/cpusupport/scrypt-cpusupport_x86_aesni.$(OBJEXT) \ - libcperciva/cpusupport/scrypt-cpusupport_x86_sse2.$(OBJEXT) \ - libcperciva/crypto/scrypt-crypto_aes.$(OBJEXT) \ - libcperciva/crypto/scrypt-crypto_aesctr.$(OBJEXT) \ - libcperciva/crypto/scrypt-crypto_entropy.$(OBJEXT) \ - libcperciva/util/scrypt-entropy.$(OBJEXT) \ - libcperciva/util/scrypt-insecure_memzero.$(OBJEXT) \ - libcperciva/util/scrypt-readpass.$(OBJEXT) \ - libcperciva/util/scrypt-warnp.$(OBJEXT) \ - lib/crypto/scrypt-crypto_scrypt.$(OBJEXT) \ - lib/crypto/scrypt-crypto_scrypt_smix.$(OBJEXT) \ - lib/scryptenc/scrypt-scryptenc.$(OBJEXT) \ - lib/scryptenc/scrypt-scryptenc_cpuperf.$(OBJEXT) \ - lib/util/scrypt-memlimit.$(OBJEXT) -scrypt_OBJECTS = $(am_scrypt_OBJECTS) -scrypt_DEPENDENCIES = libcperciva_aesni.a libscrypt_sse2.a -scrypt_LINK = $(CCLD) $(scrypt_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -depcomp = $(SHELL) $(top_srcdir)/config.aux/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(libcperciva_aesni_a_SOURCES) $(libscrypt_sse2_a_SOURCES) \ - $(scrypt_SOURCES) -DIST_SOURCES = $(libcperciva_aesni_a_SOURCES) \ - $(libscrypt_sse2_a_SOURCES) $(scrypt_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -man1dir = $(mandir)/man1 -NROFF = nroff -MANS = $(dist_man_MANS) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -CSCOPE = cscope -AM_RECURSIVE_TARGETS = cscope -am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in $(top_srcdir)/config.aux/compile \ - $(top_srcdir)/config.aux/depcomp \ - $(top_srcdir)/config.aux/install-sh \ - $(top_srcdir)/config.aux/missing config.aux/compile \ - config.aux/depcomp config.aux/install-sh config.aux/missing -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - if test -d "$(distdir)"; then \ - find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -rf "$(distdir)" \ - || { sleep 5 && rm -rf "$(distdir)"; }; \ - else :; fi -am__post_remove_distdir = $(am__remove_distdir) -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -DIST_TARGETS = dist-gzip -distuninstallcheck_listfiles = find . -type f -print -am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ - | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build_alias = @build_alias@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = foreign subdir-objects -dist_man_MANS = $(scrypt_man_MANS) -scrypt_SOURCES = main.c \ - libcperciva/alg/sha256.c \ - libcperciva/cpusupport/cpusupport_x86_aesni.c \ - libcperciva/cpusupport/cpusupport_x86_sse2.c \ - libcperciva/crypto/crypto_aes.c \ - libcperciva/crypto/crypto_aesctr.c \ - libcperciva/crypto/crypto_entropy.c \ - libcperciva/util/entropy.c \ - libcperciva/util/insecure_memzero.c \ - libcperciva/util/readpass.c \ - libcperciva/util/warnp.c \ - lib/crypto/crypto_scrypt.c \ - lib/crypto/crypto_scrypt_smix.c \ - lib/scryptenc/scryptenc.c \ - lib/scryptenc/scryptenc_cpuperf.c \ - lib/util/memlimit.c \ - cpusupport-config.h - -scrypt_CFLAGS = -I $(srcdir)/libcperciva/alg \ - -I $(srcdir)/libcperciva/cpusupport \ - -I $(srcdir)/libcperciva/crypto \ - -I $(srcdir)/libcperciva/util \ - -I $(srcdir)/lib/crypto \ - -I $(srcdir)/lib/scryptenc \ - -I $(srcdir)/lib/util \ - -I . -D CPUSUPPORT_CONFIG_FILE=\"cpusupport-config.h\" - -scrypt_LDADD = -lcrypto libcperciva_aesni.a libscrypt_sse2.a -scrypt_man_MANS = scrypt.1 -BUILT_SOURCES = cpusupport-config.h -CLEANFILES = cpusupport-config.h cpusupport-config.h.tmp -noinst_LIBRARIES = libcperciva_aesni.a libscrypt_sse2.a -libcperciva_aesni_a_SOURCES = libcperciva/crypto/crypto_aes_aesni.c -libcperciva_aesni_a_CFLAGS = $(scrypt_CFLAGS) \ - `. ./cpusupport-config.h; echo $${CFLAGS_X86_AESNI}` - -libscrypt_sse2_a_SOURCES = lib/crypto/crypto_scrypt_smix_sse2.c -libscrypt_sse2_a_CFLAGS = $(scrypt_CFLAGS) \ - `. ./cpusupport-config.h; echo $${CFLAGS_X86_SSE2}` - -all: $(BUILT_SOURCES) config.h - $(MAKE) $(AM_MAKEFLAGS) all-am - -.SUFFIXES: -.SUFFIXES: .c .o .obj -am--refresh: Makefile - @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ - $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - $(am__cd) $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -$(am__aclocal_m4_deps): - -config.h: stamp-h1 - @test -f $@ || rm -f stamp-h1 - @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 - -stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f stamp-h1 - touch $@ - -distclean-hdr: - -rm -f config.h stamp-h1 - -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libcperciva/crypto/$(am__dirstamp): - @$(MKDIR_P) libcperciva/crypto - @: > libcperciva/crypto/$(am__dirstamp) -libcperciva/crypto/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) libcperciva/crypto/$(DEPDIR) - @: > libcperciva/crypto/$(DEPDIR)/$(am__dirstamp) -libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.$(OBJEXT): \ - libcperciva/crypto/$(am__dirstamp) \ - libcperciva/crypto/$(DEPDIR)/$(am__dirstamp) - -libcperciva_aesni.a: $(libcperciva_aesni_a_OBJECTS) $(libcperciva_aesni_a_DEPENDENCIES) $(EXTRA_libcperciva_aesni_a_DEPENDENCIES) - $(AM_V_at)-rm -f libcperciva_aesni.a - $(AM_V_AR)$(libcperciva_aesni_a_AR) libcperciva_aesni.a $(libcperciva_aesni_a_OBJECTS) $(libcperciva_aesni_a_LIBADD) - $(AM_V_at)$(RANLIB) libcperciva_aesni.a -lib/crypto/$(am__dirstamp): - @$(MKDIR_P) lib/crypto - @: > lib/crypto/$(am__dirstamp) -lib/crypto/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) lib/crypto/$(DEPDIR) - @: > lib/crypto/$(DEPDIR)/$(am__dirstamp) -lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.$(OBJEXT): \ - lib/crypto/$(am__dirstamp) \ - lib/crypto/$(DEPDIR)/$(am__dirstamp) - -libscrypt_sse2.a: $(libscrypt_sse2_a_OBJECTS) $(libscrypt_sse2_a_DEPENDENCIES) $(EXTRA_libscrypt_sse2_a_DEPENDENCIES) - $(AM_V_at)-rm -f libscrypt_sse2.a - $(AM_V_AR)$(libscrypt_sse2_a_AR) libscrypt_sse2.a $(libscrypt_sse2_a_OBJECTS) $(libscrypt_sse2_a_LIBADD) - $(AM_V_at)$(RANLIB) libscrypt_sse2.a -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files - -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -libcperciva/alg/$(am__dirstamp): - @$(MKDIR_P) libcperciva/alg - @: > libcperciva/alg/$(am__dirstamp) -libcperciva/alg/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) libcperciva/alg/$(DEPDIR) - @: > libcperciva/alg/$(DEPDIR)/$(am__dirstamp) -libcperciva/alg/scrypt-sha256.$(OBJEXT): \ - libcperciva/alg/$(am__dirstamp) \ - libcperciva/alg/$(DEPDIR)/$(am__dirstamp) -libcperciva/cpusupport/$(am__dirstamp): - @$(MKDIR_P) libcperciva/cpusupport - @: > libcperciva/cpusupport/$(am__dirstamp) -libcperciva/cpusupport/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) libcperciva/cpusupport/$(DEPDIR) - @: > libcperciva/cpusupport/$(DEPDIR)/$(am__dirstamp) -libcperciva/cpusupport/scrypt-cpusupport_x86_aesni.$(OBJEXT): \ - libcperciva/cpusupport/$(am__dirstamp) \ - libcperciva/cpusupport/$(DEPDIR)/$(am__dirstamp) -libcperciva/cpusupport/scrypt-cpusupport_x86_sse2.$(OBJEXT): \ - libcperciva/cpusupport/$(am__dirstamp) \ - libcperciva/cpusupport/$(DEPDIR)/$(am__dirstamp) -libcperciva/crypto/scrypt-crypto_aes.$(OBJEXT): \ - libcperciva/crypto/$(am__dirstamp) \ - libcperciva/crypto/$(DEPDIR)/$(am__dirstamp) -libcperciva/crypto/scrypt-crypto_aesctr.$(OBJEXT): \ - libcperciva/crypto/$(am__dirstamp) \ - libcperciva/crypto/$(DEPDIR)/$(am__dirstamp) -libcperciva/crypto/scrypt-crypto_entropy.$(OBJEXT): \ - libcperciva/crypto/$(am__dirstamp) \ - libcperciva/crypto/$(DEPDIR)/$(am__dirstamp) -libcperciva/util/$(am__dirstamp): - @$(MKDIR_P) libcperciva/util - @: > libcperciva/util/$(am__dirstamp) -libcperciva/util/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) libcperciva/util/$(DEPDIR) - @: > libcperciva/util/$(DEPDIR)/$(am__dirstamp) -libcperciva/util/scrypt-entropy.$(OBJEXT): \ - libcperciva/util/$(am__dirstamp) \ - libcperciva/util/$(DEPDIR)/$(am__dirstamp) -libcperciva/util/scrypt-insecure_memzero.$(OBJEXT): \ - libcperciva/util/$(am__dirstamp) \ - libcperciva/util/$(DEPDIR)/$(am__dirstamp) -libcperciva/util/scrypt-readpass.$(OBJEXT): \ - libcperciva/util/$(am__dirstamp) \ - libcperciva/util/$(DEPDIR)/$(am__dirstamp) -libcperciva/util/scrypt-warnp.$(OBJEXT): \ - libcperciva/util/$(am__dirstamp) \ - libcperciva/util/$(DEPDIR)/$(am__dirstamp) -lib/crypto/scrypt-crypto_scrypt.$(OBJEXT): lib/crypto/$(am__dirstamp) \ - lib/crypto/$(DEPDIR)/$(am__dirstamp) -lib/crypto/scrypt-crypto_scrypt_smix.$(OBJEXT): \ - lib/crypto/$(am__dirstamp) \ - lib/crypto/$(DEPDIR)/$(am__dirstamp) -lib/scryptenc/$(am__dirstamp): - @$(MKDIR_P) lib/scryptenc - @: > lib/scryptenc/$(am__dirstamp) -lib/scryptenc/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) lib/scryptenc/$(DEPDIR) - @: > lib/scryptenc/$(DEPDIR)/$(am__dirstamp) -lib/scryptenc/scrypt-scryptenc.$(OBJEXT): \ - lib/scryptenc/$(am__dirstamp) \ - lib/scryptenc/$(DEPDIR)/$(am__dirstamp) -lib/scryptenc/scrypt-scryptenc_cpuperf.$(OBJEXT): \ - lib/scryptenc/$(am__dirstamp) \ - lib/scryptenc/$(DEPDIR)/$(am__dirstamp) -lib/util/$(am__dirstamp): - @$(MKDIR_P) lib/util - @: > lib/util/$(am__dirstamp) -lib/util/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) lib/util/$(DEPDIR) - @: > lib/util/$(DEPDIR)/$(am__dirstamp) -lib/util/scrypt-memlimit.$(OBJEXT): lib/util/$(am__dirstamp) \ - lib/util/$(DEPDIR)/$(am__dirstamp) - -scrypt$(EXEEXT): $(scrypt_OBJECTS) $(scrypt_DEPENDENCIES) $(EXTRA_scrypt_DEPENDENCIES) - @rm -f scrypt$(EXEEXT) - $(AM_V_CCLD)$(scrypt_LINK) $(scrypt_OBJECTS) $(scrypt_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -rm -f lib/crypto/*.$(OBJEXT) - -rm -f lib/scryptenc/*.$(OBJEXT) - -rm -f lib/util/*.$(OBJEXT) - -rm -f libcperciva/alg/*.$(OBJEXT) - -rm -f libcperciva/cpusupport/*.$(OBJEXT) - -rm -f libcperciva/crypto/*.$(OBJEXT) - -rm -f libcperciva/util/*.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scrypt-main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@lib/crypto/$(DEPDIR)/libscrypt_sse2_a-crypto_scrypt_smix_sse2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@lib/crypto/$(DEPDIR)/scrypt-crypto_scrypt.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@lib/crypto/$(DEPDIR)/scrypt-crypto_scrypt_smix.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@lib/scryptenc/$(DEPDIR)/scrypt-scryptenc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@lib/scryptenc/$(DEPDIR)/scrypt-scryptenc_cpuperf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@lib/util/$(DEPDIR)/scrypt-memlimit.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/alg/$(DEPDIR)/scrypt-sha256.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/cpusupport/$(DEPDIR)/scrypt-cpusupport_x86_aesni.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/cpusupport/$(DEPDIR)/scrypt-cpusupport_x86_sse2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/crypto/$(DEPDIR)/libcperciva_aesni_a-crypto_aes_aesni.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/crypto/$(DEPDIR)/scrypt-crypto_aes.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/crypto/$(DEPDIR)/scrypt-crypto_aesctr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/crypto/$(DEPDIR)/scrypt-crypto_entropy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/util/$(DEPDIR)/scrypt-entropy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/util/$(DEPDIR)/scrypt-insecure_memzero.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/util/$(DEPDIR)/scrypt-readpass.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/util/$(DEPDIR)/scrypt-warnp.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.o: libcperciva/crypto/crypto_aes_aesni.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcperciva_aesni_a_CFLAGS) $(CFLAGS) -MT libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.o -MD -MP -MF libcperciva/crypto/$(DEPDIR)/libcperciva_aesni_a-crypto_aes_aesni.Tpo -c -o libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.o `test -f 'libcperciva/crypto/crypto_aes_aesni.c' || echo '$(srcdir)/'`libcperciva/crypto/crypto_aes_aesni.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/crypto/$(DEPDIR)/libcperciva_aesni_a-crypto_aes_aesni.Tpo libcperciva/crypto/$(DEPDIR)/libcperciva_aesni_a-crypto_aes_aesni.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/crypto/crypto_aes_aesni.c' object='libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcperciva_aesni_a_CFLAGS) $(CFLAGS) -c -o libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.o `test -f 'libcperciva/crypto/crypto_aes_aesni.c' || echo '$(srcdir)/'`libcperciva/crypto/crypto_aes_aesni.c - -libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.obj: libcperciva/crypto/crypto_aes_aesni.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcperciva_aesni_a_CFLAGS) $(CFLAGS) -MT libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.obj -MD -MP -MF libcperciva/crypto/$(DEPDIR)/libcperciva_aesni_a-crypto_aes_aesni.Tpo -c -o libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.obj `if test -f 'libcperciva/crypto/crypto_aes_aesni.c'; then $(CYGPATH_W) 'libcperciva/crypto/crypto_aes_aesni.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/crypto/crypto_aes_aesni.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/crypto/$(DEPDIR)/libcperciva_aesni_a-crypto_aes_aesni.Tpo libcperciva/crypto/$(DEPDIR)/libcperciva_aesni_a-crypto_aes_aesni.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/crypto/crypto_aes_aesni.c' object='libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcperciva_aesni_a_CFLAGS) $(CFLAGS) -c -o libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.obj `if test -f 'libcperciva/crypto/crypto_aes_aesni.c'; then $(CYGPATH_W) 'libcperciva/crypto/crypto_aes_aesni.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/crypto/crypto_aes_aesni.c'; fi` - -lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.o: lib/crypto/crypto_scrypt_smix_sse2.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscrypt_sse2_a_CFLAGS) $(CFLAGS) -MT lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.o -MD -MP -MF lib/crypto/$(DEPDIR)/libscrypt_sse2_a-crypto_scrypt_smix_sse2.Tpo -c -o lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.o `test -f 'lib/crypto/crypto_scrypt_smix_sse2.c' || echo '$(srcdir)/'`lib/crypto/crypto_scrypt_smix_sse2.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) lib/crypto/$(DEPDIR)/libscrypt_sse2_a-crypto_scrypt_smix_sse2.Tpo lib/crypto/$(DEPDIR)/libscrypt_sse2_a-crypto_scrypt_smix_sse2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib/crypto/crypto_scrypt_smix_sse2.c' object='lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscrypt_sse2_a_CFLAGS) $(CFLAGS) -c -o lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.o `test -f 'lib/crypto/crypto_scrypt_smix_sse2.c' || echo '$(srcdir)/'`lib/crypto/crypto_scrypt_smix_sse2.c - -lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.obj: lib/crypto/crypto_scrypt_smix_sse2.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscrypt_sse2_a_CFLAGS) $(CFLAGS) -MT lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.obj -MD -MP -MF lib/crypto/$(DEPDIR)/libscrypt_sse2_a-crypto_scrypt_smix_sse2.Tpo -c -o lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.obj `if test -f 'lib/crypto/crypto_scrypt_smix_sse2.c'; then $(CYGPATH_W) 'lib/crypto/crypto_scrypt_smix_sse2.c'; else $(CYGPATH_W) '$(srcdir)/lib/crypto/crypto_scrypt_smix_sse2.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) lib/crypto/$(DEPDIR)/libscrypt_sse2_a-crypto_scrypt_smix_sse2.Tpo lib/crypto/$(DEPDIR)/libscrypt_sse2_a-crypto_scrypt_smix_sse2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib/crypto/crypto_scrypt_smix_sse2.c' object='lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscrypt_sse2_a_CFLAGS) $(CFLAGS) -c -o lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.obj `if test -f 'lib/crypto/crypto_scrypt_smix_sse2.c'; then $(CYGPATH_W) 'lib/crypto/crypto_scrypt_smix_sse2.c'; else $(CYGPATH_W) '$(srcdir)/lib/crypto/crypto_scrypt_smix_sse2.c'; fi` - -scrypt-main.o: main.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT scrypt-main.o -MD -MP -MF $(DEPDIR)/scrypt-main.Tpo -c -o scrypt-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/scrypt-main.Tpo $(DEPDIR)/scrypt-main.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='scrypt-main.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o scrypt-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c - -scrypt-main.obj: main.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT scrypt-main.obj -MD -MP -MF $(DEPDIR)/scrypt-main.Tpo -c -o scrypt-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/scrypt-main.Tpo $(DEPDIR)/scrypt-main.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='scrypt-main.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o scrypt-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` - -libcperciva/alg/scrypt-sha256.o: libcperciva/alg/sha256.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/alg/scrypt-sha256.o -MD -MP -MF libcperciva/alg/$(DEPDIR)/scrypt-sha256.Tpo -c -o libcperciva/alg/scrypt-sha256.o `test -f 'libcperciva/alg/sha256.c' || echo '$(srcdir)/'`libcperciva/alg/sha256.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/alg/$(DEPDIR)/scrypt-sha256.Tpo libcperciva/alg/$(DEPDIR)/scrypt-sha256.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/alg/sha256.c' object='libcperciva/alg/scrypt-sha256.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/alg/scrypt-sha256.o `test -f 'libcperciva/alg/sha256.c' || echo '$(srcdir)/'`libcperciva/alg/sha256.c - -libcperciva/alg/scrypt-sha256.obj: libcperciva/alg/sha256.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/alg/scrypt-sha256.obj -MD -MP -MF libcperciva/alg/$(DEPDIR)/scrypt-sha256.Tpo -c -o libcperciva/alg/scrypt-sha256.obj `if test -f 'libcperciva/alg/sha256.c'; then $(CYGPATH_W) 'libcperciva/alg/sha256.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/alg/sha256.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/alg/$(DEPDIR)/scrypt-sha256.Tpo libcperciva/alg/$(DEPDIR)/scrypt-sha256.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/alg/sha256.c' object='libcperciva/alg/scrypt-sha256.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/alg/scrypt-sha256.obj `if test -f 'libcperciva/alg/sha256.c'; then $(CYGPATH_W) 'libcperciva/alg/sha256.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/alg/sha256.c'; fi` - -libcperciva/cpusupport/scrypt-cpusupport_x86_aesni.o: libcperciva/cpusupport/cpusupport_x86_aesni.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/cpusupport/scrypt-cpusupport_x86_aesni.o -MD -MP -MF libcperciva/cpusupport/$(DEPDIR)/scrypt-cpusupport_x86_aesni.Tpo -c -o libcperciva/cpusupport/scrypt-cpusupport_x86_aesni.o `test -f 'libcperciva/cpusupport/cpusupport_x86_aesni.c' || echo '$(srcdir)/'`libcperciva/cpusupport/cpusupport_x86_aesni.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/cpusupport/$(DEPDIR)/scrypt-cpusupport_x86_aesni.Tpo libcperciva/cpusupport/$(DEPDIR)/scrypt-cpusupport_x86_aesni.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/cpusupport/cpusupport_x86_aesni.c' object='libcperciva/cpusupport/scrypt-cpusupport_x86_aesni.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/cpusupport/scrypt-cpusupport_x86_aesni.o `test -f 'libcperciva/cpusupport/cpusupport_x86_aesni.c' || echo '$(srcdir)/'`libcperciva/cpusupport/cpusupport_x86_aesni.c - -libcperciva/cpusupport/scrypt-cpusupport_x86_aesni.obj: libcperciva/cpusupport/cpusupport_x86_aesni.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/cpusupport/scrypt-cpusupport_x86_aesni.obj -MD -MP -MF libcperciva/cpusupport/$(DEPDIR)/scrypt-cpusupport_x86_aesni.Tpo -c -o libcperciva/cpusupport/scrypt-cpusupport_x86_aesni.obj `if test -f 'libcperciva/cpusupport/cpusupport_x86_aesni.c'; then $(CYGPATH_W) 'libcperciva/cpusupport/cpusupport_x86_aesni.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/cpusupport/cpusupport_x86_aesni.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/cpusupport/$(DEPDIR)/scrypt-cpusupport_x86_aesni.Tpo libcperciva/cpusupport/$(DEPDIR)/scrypt-cpusupport_x86_aesni.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/cpusupport/cpusupport_x86_aesni.c' object='libcperciva/cpusupport/scrypt-cpusupport_x86_aesni.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/cpusupport/scrypt-cpusupport_x86_aesni.obj `if test -f 'libcperciva/cpusupport/cpusupport_x86_aesni.c'; then $(CYGPATH_W) 'libcperciva/cpusupport/cpusupport_x86_aesni.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/cpusupport/cpusupport_x86_aesni.c'; fi` - -libcperciva/cpusupport/scrypt-cpusupport_x86_sse2.o: libcperciva/cpusupport/cpusupport_x86_sse2.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/cpusupport/scrypt-cpusupport_x86_sse2.o -MD -MP -MF libcperciva/cpusupport/$(DEPDIR)/scrypt-cpusupport_x86_sse2.Tpo -c -o libcperciva/cpusupport/scrypt-cpusupport_x86_sse2.o `test -f 'libcperciva/cpusupport/cpusupport_x86_sse2.c' || echo '$(srcdir)/'`libcperciva/cpusupport/cpusupport_x86_sse2.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/cpusupport/$(DEPDIR)/scrypt-cpusupport_x86_sse2.Tpo libcperciva/cpusupport/$(DEPDIR)/scrypt-cpusupport_x86_sse2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/cpusupport/cpusupport_x86_sse2.c' object='libcperciva/cpusupport/scrypt-cpusupport_x86_sse2.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/cpusupport/scrypt-cpusupport_x86_sse2.o `test -f 'libcperciva/cpusupport/cpusupport_x86_sse2.c' || echo '$(srcdir)/'`libcperciva/cpusupport/cpusupport_x86_sse2.c - -libcperciva/cpusupport/scrypt-cpusupport_x86_sse2.obj: libcperciva/cpusupport/cpusupport_x86_sse2.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/cpusupport/scrypt-cpusupport_x86_sse2.obj -MD -MP -MF libcperciva/cpusupport/$(DEPDIR)/scrypt-cpusupport_x86_sse2.Tpo -c -o libcperciva/cpusupport/scrypt-cpusupport_x86_sse2.obj `if test -f 'libcperciva/cpusupport/cpusupport_x86_sse2.c'; then $(CYGPATH_W) 'libcperciva/cpusupport/cpusupport_x86_sse2.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/cpusupport/cpusupport_x86_sse2.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/cpusupport/$(DEPDIR)/scrypt-cpusupport_x86_sse2.Tpo libcperciva/cpusupport/$(DEPDIR)/scrypt-cpusupport_x86_sse2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/cpusupport/cpusupport_x86_sse2.c' object='libcperciva/cpusupport/scrypt-cpusupport_x86_sse2.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/cpusupport/scrypt-cpusupport_x86_sse2.obj `if test -f 'libcperciva/cpusupport/cpusupport_x86_sse2.c'; then $(CYGPATH_W) 'libcperciva/cpusupport/cpusupport_x86_sse2.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/cpusupport/cpusupport_x86_sse2.c'; fi` - -libcperciva/crypto/scrypt-crypto_aes.o: libcperciva/crypto/crypto_aes.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/crypto/scrypt-crypto_aes.o -MD -MP -MF libcperciva/crypto/$(DEPDIR)/scrypt-crypto_aes.Tpo -c -o libcperciva/crypto/scrypt-crypto_aes.o `test -f 'libcperciva/crypto/crypto_aes.c' || echo '$(srcdir)/'`libcperciva/crypto/crypto_aes.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/crypto/$(DEPDIR)/scrypt-crypto_aes.Tpo libcperciva/crypto/$(DEPDIR)/scrypt-crypto_aes.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/crypto/crypto_aes.c' object='libcperciva/crypto/scrypt-crypto_aes.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/crypto/scrypt-crypto_aes.o `test -f 'libcperciva/crypto/crypto_aes.c' || echo '$(srcdir)/'`libcperciva/crypto/crypto_aes.c - -libcperciva/crypto/scrypt-crypto_aes.obj: libcperciva/crypto/crypto_aes.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/crypto/scrypt-crypto_aes.obj -MD -MP -MF libcperciva/crypto/$(DEPDIR)/scrypt-crypto_aes.Tpo -c -o libcperciva/crypto/scrypt-crypto_aes.obj `if test -f 'libcperciva/crypto/crypto_aes.c'; then $(CYGPATH_W) 'libcperciva/crypto/crypto_aes.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/crypto/crypto_aes.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/crypto/$(DEPDIR)/scrypt-crypto_aes.Tpo libcperciva/crypto/$(DEPDIR)/scrypt-crypto_aes.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/crypto/crypto_aes.c' object='libcperciva/crypto/scrypt-crypto_aes.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/crypto/scrypt-crypto_aes.obj `if test -f 'libcperciva/crypto/crypto_aes.c'; then $(CYGPATH_W) 'libcperciva/crypto/crypto_aes.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/crypto/crypto_aes.c'; fi` - -libcperciva/crypto/scrypt-crypto_aesctr.o: libcperciva/crypto/crypto_aesctr.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/crypto/scrypt-crypto_aesctr.o -MD -MP -MF libcperciva/crypto/$(DEPDIR)/scrypt-crypto_aesctr.Tpo -c -o libcperciva/crypto/scrypt-crypto_aesctr.o `test -f 'libcperciva/crypto/crypto_aesctr.c' || echo '$(srcdir)/'`libcperciva/crypto/crypto_aesctr.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/crypto/$(DEPDIR)/scrypt-crypto_aesctr.Tpo libcperciva/crypto/$(DEPDIR)/scrypt-crypto_aesctr.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/crypto/crypto_aesctr.c' object='libcperciva/crypto/scrypt-crypto_aesctr.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/crypto/scrypt-crypto_aesctr.o `test -f 'libcperciva/crypto/crypto_aesctr.c' || echo '$(srcdir)/'`libcperciva/crypto/crypto_aesctr.c - -libcperciva/crypto/scrypt-crypto_aesctr.obj: libcperciva/crypto/crypto_aesctr.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/crypto/scrypt-crypto_aesctr.obj -MD -MP -MF libcperciva/crypto/$(DEPDIR)/scrypt-crypto_aesctr.Tpo -c -o libcperciva/crypto/scrypt-crypto_aesctr.obj `if test -f 'libcperciva/crypto/crypto_aesctr.c'; then $(CYGPATH_W) 'libcperciva/crypto/crypto_aesctr.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/crypto/crypto_aesctr.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/crypto/$(DEPDIR)/scrypt-crypto_aesctr.Tpo libcperciva/crypto/$(DEPDIR)/scrypt-crypto_aesctr.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/crypto/crypto_aesctr.c' object='libcperciva/crypto/scrypt-crypto_aesctr.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/crypto/scrypt-crypto_aesctr.obj `if test -f 'libcperciva/crypto/crypto_aesctr.c'; then $(CYGPATH_W) 'libcperciva/crypto/crypto_aesctr.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/crypto/crypto_aesctr.c'; fi` - -libcperciva/crypto/scrypt-crypto_entropy.o: libcperciva/crypto/crypto_entropy.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/crypto/scrypt-crypto_entropy.o -MD -MP -MF libcperciva/crypto/$(DEPDIR)/scrypt-crypto_entropy.Tpo -c -o libcperciva/crypto/scrypt-crypto_entropy.o `test -f 'libcperciva/crypto/crypto_entropy.c' || echo '$(srcdir)/'`libcperciva/crypto/crypto_entropy.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/crypto/$(DEPDIR)/scrypt-crypto_entropy.Tpo libcperciva/crypto/$(DEPDIR)/scrypt-crypto_entropy.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/crypto/crypto_entropy.c' object='libcperciva/crypto/scrypt-crypto_entropy.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/crypto/scrypt-crypto_entropy.o `test -f 'libcperciva/crypto/crypto_entropy.c' || echo '$(srcdir)/'`libcperciva/crypto/crypto_entropy.c - -libcperciva/crypto/scrypt-crypto_entropy.obj: libcperciva/crypto/crypto_entropy.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/crypto/scrypt-crypto_entropy.obj -MD -MP -MF libcperciva/crypto/$(DEPDIR)/scrypt-crypto_entropy.Tpo -c -o libcperciva/crypto/scrypt-crypto_entropy.obj `if test -f 'libcperciva/crypto/crypto_entropy.c'; then $(CYGPATH_W) 'libcperciva/crypto/crypto_entropy.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/crypto/crypto_entropy.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/crypto/$(DEPDIR)/scrypt-crypto_entropy.Tpo libcperciva/crypto/$(DEPDIR)/scrypt-crypto_entropy.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/crypto/crypto_entropy.c' object='libcperciva/crypto/scrypt-crypto_entropy.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/crypto/scrypt-crypto_entropy.obj `if test -f 'libcperciva/crypto/crypto_entropy.c'; then $(CYGPATH_W) 'libcperciva/crypto/crypto_entropy.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/crypto/crypto_entropy.c'; fi` - -libcperciva/util/scrypt-entropy.o: libcperciva/util/entropy.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/util/scrypt-entropy.o -MD -MP -MF libcperciva/util/$(DEPDIR)/scrypt-entropy.Tpo -c -o libcperciva/util/scrypt-entropy.o `test -f 'libcperciva/util/entropy.c' || echo '$(srcdir)/'`libcperciva/util/entropy.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/util/$(DEPDIR)/scrypt-entropy.Tpo libcperciva/util/$(DEPDIR)/scrypt-entropy.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/util/entropy.c' object='libcperciva/util/scrypt-entropy.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/util/scrypt-entropy.o `test -f 'libcperciva/util/entropy.c' || echo '$(srcdir)/'`libcperciva/util/entropy.c - -libcperciva/util/scrypt-entropy.obj: libcperciva/util/entropy.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/util/scrypt-entropy.obj -MD -MP -MF libcperciva/util/$(DEPDIR)/scrypt-entropy.Tpo -c -o libcperciva/util/scrypt-entropy.obj `if test -f 'libcperciva/util/entropy.c'; then $(CYGPATH_W) 'libcperciva/util/entropy.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/util/entropy.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/util/$(DEPDIR)/scrypt-entropy.Tpo libcperciva/util/$(DEPDIR)/scrypt-entropy.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/util/entropy.c' object='libcperciva/util/scrypt-entropy.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/util/scrypt-entropy.obj `if test -f 'libcperciva/util/entropy.c'; then $(CYGPATH_W) 'libcperciva/util/entropy.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/util/entropy.c'; fi` - -libcperciva/util/scrypt-insecure_memzero.o: libcperciva/util/insecure_memzero.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/util/scrypt-insecure_memzero.o -MD -MP -MF libcperciva/util/$(DEPDIR)/scrypt-insecure_memzero.Tpo -c -o libcperciva/util/scrypt-insecure_memzero.o `test -f 'libcperciva/util/insecure_memzero.c' || echo '$(srcdir)/'`libcperciva/util/insecure_memzero.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/util/$(DEPDIR)/scrypt-insecure_memzero.Tpo libcperciva/util/$(DEPDIR)/scrypt-insecure_memzero.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/util/insecure_memzero.c' object='libcperciva/util/scrypt-insecure_memzero.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/util/scrypt-insecure_memzero.o `test -f 'libcperciva/util/insecure_memzero.c' || echo '$(srcdir)/'`libcperciva/util/insecure_memzero.c - -libcperciva/util/scrypt-insecure_memzero.obj: libcperciva/util/insecure_memzero.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/util/scrypt-insecure_memzero.obj -MD -MP -MF libcperciva/util/$(DEPDIR)/scrypt-insecure_memzero.Tpo -c -o libcperciva/util/scrypt-insecure_memzero.obj `if test -f 'libcperciva/util/insecure_memzero.c'; then $(CYGPATH_W) 'libcperciva/util/insecure_memzero.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/util/insecure_memzero.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/util/$(DEPDIR)/scrypt-insecure_memzero.Tpo libcperciva/util/$(DEPDIR)/scrypt-insecure_memzero.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/util/insecure_memzero.c' object='libcperciva/util/scrypt-insecure_memzero.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/util/scrypt-insecure_memzero.obj `if test -f 'libcperciva/util/insecure_memzero.c'; then $(CYGPATH_W) 'libcperciva/util/insecure_memzero.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/util/insecure_memzero.c'; fi` - -libcperciva/util/scrypt-readpass.o: libcperciva/util/readpass.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/util/scrypt-readpass.o -MD -MP -MF libcperciva/util/$(DEPDIR)/scrypt-readpass.Tpo -c -o libcperciva/util/scrypt-readpass.o `test -f 'libcperciva/util/readpass.c' || echo '$(srcdir)/'`libcperciva/util/readpass.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/util/$(DEPDIR)/scrypt-readpass.Tpo libcperciva/util/$(DEPDIR)/scrypt-readpass.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/util/readpass.c' object='libcperciva/util/scrypt-readpass.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/util/scrypt-readpass.o `test -f 'libcperciva/util/readpass.c' || echo '$(srcdir)/'`libcperciva/util/readpass.c - -libcperciva/util/scrypt-readpass.obj: libcperciva/util/readpass.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/util/scrypt-readpass.obj -MD -MP -MF libcperciva/util/$(DEPDIR)/scrypt-readpass.Tpo -c -o libcperciva/util/scrypt-readpass.obj `if test -f 'libcperciva/util/readpass.c'; then $(CYGPATH_W) 'libcperciva/util/readpass.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/util/readpass.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/util/$(DEPDIR)/scrypt-readpass.Tpo libcperciva/util/$(DEPDIR)/scrypt-readpass.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/util/readpass.c' object='libcperciva/util/scrypt-readpass.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/util/scrypt-readpass.obj `if test -f 'libcperciva/util/readpass.c'; then $(CYGPATH_W) 'libcperciva/util/readpass.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/util/readpass.c'; fi` - -libcperciva/util/scrypt-warnp.o: libcperciva/util/warnp.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/util/scrypt-warnp.o -MD -MP -MF libcperciva/util/$(DEPDIR)/scrypt-warnp.Tpo -c -o libcperciva/util/scrypt-warnp.o `test -f 'libcperciva/util/warnp.c' || echo '$(srcdir)/'`libcperciva/util/warnp.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/util/$(DEPDIR)/scrypt-warnp.Tpo libcperciva/util/$(DEPDIR)/scrypt-warnp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/util/warnp.c' object='libcperciva/util/scrypt-warnp.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/util/scrypt-warnp.o `test -f 'libcperciva/util/warnp.c' || echo '$(srcdir)/'`libcperciva/util/warnp.c - -libcperciva/util/scrypt-warnp.obj: libcperciva/util/warnp.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT libcperciva/util/scrypt-warnp.obj -MD -MP -MF libcperciva/util/$(DEPDIR)/scrypt-warnp.Tpo -c -o libcperciva/util/scrypt-warnp.obj `if test -f 'libcperciva/util/warnp.c'; then $(CYGPATH_W) 'libcperciva/util/warnp.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/util/warnp.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/util/$(DEPDIR)/scrypt-warnp.Tpo libcperciva/util/$(DEPDIR)/scrypt-warnp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/util/warnp.c' object='libcperciva/util/scrypt-warnp.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o libcperciva/util/scrypt-warnp.obj `if test -f 'libcperciva/util/warnp.c'; then $(CYGPATH_W) 'libcperciva/util/warnp.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/util/warnp.c'; fi` - -lib/crypto/scrypt-crypto_scrypt.o: lib/crypto/crypto_scrypt.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT lib/crypto/scrypt-crypto_scrypt.o -MD -MP -MF lib/crypto/$(DEPDIR)/scrypt-crypto_scrypt.Tpo -c -o lib/crypto/scrypt-crypto_scrypt.o `test -f 'lib/crypto/crypto_scrypt.c' || echo '$(srcdir)/'`lib/crypto/crypto_scrypt.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) lib/crypto/$(DEPDIR)/scrypt-crypto_scrypt.Tpo lib/crypto/$(DEPDIR)/scrypt-crypto_scrypt.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib/crypto/crypto_scrypt.c' object='lib/crypto/scrypt-crypto_scrypt.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o lib/crypto/scrypt-crypto_scrypt.o `test -f 'lib/crypto/crypto_scrypt.c' || echo '$(srcdir)/'`lib/crypto/crypto_scrypt.c - -lib/crypto/scrypt-crypto_scrypt.obj: lib/crypto/crypto_scrypt.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT lib/crypto/scrypt-crypto_scrypt.obj -MD -MP -MF lib/crypto/$(DEPDIR)/scrypt-crypto_scrypt.Tpo -c -o lib/crypto/scrypt-crypto_scrypt.obj `if test -f 'lib/crypto/crypto_scrypt.c'; then $(CYGPATH_W) 'lib/crypto/crypto_scrypt.c'; else $(CYGPATH_W) '$(srcdir)/lib/crypto/crypto_scrypt.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) lib/crypto/$(DEPDIR)/scrypt-crypto_scrypt.Tpo lib/crypto/$(DEPDIR)/scrypt-crypto_scrypt.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib/crypto/crypto_scrypt.c' object='lib/crypto/scrypt-crypto_scrypt.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o lib/crypto/scrypt-crypto_scrypt.obj `if test -f 'lib/crypto/crypto_scrypt.c'; then $(CYGPATH_W) 'lib/crypto/crypto_scrypt.c'; else $(CYGPATH_W) '$(srcdir)/lib/crypto/crypto_scrypt.c'; fi` - -lib/crypto/scrypt-crypto_scrypt_smix.o: lib/crypto/crypto_scrypt_smix.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT lib/crypto/scrypt-crypto_scrypt_smix.o -MD -MP -MF lib/crypto/$(DEPDIR)/scrypt-crypto_scrypt_smix.Tpo -c -o lib/crypto/scrypt-crypto_scrypt_smix.o `test -f 'lib/crypto/crypto_scrypt_smix.c' || echo '$(srcdir)/'`lib/crypto/crypto_scrypt_smix.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) lib/crypto/$(DEPDIR)/scrypt-crypto_scrypt_smix.Tpo lib/crypto/$(DEPDIR)/scrypt-crypto_scrypt_smix.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib/crypto/crypto_scrypt_smix.c' object='lib/crypto/scrypt-crypto_scrypt_smix.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o lib/crypto/scrypt-crypto_scrypt_smix.o `test -f 'lib/crypto/crypto_scrypt_smix.c' || echo '$(srcdir)/'`lib/crypto/crypto_scrypt_smix.c - -lib/crypto/scrypt-crypto_scrypt_smix.obj: lib/crypto/crypto_scrypt_smix.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT lib/crypto/scrypt-crypto_scrypt_smix.obj -MD -MP -MF lib/crypto/$(DEPDIR)/scrypt-crypto_scrypt_smix.Tpo -c -o lib/crypto/scrypt-crypto_scrypt_smix.obj `if test -f 'lib/crypto/crypto_scrypt_smix.c'; then $(CYGPATH_W) 'lib/crypto/crypto_scrypt_smix.c'; else $(CYGPATH_W) '$(srcdir)/lib/crypto/crypto_scrypt_smix.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) lib/crypto/$(DEPDIR)/scrypt-crypto_scrypt_smix.Tpo lib/crypto/$(DEPDIR)/scrypt-crypto_scrypt_smix.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib/crypto/crypto_scrypt_smix.c' object='lib/crypto/scrypt-crypto_scrypt_smix.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o lib/crypto/scrypt-crypto_scrypt_smix.obj `if test -f 'lib/crypto/crypto_scrypt_smix.c'; then $(CYGPATH_W) 'lib/crypto/crypto_scrypt_smix.c'; else $(CYGPATH_W) '$(srcdir)/lib/crypto/crypto_scrypt_smix.c'; fi` - -lib/scryptenc/scrypt-scryptenc.o: lib/scryptenc/scryptenc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT lib/scryptenc/scrypt-scryptenc.o -MD -MP -MF lib/scryptenc/$(DEPDIR)/scrypt-scryptenc.Tpo -c -o lib/scryptenc/scrypt-scryptenc.o `test -f 'lib/scryptenc/scryptenc.c' || echo '$(srcdir)/'`lib/scryptenc/scryptenc.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) lib/scryptenc/$(DEPDIR)/scrypt-scryptenc.Tpo lib/scryptenc/$(DEPDIR)/scrypt-scryptenc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib/scryptenc/scryptenc.c' object='lib/scryptenc/scrypt-scryptenc.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o lib/scryptenc/scrypt-scryptenc.o `test -f 'lib/scryptenc/scryptenc.c' || echo '$(srcdir)/'`lib/scryptenc/scryptenc.c - -lib/scryptenc/scrypt-scryptenc.obj: lib/scryptenc/scryptenc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT lib/scryptenc/scrypt-scryptenc.obj -MD -MP -MF lib/scryptenc/$(DEPDIR)/scrypt-scryptenc.Tpo -c -o lib/scryptenc/scrypt-scryptenc.obj `if test -f 'lib/scryptenc/scryptenc.c'; then $(CYGPATH_W) 'lib/scryptenc/scryptenc.c'; else $(CYGPATH_W) '$(srcdir)/lib/scryptenc/scryptenc.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) lib/scryptenc/$(DEPDIR)/scrypt-scryptenc.Tpo lib/scryptenc/$(DEPDIR)/scrypt-scryptenc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib/scryptenc/scryptenc.c' object='lib/scryptenc/scrypt-scryptenc.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o lib/scryptenc/scrypt-scryptenc.obj `if test -f 'lib/scryptenc/scryptenc.c'; then $(CYGPATH_W) 'lib/scryptenc/scryptenc.c'; else $(CYGPATH_W) '$(srcdir)/lib/scryptenc/scryptenc.c'; fi` - -lib/scryptenc/scrypt-scryptenc_cpuperf.o: lib/scryptenc/scryptenc_cpuperf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT lib/scryptenc/scrypt-scryptenc_cpuperf.o -MD -MP -MF lib/scryptenc/$(DEPDIR)/scrypt-scryptenc_cpuperf.Tpo -c -o lib/scryptenc/scrypt-scryptenc_cpuperf.o `test -f 'lib/scryptenc/scryptenc_cpuperf.c' || echo '$(srcdir)/'`lib/scryptenc/scryptenc_cpuperf.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) lib/scryptenc/$(DEPDIR)/scrypt-scryptenc_cpuperf.Tpo lib/scryptenc/$(DEPDIR)/scrypt-scryptenc_cpuperf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib/scryptenc/scryptenc_cpuperf.c' object='lib/scryptenc/scrypt-scryptenc_cpuperf.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o lib/scryptenc/scrypt-scryptenc_cpuperf.o `test -f 'lib/scryptenc/scryptenc_cpuperf.c' || echo '$(srcdir)/'`lib/scryptenc/scryptenc_cpuperf.c - -lib/scryptenc/scrypt-scryptenc_cpuperf.obj: lib/scryptenc/scryptenc_cpuperf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT lib/scryptenc/scrypt-scryptenc_cpuperf.obj -MD -MP -MF lib/scryptenc/$(DEPDIR)/scrypt-scryptenc_cpuperf.Tpo -c -o lib/scryptenc/scrypt-scryptenc_cpuperf.obj `if test -f 'lib/scryptenc/scryptenc_cpuperf.c'; then $(CYGPATH_W) 'lib/scryptenc/scryptenc_cpuperf.c'; else $(CYGPATH_W) '$(srcdir)/lib/scryptenc/scryptenc_cpuperf.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) lib/scryptenc/$(DEPDIR)/scrypt-scryptenc_cpuperf.Tpo lib/scryptenc/$(DEPDIR)/scrypt-scryptenc_cpuperf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib/scryptenc/scryptenc_cpuperf.c' object='lib/scryptenc/scrypt-scryptenc_cpuperf.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o lib/scryptenc/scrypt-scryptenc_cpuperf.obj `if test -f 'lib/scryptenc/scryptenc_cpuperf.c'; then $(CYGPATH_W) 'lib/scryptenc/scryptenc_cpuperf.c'; else $(CYGPATH_W) '$(srcdir)/lib/scryptenc/scryptenc_cpuperf.c'; fi` - -lib/util/scrypt-memlimit.o: lib/util/memlimit.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT lib/util/scrypt-memlimit.o -MD -MP -MF lib/util/$(DEPDIR)/scrypt-memlimit.Tpo -c -o lib/util/scrypt-memlimit.o `test -f 'lib/util/memlimit.c' || echo '$(srcdir)/'`lib/util/memlimit.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) lib/util/$(DEPDIR)/scrypt-memlimit.Tpo lib/util/$(DEPDIR)/scrypt-memlimit.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib/util/memlimit.c' object='lib/util/scrypt-memlimit.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o lib/util/scrypt-memlimit.o `test -f 'lib/util/memlimit.c' || echo '$(srcdir)/'`lib/util/memlimit.c - -lib/util/scrypt-memlimit.obj: lib/util/memlimit.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -MT lib/util/scrypt-memlimit.obj -MD -MP -MF lib/util/$(DEPDIR)/scrypt-memlimit.Tpo -c -o lib/util/scrypt-memlimit.obj `if test -f 'lib/util/memlimit.c'; then $(CYGPATH_W) 'lib/util/memlimit.c'; else $(CYGPATH_W) '$(srcdir)/lib/util/memlimit.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) lib/util/$(DEPDIR)/scrypt-memlimit.Tpo lib/util/$(DEPDIR)/scrypt-memlimit.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib/util/memlimit.c' object='lib/util/scrypt-memlimit.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(scrypt_CFLAGS) $(CFLAGS) -c -o lib/util/scrypt-memlimit.obj `if test -f 'lib/util/memlimit.c'; then $(CYGPATH_W) 'lib/util/memlimit.c'; else $(CYGPATH_W) '$(srcdir)/lib/util/memlimit.c'; fi` -install-man1: $(dist_man_MANS) - @$(NORMAL_INSTALL) - @list1=''; \ - list2='$(dist_man_MANS)'; \ - test -n "$(man1dir)" \ - && test -n "`echo $$list1$$list2`" \ - || exit 0; \ - echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ - { for i in $$list1; do echo "$$i"; done; \ - if test -n "$$list2"; then \ - for i in $$list2; do echo "$$i"; done \ - | sed -n '/\.1[a-z]*$$/p'; \ - fi; \ - } | while read p; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; echo "$$p"; \ - done | \ - sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ - sed 'N;N;s,\n, ,g' | { \ - list=; while read file base inst; do \ - if test "$$base" = "$$inst"; then list="$$list $$file"; else \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ - fi; \ - done; \ - for i in $$list; do echo "$$i"; done | $(am__base_list) | \ - while read files; do \ - test -z "$$files" || { \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ - done; } - -uninstall-man1: - @$(NORMAL_UNINSTALL) - @list=''; test -n "$(man1dir)" || exit 0; \ - files=`{ for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ - } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-am -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-am - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscope: cscope.files - test ! -s cscope.files \ - || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) -clean-cscope: - -rm -f cscope.files -cscope.files: clean-cscope cscopelist -cscopelist: cscopelist-am - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -rm -f cscope.out cscope.in.out cscope.po.out cscope.files - -distdir: $(DISTFILES) - $(am__remove_distdir) - test -d "$(distdir)" || mkdir "$(distdir)" - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -755 \ - -exec chmod u+rwx,go+rx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r "$(distdir)" -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__post_remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__post_remove_distdir) - -dist-lzip: distdir - tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__post_remove_distdir) - -dist-xz: distdir - tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__post_remove_distdir) - -dist-tarZ: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__post_remove_distdir) - -dist-shar: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__post_remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__post_remove_distdir) - -dist dist-all: - $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' - $(am__post_remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lz*) \ - lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ - *.tar.xz*) \ - xz -dc $(distdir).tar.xz | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir) - chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst - chmod a-w $(distdir) - test -d $(distdir)/_build || exit 0; \ - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build/sub \ - && ../../configure \ - $(AM_DISTCHECK_CONFIGURE_FLAGS) \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=../.. --prefix="$$dc_install_base" \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ - && cd "$$am__cwd" \ - || exit 1 - $(am__post_remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' -distuninstallcheck: - @test -n '$(distuninstallcheck_dir)' || { \ - echo 'ERROR: trying to run $@ with an empty' \ - '$$(distuninstallcheck_dir)' >&2; \ - exit 1; \ - }; \ - $(am__cd) '$(distuninstallcheck_dir)' || { \ - echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ - exit 1; \ - }; \ - test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(MANS) config.h -installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -rm -f lib/crypto/$(DEPDIR)/$(am__dirstamp) - -rm -f lib/crypto/$(am__dirstamp) - -rm -f lib/scryptenc/$(DEPDIR)/$(am__dirstamp) - -rm -f lib/scryptenc/$(am__dirstamp) - -rm -f lib/util/$(DEPDIR)/$(am__dirstamp) - -rm -f lib/util/$(am__dirstamp) - -rm -f libcperciva/alg/$(DEPDIR)/$(am__dirstamp) - -rm -f libcperciva/alg/$(am__dirstamp) - -rm -f libcperciva/cpusupport/$(DEPDIR)/$(am__dirstamp) - -rm -f libcperciva/cpusupport/$(am__dirstamp) - -rm -f libcperciva/crypto/$(DEPDIR)/$(am__dirstamp) - -rm -f libcperciva/crypto/$(am__dirstamp) - -rm -f libcperciva/util/$(DEPDIR)/$(am__dirstamp) - -rm -f libcperciva/util/$(am__dirstamp) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -clean: clean-am - -clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf ./$(DEPDIR) lib/crypto/$(DEPDIR) lib/scryptenc/$(DEPDIR) lib/util/$(DEPDIR) libcperciva/alg/$(DEPDIR) libcperciva/cpusupport/$(DEPDIR) libcperciva/crypto/$(DEPDIR) libcperciva/util/$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-hdr distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-man - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-binPROGRAMS - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: install-man1 - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf ./$(DEPDIR) lib/crypto/$(DEPDIR) lib/scryptenc/$(DEPDIR) lib/util/$(DEPDIR) libcperciva/alg/$(DEPDIR) libcperciva/cpusupport/$(DEPDIR) libcperciva/crypto/$(DEPDIR) libcperciva/util/$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-binPROGRAMS uninstall-man - -uninstall-man: uninstall-man1 - -.MAKE: all check install install-am install-strip - -.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \ - clean-binPROGRAMS clean-cscope clean-generic \ - clean-noinstLIBRARIES cscope cscopelist-am ctags ctags-am dist \ - dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-compile \ - distclean-generic distclean-hdr distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-binPROGRAMS install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-man1 install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-man \ - uninstall-man1 - -.PRECIOUS: Makefile - - -cpusupport-config.h: - ( export CC="${CC}"; export CFLAGS="${CFLAGS}"; command -p sh $(srcdir)/libcperciva/cpusupport/Build/cpusupport.sh "$$PATH") > cpusupport-config.h.tmp && command -p mv cpusupport-config.h.tmp cpusupport-config.h - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/autocrap/Makefile.am b/vendor/scrypt/scrypt-1.2.0/scrypt/autocrap/Makefile.am deleted file mode 100644 index 556cb42a..00000000 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/autocrap/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -AUTOMAKE_OPTIONS= foreign subdir-objects - -bin_PROGRAMS= scrypt -dist_man_MANS=$(scrypt_man_MANS) - -scrypt_SOURCES= main.c \ - libcperciva/alg/sha256.c \ - libcperciva/cpusupport/cpusupport_x86_aesni.c \ - libcperciva/cpusupport/cpusupport_x86_sse2.c \ - libcperciva/crypto/crypto_aes.c \ - libcperciva/crypto/crypto_aesctr.c \ - libcperciva/crypto/crypto_entropy.c \ - libcperciva/util/entropy.c \ - libcperciva/util/insecure_memzero.c \ - libcperciva/util/readpass.c \ - libcperciva/util/warnp.c \ - lib/crypto/crypto_scrypt.c \ - lib/crypto/crypto_scrypt_smix.c \ - lib/scryptenc/scryptenc.c \ - lib/scryptenc/scryptenc_cpuperf.c \ - lib/util/memlimit.c \ - cpusupport-config.h -scrypt_CFLAGS= -I $(srcdir)/libcperciva/alg \ - -I $(srcdir)/libcperciva/cpusupport \ - -I $(srcdir)/libcperciva/crypto \ - -I $(srcdir)/libcperciva/util \ - -I $(srcdir)/lib/crypto \ - -I $(srcdir)/lib/scryptenc \ - -I $(srcdir)/lib/util \ - -I . -D CPUSUPPORT_CONFIG_FILE=\"cpusupport-config.h\" -scrypt_LDADD= -lcrypto libcperciva_aesni.a libscrypt_sse2.a -scrypt_man_MANS= scrypt.1 - -cpusupport-config.h: - ( export CC="${CC}"; export CFLAGS="${CFLAGS}"; command -p sh $(srcdir)/libcperciva/cpusupport/Build/cpusupport.sh ) > cpusupport-config.h.tmp && command -p mv cpusupport-config.h.tmp cpusupport-config.h -BUILT_SOURCES= cpusupport-config.h -CLEANFILES= cpusupport-config.h cpusupport-config.h.tmp - -noinst_LIBRARIES= libcperciva_aesni.a -libcperciva_aesni_a_SOURCES= libcperciva/crypto/crypto_aes_aesni.c -libcperciva_aesni_a_CFLAGS= $(scrypt_CFLAGS) \ - `. ./cpusupport-config.h; echo $${CFLAGS_X86_AESNI}` - -noinst_LIBRARIES+= libscrypt_sse2.a -libscrypt_sse2_a_SOURCES= lib/crypto/crypto_scrypt_smix_sse2.c -libscrypt_sse2_a_CFLAGS= $(scrypt_CFLAGS) \ - `. ./cpusupport-config.h; echo $${CFLAGS_X86_SSE2}` diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/cpusupport.h b/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/cpusupport.h deleted file mode 100644 index 36d3a07c..00000000 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/cpusupport.h +++ /dev/null @@ -1,64 +0,0 @@ -#ifndef _CPUSUPPORT_H_ -#define _CPUSUPPORT_H_ - -/* - * To enable support for non-portable CPU features at compile time, one or - * more CPUSUPPORT_ARCH_FEATURE macros should be defined. This can be done - * directly on the compiler command line; or a file can be created with the - * necessary #define lines and then -D CPUSUPPORT_CONFIG_FILE=cpuconfig.h - * (or similar) can be provided to include that file here. - */ -#ifdef CPUSUPPORT_CONFIG_FILE -#include CPUSUPPORT_CONFIG_FILE -#endif - -/* - * The CPUSUPPORT_FEATURE macro declares the necessary variables and - * functions for detecting CPU feature support at run time. The function - * defined in the macro acts to cache the result of the ..._detect function - * using the ..._present and ..._init variables. - */ -#define CPUSUPPORT_FEATURE(arch, feature) \ - extern int cpusupport_ ## arch ## _ ## feature ## _present; \ - extern int cpusupport_ ## arch ## _ ## feature ## _init; \ - int cpusupport_ ## arch ## _ ## feature ## _detect(void); \ - \ - static inline int \ - cpusupport_ ## arch ## _ ## feature(void) \ - { \ - \ - if (cpusupport_ ## arch ## _ ## feature ## _present) \ - return (1); \ - else if (cpusupport_ ## arch ## _ ## feature ## _init) \ - return (0); \ - cpusupport_ ## arch ## _ ## feature ## _present = \ - cpusupport_ ## arch ##_ ## feature ## _detect(); \ - cpusupport_ ## arch ## _ ## feature ## _init = 1; \ - return (cpusupport_ ## arch ## _ ## feature ## _present); \ - } \ - struct cpusupport_ ## arch ## _ ## feature ## _dummy - -/* - * CPUSUPPORT_FEATURE_DECL(arch, feature): - * Macro which defines variables and provides a function declaration for - * detecting the presence of "feature" on the "arch" architecture. The - * function body following this macro expansion must return nonzero if the - * feature is present, or zero if the feature is not present or the detection - * fails for any reason. - */ -#define CPUSUPPORT_FEATURE_DECL(arch, feature) \ - int cpusupport_ ## arch ## _ ## feature ## _present = 0; \ - int cpusupport_ ## arch ## _ ## feature ## _init = 0; \ - int \ - cpusupport_ ## arch ## _ ## feature ## _detect(void) - -/* - * Any features listed here must have associated C files compiled and linked - * in, since the macro references symbols which must be defined. Projects - * which do not need to detect certain CPU features may wish to remove lines - * from this list so that the associated C files can be omitted. - */ -CPUSUPPORT_FEATURE(x86, aesni); -CPUSUPPORT_FEATURE(x86, sse2); - -#endif /* !_CPUSUPPORT_H_ */ diff --git a/vendor/scrypt/scrypt-1.2.1/scrypt/BUILDING b/vendor/scrypt/scrypt-1.2.1/scrypt/BUILDING new file mode 100644 index 00000000..a0e0dbc6 --- /dev/null +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/BUILDING @@ -0,0 +1,46 @@ +Installing +---------- + +We strongly recommend that people use the latest official release tarball on +https://www.tarsnap.com/scrypt.html, and build with: + + ./configure + make + make install + + +Platform-specific notes +----------------------- + +- On OS X, the version of OpenSSL included with the operating + system is outdated (0.9.8) and deprecated, and it is recommended + that scrypt be built with an updated version of OpenSSL. On OS X + 10.11 "El Capitan" and higher, OpenSSL was removed entirely. After + installing a newer version of OpenSSL, use + CPPFLAGS="-I /path/to/openssl/headers" + LDFLAGS="-L /path/to/openssl/lib" + to build scrypt. + + In particular, if you installed OpenSSL using homebrew, you may + pass the relevant directories directly to ./configure: + ./configure CPPFLAGS="-I/usr/local/opt/openssl/include" LDFLAGS="-L/usr/local/opt/openssl/lib" + + Alternatively, you may with to add these lines to your $HOME/.profile file: + export CPPFLAGS="-I/usr/local/opt/openssl/include $CPPFLAGS" + export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS" + and then close & re-open your terminal window. + + +Building from git +----------------- + +For experimental development from git, build with: + + autoreconf -i + ./configure + make + +- You must have automake 1.11.2 or higher. +- In order to support the `AX_CFLAGS_WARN_ALL` autoconf directive, you will + need to install the autoconf archive. On Debian systems, use the + `autoconf-archive` package; on FreeBSD, use `devel/autoconf-archive`. diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/COPYRIGHT b/vendor/scrypt/scrypt-1.2.1/scrypt/COPYRIGHT similarity index 85% rename from vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/COPYRIGHT rename to vendor/scrypt/scrypt-1.2.1/scrypt/COPYRIGHT index c6794b7f..d6438457 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/COPYRIGHT +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/COPYRIGHT @@ -1,7 +1,8 @@ -The code and documentation in this directory ("libcperciva") is distributed -under the following terms: +The included code and documentation ("scrypt") is distributed under the +following terms: -Copyright 2005-2014 Colin Percival. All rights reserved. +Copyright 2005-2016 Colin Percival. All rights reserved. +Copyright 2005-2016 Tarsnap Backup Inc. All rights reserved. Copyright 2014 Sean Kelly. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/FORMAT b/vendor/scrypt/scrypt-1.2.1/scrypt/FORMAT similarity index 100% rename from vendor/scrypt/scrypt-1.2.0/scrypt/FORMAT rename to vendor/scrypt/scrypt-1.2.1/scrypt/FORMAT diff --git a/vendor/scrypt/scrypt-1.2.1/scrypt/Makefile.in b/vendor/scrypt/scrypt-1.2.1/scrypt/Makefile.in new file mode 100644 index 00000000..00020606 --- /dev/null +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/Makefile.in @@ -0,0 +1,1216 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +bin_PROGRAMS = scrypt$(EXEEXT) +noinst_PROGRAMS = tests/test_scrypt$(EXEEXT) \ + tests/valgrind/potential-memleaks$(EXEEXT) +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +LIBRARIES = $(noinst_LIBRARIES) +ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = +libcperciva_aesni_a_AR = $(AR) $(ARFLAGS) +libcperciva_aesni_a_LIBADD = +am__dirstamp = $(am__leading_dot)dirstamp +am_libcperciva_aesni_a_OBJECTS = libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.$(OBJEXT) +libcperciva_aesni_a_OBJECTS = $(am_libcperciva_aesni_a_OBJECTS) +libscrypt_sse2_a_AR = $(AR) $(ARFLAGS) +libscrypt_sse2_a_LIBADD = +am_libscrypt_sse2_a_OBJECTS = \ + lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.$(OBJEXT) +libscrypt_sse2_a_OBJECTS = $(am_libscrypt_sse2_a_OBJECTS) +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" +PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) +am_scrypt_OBJECTS = main.$(OBJEXT) libcperciva/alg/sha256.$(OBJEXT) \ + libcperciva/cpusupport/cpusupport_x86_aesni.$(OBJEXT) \ + libcperciva/cpusupport/cpusupport_x86_sse2.$(OBJEXT) \ + libcperciva/crypto/crypto_aes.$(OBJEXT) \ + libcperciva/crypto/crypto_aesctr.$(OBJEXT) \ + libcperciva/crypto/crypto_entropy.$(OBJEXT) \ + libcperciva/util/asprintf.$(OBJEXT) \ + libcperciva/util/entropy.$(OBJEXT) \ + libcperciva/util/getopt.$(OBJEXT) \ + libcperciva/util/humansize.$(OBJEXT) \ + libcperciva/util/insecure_memzero.$(OBJEXT) \ + libcperciva/util/readpass.$(OBJEXT) \ + libcperciva/util/warnp.$(OBJEXT) \ + lib/crypto/crypto_scrypt.$(OBJEXT) \ + lib/crypto/crypto_scrypt_smix.$(OBJEXT) \ + lib/scryptenc/scryptenc.$(OBJEXT) \ + lib/scryptenc/scryptenc_cpuperf.$(OBJEXT) \ + lib/util/memlimit.$(OBJEXT) +scrypt_OBJECTS = $(am_scrypt_OBJECTS) +scrypt_DEPENDENCIES = libcperciva_aesni.a libscrypt_sse2.a +am_tests_test_scrypt_OBJECTS = tests/test_scrypt.$(OBJEXT) \ + libcperciva/alg/sha256.$(OBJEXT) \ + libcperciva/cpusupport/cpusupport_x86_sse2.$(OBJEXT) \ + libcperciva/util/insecure_memzero.$(OBJEXT) \ + libcperciva/util/warnp.$(OBJEXT) \ + lib/crypto/crypto_scrypt.$(OBJEXT) \ + lib/crypto/crypto_scrypt_smix.$(OBJEXT) +tests_test_scrypt_OBJECTS = $(am_tests_test_scrypt_OBJECTS) +tests_test_scrypt_DEPENDENCIES = libscrypt_sse2.a +am_tests_valgrind_potential_memleaks_OBJECTS = \ + tests/valgrind/potential-memleaks.$(OBJEXT) +tests_valgrind_potential_memleaks_OBJECTS = \ + $(am_tests_valgrind_potential_memleaks_OBJECTS) +tests_valgrind_potential_memleaks_LDADD = $(LDADD) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ +depcomp = $(SHELL) $(top_srcdir)/config.aux/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libcperciva_aesni_a_SOURCES) $(libscrypt_sse2_a_SOURCES) \ + $(scrypt_SOURCES) $(tests_test_scrypt_SOURCES) \ + $(tests_valgrind_potential_memleaks_SOURCES) +DIST_SOURCES = $(libcperciva_aesni_a_SOURCES) \ + $(libscrypt_sse2_a_SOURCES) $(scrypt_SOURCES) \ + $(tests_test_scrypt_SOURCES) \ + $(tests_valgrind_potential_memleaks_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +man1dir = $(mandir)/man1 +NROFF = nroff +MANS = $(dist_man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +CSCOPE = cscope +AM_RECURSIVE_TARGETS = cscope +am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \ + $(srcdir)/config.h.in $(top_srcdir)/config.aux/ar-lib \ + $(top_srcdir)/config.aux/compile \ + $(top_srcdir)/config.aux/depcomp \ + $(top_srcdir)/config.aux/install-sh \ + $(top_srcdir)/config.aux/missing config.aux/ar-lib \ + config.aux/compile config.aux/depcomp config.aux/install-sh \ + config.aux/missing +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) +DIST_ARCHIVES = $(distdir).tar.gz +GZIP_ENV = --best +DIST_TARGETS = dist-gzip +distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build_alias = @build_alias@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host_alias = @host_alias@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +dist_man_MANS = $(scrypt_man_MANS) +scrypt_SOURCES = main.c \ + libcperciva/alg/sha256.c \ + libcperciva/cpusupport/cpusupport_x86_aesni.c \ + libcperciva/cpusupport/cpusupport_x86_sse2.c \ + libcperciva/crypto/crypto_aes.c \ + libcperciva/crypto/crypto_aesctr.c \ + libcperciva/crypto/crypto_entropy.c \ + libcperciva/util/asprintf.c \ + libcperciva/util/entropy.c \ + libcperciva/util/getopt.c \ + libcperciva/util/humansize.c \ + libcperciva/util/insecure_memzero.c \ + libcperciva/util/readpass.c \ + libcperciva/util/warnp.c \ + lib/crypto/crypto_scrypt.c \ + lib/crypto/crypto_scrypt_smix.c \ + lib/scryptenc/scryptenc.c \ + lib/scryptenc/scryptenc_cpuperf.c \ + lib/util/memlimit.c \ + lib/crypto/crypto_scrypt.h \ + lib/crypto/crypto_scrypt_smix.h \ + lib/crypto/crypto_scrypt_smix_sse2.h \ + lib/scryptenc/scryptenc.h \ + lib/scryptenc/scryptenc_cpuperf.h \ + lib/util/memlimit.h \ + libcperciva/alg/sha256.h \ + libcperciva/cpusupport/cpusupport.h \ + libcperciva/crypto/crypto_aes.h \ + libcperciva/crypto/crypto_aes_aesni.h \ + libcperciva/crypto/crypto_aesctr.h \ + libcperciva/crypto/crypto_entropy.h \ + libcperciva/util/asprintf.h \ + libcperciva/util/entropy.h \ + libcperciva/util/getopt.h \ + libcperciva/util/humansize.h \ + libcperciva/util/insecure_memzero.h \ + libcperciva/util/readpass.h \ + libcperciva/util/sysendian.h \ + libcperciva/util/warnp.h \ + scrypt_platform.h + +AM_CPPFLAGS = -I$(srcdir)/libcperciva/alg \ + -I$(srcdir)/libcperciva/cpusupport \ + -I$(srcdir)/libcperciva/crypto \ + -I$(srcdir)/libcperciva/util \ + -I$(srcdir)/lib/crypto \ + -I$(srcdir)/lib/scryptenc \ + -I$(srcdir)/lib/util \ + -DCPUSUPPORT_CONFIG_FILE=\"cpusupport-config.h\" \ + -D_POSIX_C_SOURCE=200809L + +scrypt_LDADD = libcperciva_aesni.a libscrypt_sse2.a +scrypt_man_MANS = scrypt.1 +BUILT_SOURCES = cpusupport-config.h +CLEANFILES = cpusupport-config.h cpusupport-config.h.tmp +noinst_LIBRARIES = libcperciva_aesni.a libscrypt_sse2.a +libcperciva_aesni_a_SOURCES = libcperciva/crypto/crypto_aes_aesni.c +libcperciva_aesni_a_CFLAGS = `. ./cpusupport-config.h; echo $${CFLAGS_X86_AESNI}` +libscrypt_sse2_a_SOURCES = lib/crypto/crypto_scrypt_smix_sse2.c +libscrypt_sse2_a_CFLAGS = `. ./cpusupport-config.h; echo $${CFLAGS_X86_SSE2}` +EXTRA_DIST = \ + COPYRIGHT \ + FORMAT \ + lib/README \ + README.md \ + lib/crypto/crypto_scrypt-ref.c \ + libcperciva/cpusupport/Build/cpusupport-X86-AESNI.c \ + libcperciva/cpusupport/Build/cpusupport-X86-CPUID.c \ + libcperciva/cpusupport/Build/cpusupport-X86-SSE2.c \ + libcperciva/cpusupport/Build/cpusupport.sh \ + tests/test_scrypt.good \ + tests/test_scrypt_good.enc \ + tests/shared_test_functions.sh \ + tests/01-known-values.sh \ + tests/02-decrypt-reference-file.sh \ + tests/03-encrypt-decrypt-file.sh \ + tests/04-force-resources.sh \ + tests/05-system-scrypt-encrypt-decrypt.sh \ + tests/test_scrypt.sh + +tests_test_scrypt_SOURCES = tests/test_scrypt.c \ + libcperciva/alg/sha256.c \ + libcperciva/alg/sha256.h \ + libcperciva/cpusupport/cpusupport_x86_sse2.c \ + libcperciva/util/insecure_memzero.c \ + libcperciva/util/insecure_memzero.h \ + libcperciva/util/warnp.c \ + libcperciva/util/warnp.h \ + lib/crypto/crypto_scrypt.c \ + lib/crypto/crypto_scrypt.h \ + lib/crypto/crypto_scrypt_smix.c \ + lib/crypto/crypto_scrypt_smix.h + +tests_test_scrypt_LDADD = libscrypt_sse2.a +tests_valgrind_potential_memleaks_SOURCES = tests/valgrind/potential-memleaks.c +all: $(BUILT_SOURCES) config.h + $(MAKE) $(AM_MAKEFLAGS) all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +am--refresh: Makefile + @: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + $(am__cd) $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): + +config.h: stamp-h1 + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) + rm -f stamp-h1 + touch $@ + +distclean-hdr: + -rm -f config.h stamp-h1 + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) +libcperciva/crypto/$(am__dirstamp): + @$(MKDIR_P) libcperciva/crypto + @: > libcperciva/crypto/$(am__dirstamp) +libcperciva/crypto/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) libcperciva/crypto/$(DEPDIR) + @: > libcperciva/crypto/$(DEPDIR)/$(am__dirstamp) +libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.$(OBJEXT): \ + libcperciva/crypto/$(am__dirstamp) \ + libcperciva/crypto/$(DEPDIR)/$(am__dirstamp) + +libcperciva_aesni.a: $(libcperciva_aesni_a_OBJECTS) $(libcperciva_aesni_a_DEPENDENCIES) $(EXTRA_libcperciva_aesni_a_DEPENDENCIES) + $(AM_V_at)-rm -f libcperciva_aesni.a + $(AM_V_AR)$(libcperciva_aesni_a_AR) libcperciva_aesni.a $(libcperciva_aesni_a_OBJECTS) $(libcperciva_aesni_a_LIBADD) + $(AM_V_at)$(RANLIB) libcperciva_aesni.a +lib/crypto/$(am__dirstamp): + @$(MKDIR_P) lib/crypto + @: > lib/crypto/$(am__dirstamp) +lib/crypto/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) lib/crypto/$(DEPDIR) + @: > lib/crypto/$(DEPDIR)/$(am__dirstamp) +lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.$(OBJEXT): \ + lib/crypto/$(am__dirstamp) \ + lib/crypto/$(DEPDIR)/$(am__dirstamp) + +libscrypt_sse2.a: $(libscrypt_sse2_a_OBJECTS) $(libscrypt_sse2_a_DEPENDENCIES) $(EXTRA_libscrypt_sse2_a_DEPENDENCIES) + $(AM_V_at)-rm -f libscrypt_sse2.a + $(AM_V_AR)$(libscrypt_sse2_a_AR) libscrypt_sse2.a $(libscrypt_sse2_a_OBJECTS) $(libscrypt_sse2_a_LIBADD) + $(AM_V_at)$(RANLIB) libscrypt_sse2.a +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + +clean-noinstPROGRAMS: + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) +libcperciva/alg/$(am__dirstamp): + @$(MKDIR_P) libcperciva/alg + @: > libcperciva/alg/$(am__dirstamp) +libcperciva/alg/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) libcperciva/alg/$(DEPDIR) + @: > libcperciva/alg/$(DEPDIR)/$(am__dirstamp) +libcperciva/alg/sha256.$(OBJEXT): libcperciva/alg/$(am__dirstamp) \ + libcperciva/alg/$(DEPDIR)/$(am__dirstamp) +libcperciva/cpusupport/$(am__dirstamp): + @$(MKDIR_P) libcperciva/cpusupport + @: > libcperciva/cpusupport/$(am__dirstamp) +libcperciva/cpusupport/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) libcperciva/cpusupport/$(DEPDIR) + @: > libcperciva/cpusupport/$(DEPDIR)/$(am__dirstamp) +libcperciva/cpusupport/cpusupport_x86_aesni.$(OBJEXT): \ + libcperciva/cpusupport/$(am__dirstamp) \ + libcperciva/cpusupport/$(DEPDIR)/$(am__dirstamp) +libcperciva/cpusupport/cpusupport_x86_sse2.$(OBJEXT): \ + libcperciva/cpusupport/$(am__dirstamp) \ + libcperciva/cpusupport/$(DEPDIR)/$(am__dirstamp) +libcperciva/crypto/crypto_aes.$(OBJEXT): \ + libcperciva/crypto/$(am__dirstamp) \ + libcperciva/crypto/$(DEPDIR)/$(am__dirstamp) +libcperciva/crypto/crypto_aesctr.$(OBJEXT): \ + libcperciva/crypto/$(am__dirstamp) \ + libcperciva/crypto/$(DEPDIR)/$(am__dirstamp) +libcperciva/crypto/crypto_entropy.$(OBJEXT): \ + libcperciva/crypto/$(am__dirstamp) \ + libcperciva/crypto/$(DEPDIR)/$(am__dirstamp) +libcperciva/util/$(am__dirstamp): + @$(MKDIR_P) libcperciva/util + @: > libcperciva/util/$(am__dirstamp) +libcperciva/util/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) libcperciva/util/$(DEPDIR) + @: > libcperciva/util/$(DEPDIR)/$(am__dirstamp) +libcperciva/util/asprintf.$(OBJEXT): libcperciva/util/$(am__dirstamp) \ + libcperciva/util/$(DEPDIR)/$(am__dirstamp) +libcperciva/util/entropy.$(OBJEXT): libcperciva/util/$(am__dirstamp) \ + libcperciva/util/$(DEPDIR)/$(am__dirstamp) +libcperciva/util/getopt.$(OBJEXT): libcperciva/util/$(am__dirstamp) \ + libcperciva/util/$(DEPDIR)/$(am__dirstamp) +libcperciva/util/humansize.$(OBJEXT): \ + libcperciva/util/$(am__dirstamp) \ + libcperciva/util/$(DEPDIR)/$(am__dirstamp) +libcperciva/util/insecure_memzero.$(OBJEXT): \ + libcperciva/util/$(am__dirstamp) \ + libcperciva/util/$(DEPDIR)/$(am__dirstamp) +libcperciva/util/readpass.$(OBJEXT): libcperciva/util/$(am__dirstamp) \ + libcperciva/util/$(DEPDIR)/$(am__dirstamp) +libcperciva/util/warnp.$(OBJEXT): libcperciva/util/$(am__dirstamp) \ + libcperciva/util/$(DEPDIR)/$(am__dirstamp) +lib/crypto/crypto_scrypt.$(OBJEXT): lib/crypto/$(am__dirstamp) \ + lib/crypto/$(DEPDIR)/$(am__dirstamp) +lib/crypto/crypto_scrypt_smix.$(OBJEXT): lib/crypto/$(am__dirstamp) \ + lib/crypto/$(DEPDIR)/$(am__dirstamp) +lib/scryptenc/$(am__dirstamp): + @$(MKDIR_P) lib/scryptenc + @: > lib/scryptenc/$(am__dirstamp) +lib/scryptenc/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) lib/scryptenc/$(DEPDIR) + @: > lib/scryptenc/$(DEPDIR)/$(am__dirstamp) +lib/scryptenc/scryptenc.$(OBJEXT): lib/scryptenc/$(am__dirstamp) \ + lib/scryptenc/$(DEPDIR)/$(am__dirstamp) +lib/scryptenc/scryptenc_cpuperf.$(OBJEXT): \ + lib/scryptenc/$(am__dirstamp) \ + lib/scryptenc/$(DEPDIR)/$(am__dirstamp) +lib/util/$(am__dirstamp): + @$(MKDIR_P) lib/util + @: > lib/util/$(am__dirstamp) +lib/util/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) lib/util/$(DEPDIR) + @: > lib/util/$(DEPDIR)/$(am__dirstamp) +lib/util/memlimit.$(OBJEXT): lib/util/$(am__dirstamp) \ + lib/util/$(DEPDIR)/$(am__dirstamp) + +scrypt$(EXEEXT): $(scrypt_OBJECTS) $(scrypt_DEPENDENCIES) $(EXTRA_scrypt_DEPENDENCIES) + @rm -f scrypt$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(scrypt_OBJECTS) $(scrypt_LDADD) $(LIBS) +tests/$(am__dirstamp): + @$(MKDIR_P) tests + @: > tests/$(am__dirstamp) +tests/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) tests/$(DEPDIR) + @: > tests/$(DEPDIR)/$(am__dirstamp) +tests/test_scrypt.$(OBJEXT): tests/$(am__dirstamp) \ + tests/$(DEPDIR)/$(am__dirstamp) + +tests/test_scrypt$(EXEEXT): $(tests_test_scrypt_OBJECTS) $(tests_test_scrypt_DEPENDENCIES) $(EXTRA_tests_test_scrypt_DEPENDENCIES) tests/$(am__dirstamp) + @rm -f tests/test_scrypt$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(tests_test_scrypt_OBJECTS) $(tests_test_scrypt_LDADD) $(LIBS) +tests/valgrind/$(am__dirstamp): + @$(MKDIR_P) tests/valgrind + @: > tests/valgrind/$(am__dirstamp) +tests/valgrind/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) tests/valgrind/$(DEPDIR) + @: > tests/valgrind/$(DEPDIR)/$(am__dirstamp) +tests/valgrind/potential-memleaks.$(OBJEXT): \ + tests/valgrind/$(am__dirstamp) \ + tests/valgrind/$(DEPDIR)/$(am__dirstamp) + +tests/valgrind/potential-memleaks$(EXEEXT): $(tests_valgrind_potential_memleaks_OBJECTS) $(tests_valgrind_potential_memleaks_DEPENDENCIES) $(EXTRA_tests_valgrind_potential_memleaks_DEPENDENCIES) tests/valgrind/$(am__dirstamp) + @rm -f tests/valgrind/potential-memleaks$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(tests_valgrind_potential_memleaks_OBJECTS) $(tests_valgrind_potential_memleaks_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + -rm -f lib/crypto/*.$(OBJEXT) + -rm -f lib/scryptenc/*.$(OBJEXT) + -rm -f lib/util/*.$(OBJEXT) + -rm -f libcperciva/alg/*.$(OBJEXT) + -rm -f libcperciva/cpusupport/*.$(OBJEXT) + -rm -f libcperciva/crypto/*.$(OBJEXT) + -rm -f libcperciva/util/*.$(OBJEXT) + -rm -f tests/*.$(OBJEXT) + -rm -f tests/valgrind/*.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/crypto/$(DEPDIR)/crypto_scrypt.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/crypto/$(DEPDIR)/crypto_scrypt_smix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/crypto/$(DEPDIR)/libscrypt_sse2_a-crypto_scrypt_smix_sse2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/scryptenc/$(DEPDIR)/scryptenc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/scryptenc/$(DEPDIR)/scryptenc_cpuperf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/util/$(DEPDIR)/memlimit.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/alg/$(DEPDIR)/sha256.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/cpusupport/$(DEPDIR)/cpusupport_x86_aesni.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/cpusupport/$(DEPDIR)/cpusupport_x86_sse2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/crypto/$(DEPDIR)/crypto_aes.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/crypto/$(DEPDIR)/crypto_aesctr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/crypto/$(DEPDIR)/crypto_entropy.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/crypto/$(DEPDIR)/libcperciva_aesni_a-crypto_aes_aesni.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/util/$(DEPDIR)/asprintf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/util/$(DEPDIR)/entropy.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/util/$(DEPDIR)/getopt.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/util/$(DEPDIR)/humansize.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/util/$(DEPDIR)/insecure_memzero.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/util/$(DEPDIR)/readpass.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libcperciva/util/$(DEPDIR)/warnp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test_scrypt.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tests/valgrind/$(DEPDIR)/potential-memleaks.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.o: libcperciva/crypto/crypto_aes_aesni.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcperciva_aesni_a_CFLAGS) $(CFLAGS) -MT libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.o -MD -MP -MF libcperciva/crypto/$(DEPDIR)/libcperciva_aesni_a-crypto_aes_aesni.Tpo -c -o libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.o `test -f 'libcperciva/crypto/crypto_aes_aesni.c' || echo '$(srcdir)/'`libcperciva/crypto/crypto_aes_aesni.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/crypto/$(DEPDIR)/libcperciva_aesni_a-crypto_aes_aesni.Tpo libcperciva/crypto/$(DEPDIR)/libcperciva_aesni_a-crypto_aes_aesni.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/crypto/crypto_aes_aesni.c' object='libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcperciva_aesni_a_CFLAGS) $(CFLAGS) -c -o libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.o `test -f 'libcperciva/crypto/crypto_aes_aesni.c' || echo '$(srcdir)/'`libcperciva/crypto/crypto_aes_aesni.c + +libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.obj: libcperciva/crypto/crypto_aes_aesni.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcperciva_aesni_a_CFLAGS) $(CFLAGS) -MT libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.obj -MD -MP -MF libcperciva/crypto/$(DEPDIR)/libcperciva_aesni_a-crypto_aes_aesni.Tpo -c -o libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.obj `if test -f 'libcperciva/crypto/crypto_aes_aesni.c'; then $(CYGPATH_W) 'libcperciva/crypto/crypto_aes_aesni.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/crypto/crypto_aes_aesni.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libcperciva/crypto/$(DEPDIR)/libcperciva_aesni_a-crypto_aes_aesni.Tpo libcperciva/crypto/$(DEPDIR)/libcperciva_aesni_a-crypto_aes_aesni.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libcperciva/crypto/crypto_aes_aesni.c' object='libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcperciva_aesni_a_CFLAGS) $(CFLAGS) -c -o libcperciva/crypto/libcperciva_aesni_a-crypto_aes_aesni.obj `if test -f 'libcperciva/crypto/crypto_aes_aesni.c'; then $(CYGPATH_W) 'libcperciva/crypto/crypto_aes_aesni.c'; else $(CYGPATH_W) '$(srcdir)/libcperciva/crypto/crypto_aes_aesni.c'; fi` + +lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.o: lib/crypto/crypto_scrypt_smix_sse2.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscrypt_sse2_a_CFLAGS) $(CFLAGS) -MT lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.o -MD -MP -MF lib/crypto/$(DEPDIR)/libscrypt_sse2_a-crypto_scrypt_smix_sse2.Tpo -c -o lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.o `test -f 'lib/crypto/crypto_scrypt_smix_sse2.c' || echo '$(srcdir)/'`lib/crypto/crypto_scrypt_smix_sse2.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) lib/crypto/$(DEPDIR)/libscrypt_sse2_a-crypto_scrypt_smix_sse2.Tpo lib/crypto/$(DEPDIR)/libscrypt_sse2_a-crypto_scrypt_smix_sse2.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib/crypto/crypto_scrypt_smix_sse2.c' object='lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscrypt_sse2_a_CFLAGS) $(CFLAGS) -c -o lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.o `test -f 'lib/crypto/crypto_scrypt_smix_sse2.c' || echo '$(srcdir)/'`lib/crypto/crypto_scrypt_smix_sse2.c + +lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.obj: lib/crypto/crypto_scrypt_smix_sse2.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscrypt_sse2_a_CFLAGS) $(CFLAGS) -MT lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.obj -MD -MP -MF lib/crypto/$(DEPDIR)/libscrypt_sse2_a-crypto_scrypt_smix_sse2.Tpo -c -o lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.obj `if test -f 'lib/crypto/crypto_scrypt_smix_sse2.c'; then $(CYGPATH_W) 'lib/crypto/crypto_scrypt_smix_sse2.c'; else $(CYGPATH_W) '$(srcdir)/lib/crypto/crypto_scrypt_smix_sse2.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) lib/crypto/$(DEPDIR)/libscrypt_sse2_a-crypto_scrypt_smix_sse2.Tpo lib/crypto/$(DEPDIR)/libscrypt_sse2_a-crypto_scrypt_smix_sse2.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib/crypto/crypto_scrypt_smix_sse2.c' object='lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscrypt_sse2_a_CFLAGS) $(CFLAGS) -c -o lib/crypto/libscrypt_sse2_a-crypto_scrypt_smix_sse2.obj `if test -f 'lib/crypto/crypto_scrypt_smix_sse2.c'; then $(CYGPATH_W) 'lib/crypto/crypto_scrypt_smix_sse2.c'; else $(CYGPATH_W) '$(srcdir)/lib/crypto/crypto_scrypt_smix_sse2.c'; fi` +install-man1: $(dist_man_MANS) + @$(NORMAL_INSTALL) + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ + } | while read p; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ + fi; \ + done; \ + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ + while read files; do \ + test -z "$$files" || { \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ + done; } + +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list=''; test -n "$(man1dir)" || exit 0; \ + files=`{ for i in $$list; do echo "$$i"; done; \ + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.1[a-z]*$$/p'; \ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files + +distdir: $(DISTFILES) + $(am__remove_distdir) + test -d "$(distdir)" || mkdir "$(distdir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r "$(distdir)" +dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__post_remove_distdir) + +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) + +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) + +dist-tarZ: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__post_remove_distdir) + +dist-shar: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__post_remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__post_remove_distdir) + +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst + chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=../.. --prefix="$$dc_install_base" \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 + $(am__post_remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' +distuninstallcheck: + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 +check-am: all-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(MANS) config.h +installdirs: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -rm -f lib/crypto/$(DEPDIR)/$(am__dirstamp) + -rm -f lib/crypto/$(am__dirstamp) + -rm -f lib/scryptenc/$(DEPDIR)/$(am__dirstamp) + -rm -f lib/scryptenc/$(am__dirstamp) + -rm -f lib/util/$(DEPDIR)/$(am__dirstamp) + -rm -f lib/util/$(am__dirstamp) + -rm -f libcperciva/alg/$(DEPDIR)/$(am__dirstamp) + -rm -f libcperciva/alg/$(am__dirstamp) + -rm -f libcperciva/cpusupport/$(DEPDIR)/$(am__dirstamp) + -rm -f libcperciva/cpusupport/$(am__dirstamp) + -rm -f libcperciva/crypto/$(DEPDIR)/$(am__dirstamp) + -rm -f libcperciva/crypto/$(am__dirstamp) + -rm -f libcperciva/util/$(DEPDIR)/$(am__dirstamp) + -rm -f libcperciva/util/$(am__dirstamp) + -rm -f tests/$(DEPDIR)/$(am__dirstamp) + -rm -f tests/$(am__dirstamp) + -rm -f tests/valgrind/$(DEPDIR)/$(am__dirstamp) + -rm -f tests/valgrind/$(am__dirstamp) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +clean: clean-am + +clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \ + clean-noinstPROGRAMS mostlyclean-am + +distclean: distclean-am + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf ./$(DEPDIR) lib/crypto/$(DEPDIR) lib/scryptenc/$(DEPDIR) lib/util/$(DEPDIR) libcperciva/alg/$(DEPDIR) libcperciva/cpusupport/$(DEPDIR) libcperciva/crypto/$(DEPDIR) libcperciva/util/$(DEPDIR) tests/$(DEPDIR) tests/valgrind/$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-hdr distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-man + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-binPROGRAMS + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: install-man1 + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -rf ./$(DEPDIR) lib/crypto/$(DEPDIR) lib/scryptenc/$(DEPDIR) lib/util/$(DEPDIR) libcperciva/alg/$(DEPDIR) libcperciva/cpusupport/$(DEPDIR) libcperciva/crypto/$(DEPDIR) libcperciva/util/$(DEPDIR) tests/$(DEPDIR) tests/valgrind/$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-binPROGRAMS uninstall-man + +uninstall-man: uninstall-man1 + +.MAKE: all check install install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \ + clean-binPROGRAMS clean-cscope clean-generic \ + clean-noinstLIBRARIES clean-noinstPROGRAMS cscope \ + cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ + dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ + distcheck distclean distclean-compile distclean-generic \ + distclean-hdr distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-man1 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-man \ + uninstall-man1 + +.PRECIOUS: Makefile + + +cpusupport-config.h: + ( export CC="${CC}"; export CFLAGS="${CFLAGS}"; command -p sh $(srcdir)/libcperciva/cpusupport/Build/cpusupport.sh "$$PATH") > cpusupport-config.h.tmp && command -p mv cpusupport-config.h.tmp cpusupport-config.h + +.PHONY: test +# we can't only build "scrypt tests/test_scrypt" because that won't build +# the BUILT_SOURCES. +test: all + $(top_srcdir)/tests/test_scrypt.sh . + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/vendor/scrypt/scrypt-1.2.1/scrypt/autotools/Makefile.am b/vendor/scrypt/scrypt-1.2.1/scrypt/autotools/Makefile.am new file mode 100644 index 00000000..f037aa66 --- /dev/null +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/autotools/Makefile.am @@ -0,0 +1,113 @@ +bin_PROGRAMS= scrypt +noinst_PROGRAMS= tests/test_scrypt tests/valgrind/potential-memleaks +dist_man_MANS=$(scrypt_man_MANS) + +scrypt_SOURCES= main.c \ + libcperciva/alg/sha256.c \ + libcperciva/cpusupport/cpusupport_x86_aesni.c \ + libcperciva/cpusupport/cpusupport_x86_sse2.c \ + libcperciva/crypto/crypto_aes.c \ + libcperciva/crypto/crypto_aesctr.c \ + libcperciva/crypto/crypto_entropy.c \ + libcperciva/util/asprintf.c \ + libcperciva/util/entropy.c \ + libcperciva/util/getopt.c \ + libcperciva/util/humansize.c \ + libcperciva/util/insecure_memzero.c \ + libcperciva/util/readpass.c \ + libcperciva/util/warnp.c \ + lib/crypto/crypto_scrypt.c \ + lib/crypto/crypto_scrypt_smix.c \ + lib/scryptenc/scryptenc.c \ + lib/scryptenc/scryptenc_cpuperf.c \ + lib/util/memlimit.c \ + lib/crypto/crypto_scrypt.h \ + lib/crypto/crypto_scrypt_smix.h \ + lib/crypto/crypto_scrypt_smix_sse2.h \ + lib/scryptenc/scryptenc.h \ + lib/scryptenc/scryptenc_cpuperf.h \ + lib/util/memlimit.h \ + libcperciva/alg/sha256.h \ + libcperciva/cpusupport/cpusupport.h \ + libcperciva/crypto/crypto_aes.h \ + libcperciva/crypto/crypto_aes_aesni.h \ + libcperciva/crypto/crypto_aesctr.h \ + libcperciva/crypto/crypto_entropy.h \ + libcperciva/util/asprintf.h \ + libcperciva/util/entropy.h \ + libcperciva/util/getopt.h \ + libcperciva/util/humansize.h \ + libcperciva/util/insecure_memzero.h \ + libcperciva/util/readpass.h \ + libcperciva/util/sysendian.h \ + libcperciva/util/warnp.h \ + scrypt_platform.h + +AM_CPPFLAGS= -I$(srcdir)/libcperciva/alg \ + -I$(srcdir)/libcperciva/cpusupport \ + -I$(srcdir)/libcperciva/crypto \ + -I$(srcdir)/libcperciva/util \ + -I$(srcdir)/lib/crypto \ + -I$(srcdir)/lib/scryptenc \ + -I$(srcdir)/lib/util \ + -DCPUSUPPORT_CONFIG_FILE=\"cpusupport-config.h\" \ + -D_POSIX_C_SOURCE=200809L + +scrypt_LDADD= libcperciva_aesni.a libscrypt_sse2.a +scrypt_man_MANS= scrypt.1 + +cpusupport-config.h: + ( export CC="${CC}"; export CFLAGS="${CFLAGS}"; command -p sh $(srcdir)/libcperciva/cpusupport/Build/cpusupport.sh "$$PATH") > cpusupport-config.h.tmp && command -p mv cpusupport-config.h.tmp cpusupport-config.h +BUILT_SOURCES= cpusupport-config.h +CLEANFILES= cpusupport-config.h cpusupport-config.h.tmp + +noinst_LIBRARIES= libcperciva_aesni.a +libcperciva_aesni_a_SOURCES= libcperciva/crypto/crypto_aes_aesni.c +libcperciva_aesni_a_CFLAGS=`. ./cpusupport-config.h; echo $${CFLAGS_X86_AESNI}` + +noinst_LIBRARIES+= libscrypt_sse2.a +libscrypt_sse2_a_SOURCES= lib/crypto/crypto_scrypt_smix_sse2.c +libscrypt_sse2_a_CFLAGS=`. ./cpusupport-config.h; echo $${CFLAGS_X86_SSE2}` + +EXTRA_DIST = \ + COPYRIGHT \ + FORMAT \ + lib/README \ + README.md \ + lib/crypto/crypto_scrypt-ref.c \ + libcperciva/cpusupport/Build/cpusupport-X86-AESNI.c \ + libcperciva/cpusupport/Build/cpusupport-X86-CPUID.c \ + libcperciva/cpusupport/Build/cpusupport-X86-SSE2.c \ + libcperciva/cpusupport/Build/cpusupport.sh \ + tests/test_scrypt.good \ + tests/test_scrypt_good.enc \ + tests/shared_test_functions.sh \ + tests/01-known-values.sh \ + tests/02-decrypt-reference-file.sh \ + tests/03-encrypt-decrypt-file.sh \ + tests/04-force-resources.sh \ + tests/05-system-scrypt-encrypt-decrypt.sh \ + tests/test_scrypt.sh + +tests_test_scrypt_SOURCES = tests/test_scrypt.c \ + libcperciva/alg/sha256.c \ + libcperciva/alg/sha256.h \ + libcperciva/cpusupport/cpusupport_x86_sse2.c \ + libcperciva/util/insecure_memzero.c \ + libcperciva/util/insecure_memzero.h \ + libcperciva/util/warnp.c \ + libcperciva/util/warnp.h \ + lib/crypto/crypto_scrypt.c \ + lib/crypto/crypto_scrypt.h \ + lib/crypto/crypto_scrypt_smix.c \ + lib/crypto/crypto_scrypt_smix.h + +tests_test_scrypt_LDADD= libscrypt_sse2.a + +tests_valgrind_potential_memleaks_SOURCES = tests/valgrind/potential-memleaks.c + +.PHONY: test +# we can't only build "scrypt tests/test_scrypt" because that won't build +# the BUILT_SOURCES. +test: all + $(top_srcdir)/tests/test_scrypt.sh . diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/autocrap/configure.ac b/vendor/scrypt/scrypt-1.2.1/scrypt/autotools/configure.ac similarity index 52% rename from vendor/scrypt/scrypt-1.2.0/scrypt/autocrap/configure.ac rename to vendor/scrypt/scrypt-1.2.1/scrypt/autotools/configure.ac index 24e03fdf..27bc8aad 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/autocrap/configure.ac +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/autotools/configure.ac @@ -1,17 +1,28 @@ -m4_define([SCRYPT_VERS],m4_include([scrypt-version])) -AC_INIT([scrypt],SCRYPT_VERS()) +AC_PREREQ([2.69]) +AC_INIT([scrypt],1.2.1, + [https://github.com/Tarsnap/scrypt],[scrypt],[http://www.tarsnap.com/scrypt/]) +AC_CONFIG_SRCDIR([lib/scryptenc/scryptenc.c]) AC_CONFIG_AUX_DIR([config.aux]) -AM_INIT_AUTOMAKE() -AC_PROG_CC +AC_CONFIG_MACRO_DIR([m4]) +AM_INIT_AUTOMAKE([foreign subdir-objects -Wall]) + +# Checks for programs. +AC_PROG_CC_C99 AC_PROG_RANLIB +AM_PROG_AR # Don't rebuild the configure script. I'm distributing a perfectly good one. AM_MAINTAINER_MODE +# Checks for libraries. + # Check for clock_gettime. On some systems, this is provided via librt. -AC_CHECK_LIB(rt, clock_gettime) +AC_SEARCH_LIBS([clock_gettime], [rt]) AC_CHECK_FUNCS([clock_gettime]) +AC_SEARCH_LIBS([AES_encrypt], [crypto],, + AC_MSG_ERROR([function AES_ENCRYPT not found])) + # Check for a linuxy sysinfo syscall; and while we're doing that, check if # struct sysinfo is the old version (total RAM == totalmem) or the new # version (total RAM == totalmem * mem_unit). @@ -25,6 +36,11 @@ AC_CHECK_MEMBERS([struct sysinfo.totalram, struct sysinfo.mem_unit], [], [], # to work. AC_CHECK_HEADERS([sys/param.h]) +# Check if we have , to fix the make failing when configure +# passes. +AC_CHECK_HEADERS([openssl/aes.h],, + [AC_MSG_ERROR([Unable to find the openssl/aes.h header])]) + # Check for . If it exists and it defines HW_USERMEM # and/or HW_MEMSIZE, we'll try using those as memory limits. AC_CHECK_HEADERS([sys/sysctl.h]) @@ -37,6 +53,17 @@ AC_CHECK_FUNCS([mmap]) AC_SYS_LARGEFILE +# Check whether the user has requested to disable compiler warnings +AC_MSG_CHECKING([compiler_warnings]) +AC_ARG_ENABLE(compiler_warnings, + AS_HELP_STRING([--disable-compiler-warnings], + [Do not request compiler warnings. @<:@default=enabled@:>@]), + [ac_compiler_warnings=$enableval], + [ac_compiler_warnings=yes]) +AC_MSG_RESULT([${ac_compiler_warnings}]) +AS_IF([test x${ac_compiler_warnings} = xyes], + [AX_CFLAGS_WARN_ALL]) + AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/vendor/scrypt/scrypt-1.2.1/scrypt/config.aux/ar-lib b/vendor/scrypt/scrypt-1.2.1/scrypt/config.aux/ar-lib new file mode 100755 index 00000000..463b9ec0 --- /dev/null +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/config.aux/ar-lib @@ -0,0 +1,270 @@ +#! /bin/sh +# Wrapper for Microsoft lib.exe + +me=ar-lib +scriptversion=2012-03-01.08; # UTC + +# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Written by Peter Rosin . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + + +# func_error message +func_error () +{ + echo "$me: $1" 1>&2 + exit 1 +} + +file_conv= + +# func_file_conv build_file +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv in + mingw) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_at_file at_file operation archive +# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE +# for each of them. +# When interpreting the content of the @FILE, do NOT use func_file_conv, +# since the user would need to supply preconverted file names to +# binutils ar, at least for MinGW. +func_at_file () +{ + operation=$2 + archive=$3 + at_file_contents=`cat "$1"` + eval set x "$at_file_contents" + shift + + for member + do + $AR -NOLOGO $operation:"$member" "$archive" || exit $? + done +} + +case $1 in + '') + func_error "no command. Try '$0 --help' for more information." + ;; + -h | --h*) + cat < header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the `rt' library (-lrt). */ -#undef HAVE_LIBRT - /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H /* Define to 1 if you have the `mmap' function. */ #undef HAVE_MMAP +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_AES_H + /* Define to 1 if you have the `posix_memalign' function. */ #undef HAVE_POSIX_MEMALIGN diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/configure b/vendor/scrypt/scrypt-1.2.1/scrypt/configure similarity index 91% rename from vendor/scrypt/scrypt-1.2.0/scrypt/configure rename to vendor/scrypt/scrypt-1.2.1/scrypt/configure index 94de63f2..d82e0d74 100755 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/configure +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/configure @@ -1,6 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for scrypt 1.2.0. +# Generated by GNU Autoconf 2.69 for scrypt 1.2.1. +# +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -264,7 +266,8 @@ fi $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, + $as_echo "$0: Please tell bug-autoconf@gnu.org and +$0: https://github.com/Tarsnap/scrypt about your system, $0: including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." @@ -577,11 +580,12 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='scrypt' PACKAGE_TARNAME='scrypt' -PACKAGE_VERSION='1.2.0' -PACKAGE_STRING='scrypt 1.2.0' -PACKAGE_BUGREPORT='' -PACKAGE_URL='' +PACKAGE_VERSION='1.2.1' +PACKAGE_STRING='scrypt 1.2.1' +PACKAGE_BUGREPORT='https://github.com/Tarsnap/scrypt' +PACKAGE_URL='http://www.tarsnap.com/scrypt/' +ac_unique_file="lib/scryptenc/scryptenc.c" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -628,6 +632,8 @@ CPP MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE +ac_ct_AR +AR RANLIB am__fastdepCC_FALSE am__fastdepCC_TRUE @@ -718,6 +724,7 @@ enable_silent_rules enable_dependency_tracking enable_maintainer_mode enable_largefile +enable_compiler_warnings ' ac_precious_vars='build_alias host_alias @@ -1268,7 +1275,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 scrypt 1.2.0 to adapt to many kinds of systems. +\`configure' configures scrypt 1.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1334,7 +1341,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of scrypt 1.2.0:";; + short | recursive ) echo "Configuration of scrypt 1.2.1:";; esac cat <<\_ACEOF @@ -1352,6 +1359,8 @@ Optional Features: enable make rules and dependencies not useful (and sometimes confusing) to the casual installer --disable-largefile omit support for large files + --disable-compiler-warnings + Do not request compiler warnings. [default=enabled] Some influential environment variables: CC C compiler command @@ -1366,7 +1375,8 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to the package provider. +Report bugs to . +scrypt home page: . _ACEOF ac_status=$? fi @@ -1429,7 +1439,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -scrypt configure 1.2.0 +scrypt configure 1.2.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1701,6 +1711,10 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( $as_echo "## ------------------------------------------------ ## +## Report this to https://github.com/Tarsnap/scrypt ## +## ------------------------------------------------ ##" + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 @@ -1905,7 +1919,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 scrypt $as_me 1.2.0, which was +It was created by scrypt $as_me 1.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2253,6 +2267,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_aux_dir= for ac_dir in config.aux "$srcdir"/config.aux; do if test -f "$ac_dir/install-sh"; then @@ -2282,6 +2297,7 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + am__api_version='1.15' # Find a good install program. We prefer a C program (faster), @@ -2768,7 +2784,7 @@ fi # Define the identity of the package. PACKAGE='scrypt' - VERSION='1.2.0' + VERSION='1.2.1' cat >>confdefs.h <<_ACEOF @@ -2861,6 +2877,71 @@ END fi fi + +# Checks for programs. +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; +fi + +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3708,69 +3789,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -DEPDIR="${am__leading_dot}deps" - -ac_config_commands="$ac_config_commands depfiles" - - -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf - -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : - enableval=$enable_dependency_tracking; -fi - -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - - depcc="$CC" am_compiler_list= @@ -3900,6 +3918,183 @@ else fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 +$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } +if ${ac_cv_prog_cc_c99+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +#include + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +#define debug(...) fprintf (stderr, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + your preprocessor is broken; +#endif +#if BIG_OK +#else + your preprocessor is broken; +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static void +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str; + int number; + float fnumber; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg (args_copy, const char *); + break; + case 'd': // int + number = va_arg (args_copy, int); + break; + case 'f': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); +} + +int +main () +{ + + // Check bool. + _Bool success = false; + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + test_varargs ("s, d' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' + || dynamic_array[ni.number - 1] != 543); + + ; + return 0; +} +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c99" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c99" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c99" != xno; then : + +fi + + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -3993,6 +4188,178 @@ else fi +if test -n "$ac_tool_prefix"; then + for ac_prog in ar lib "link -lib" + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AR" && break + done +fi +if test -z "$AR"; then + ac_ct_AR=$AR + for ac_prog in ar lib "link -lib" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_AR" && break +done + + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +fi + +: ${AR=ar} + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5 +$as_echo_n "checking the archiver ($AR) interface... " >&6; } +if ${am_cv_ar_interface+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + am_cv_ar_interface=ar + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int some_variable = 0; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 + (eval $am_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + am_cv_ar_interface=ar + else + am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 + (eval $am_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + am_cv_ar_interface=lib + else + am_cv_ar_interface=unknown + fi + fi + rm -f conftest.lib libconftest.a + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 +$as_echo "$am_cv_ar_interface" >&6; } + +case $am_cv_ar_interface in +ar) + ;; +lib) + # Microsoft lib, so override with the ar-lib wrapper script. + # FIXME: It is wrong to rewrite AR. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__AR in this case, + # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something + # similar. + AR="$am_aux_dir/ar-lib $AR" + ;; +unknown) + as_fn_error $? "could not determine $AR interface" "$LINENO" 5 + ;; +esac + + # Don't rebuild the configure script. I'm distributing a perfectly good one. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 @@ -4018,15 +4385,15 @@ fi -# Check for clock_gettime. On some systems, this is provided via librt. +# Checks for libraries. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 -$as_echo_n "checking for clock_gettime in -lrt... " >&6; } -if ${ac_cv_lib_rt_clock_gettime+:} false; then : +# Check for clock_gettime. On some systems, this is provided via librt. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 +$as_echo_n "checking for library containing clock_gettime... " >&6; } +if ${ac_cv_search_clock_gettime+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lrt $LIBS" + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4045,23 +4412,35 @@ return clock_gettime (); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_rt_clock_gettime=yes -else - ac_cv_lib_rt_clock_gettime=no +for ac_lib in '' rt; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_clock_gettime=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + conftest$ac_exeext + if ${ac_cv_search_clock_gettime+:} false; then : + break fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 -$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } -if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBRT 1 -_ACEOF +done +if ${ac_cv_search_clock_gettime+:} false; then : - LIBS="-lrt $LIBS" +else + ac_cv_search_clock_gettime=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 +$as_echo "$ac_cv_search_clock_gettime" >&6; } +ac_res=$ac_cv_search_clock_gettime +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -4077,6 +4456,65 @@ fi done +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing AES_encrypt" >&5 +$as_echo_n "checking for library containing AES_encrypt... " >&6; } +if ${ac_cv_search_AES_encrypt+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char AES_encrypt (); +int +main () +{ +return AES_encrypt (); + ; + return 0; +} +_ACEOF +for ac_lib in '' crypto; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_AES_encrypt=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_AES_encrypt+:} false; then : + break +fi +done +if ${ac_cv_search_AES_encrypt+:} false; then : + +else + ac_cv_search_AES_encrypt=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_AES_encrypt" >&5 +$as_echo "$ac_cv_search_AES_encrypt" >&6; } +ac_res=$ac_cv_search_AES_encrypt +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +else + as_fn_error $? "function AES_ENCRYPT not found" "$LINENO" 5 +fi + + # Check for a linuxy sysinfo syscall; and while we're doing that, check if # struct sysinfo is the old version (total RAM == totalmem) or the new # version (total RAM == totalmem * mem_unit). @@ -4548,6 +4986,23 @@ fi done +# Check if we have , to fix the make failing when configure +# passes. +for ac_header in openssl/aes.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "openssl/aes.h" "ac_cv_header_openssl_aes_h" "$ac_includes_default" +if test "x$ac_cv_header_openssl_aes_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_OPENSSL_AES_H 1 +_ACEOF + +else + as_fn_error $? "Unable to find the openssl/aes.h header" "$LINENO" 5 +fi + +done + + # Check for . If it exists and it defines HW_USERMEM # and/or HW_MEMSIZE, we'll try using those as memory limits. for ac_header in sys/sysctl.h @@ -4790,6 +5245,103 @@ rm -rf conftest* fi +# Check whether the user has requested to disable compiler warnings +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler_warnings" >&5 +$as_echo_n "checking compiler_warnings... " >&6; } +# Check whether --enable-compiler_warnings was given. +if test "${enable_compiler_warnings+set}" = set; then : + enableval=$enable_compiler_warnings; ac_compiler_warnings=$enableval +else + ac_compiler_warnings=yes +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_compiler_warnings}" >&5 +$as_echo "${ac_compiler_warnings}" >&6; } +if test x${ac_compiler_warnings} = xyes; then : + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for maximum warnings" >&5 +$as_echo_n "checking CFLAGS for maximum warnings... " >&6; } +if ${ac_cv_cflags_warn_all+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_cflags_warn_all="no, unknown" +ac_save_CFLAGS="$CFLAGS" +for ac_arg in "-warn all % -warn all" "-pedantic % -Wall" "-xstrconst % -v" "-std1 % -verbose -w0 -warnprotos" "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" "-ansi -ansiE % -fullwarn" "+ESlit % +w1" "-Xc % -pvctl,fullmsg" "-h conform % -h msglevel 2" # +do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_cflags_warn_all=`echo $ac_arg | sed -e 's,.*% *,,'` ; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +CFLAGS="$ac_save_CFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_warn_all" >&5 +$as_echo "$ac_cv_cflags_warn_all" >&6; } + + +case ".$ac_cv_cflags_warn_all" in + .ok|.ok,*) ;; + .|.no|.no,*) ;; + *) +if ${CFLAGS+:} false; then : + + case " $CFLAGS " in #( + *" $ac_cv_cflags_warn_all "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$ac_cv_cflags_warn_all"; } >&5 + (: CFLAGS already contains $ac_cv_cflags_warn_all) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append CFLAGS " $ac_cv_cflags_warn_all" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + (: CFLAGS="$CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + CFLAGS=$ac_cv_cflags_warn_all + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + (: CFLAGS="$CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + ;; +esac + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +fi + ac_config_headers="$ac_config_headers config.h" ac_config_files="$ac_config_files Makefile" @@ -5328,7 +5880,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 scrypt $as_me 1.2.0, which was +This file was extended by scrypt $as_me 1.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5388,13 +5940,14 @@ $config_headers Configuration commands: $config_commands -Report bugs to the package provider." +Report bugs to . +scrypt home page: ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -scrypt config.status 1.2.0 +scrypt config.status 1.2.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/README b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/README similarity index 100% rename from vendor/scrypt/scrypt-1.2.0/scrypt/lib/README rename to vendor/scrypt/scrypt-1.2.1/scrypt/lib/README diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt-ref.c b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt-ref.c similarity index 100% rename from vendor/scrypt/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt-ref.c rename to vendor/scrypt/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt-ref.c diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt.c b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt.c similarity index 99% rename from vendor/scrypt/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt.c rename to vendor/scrypt/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt.c index 748e4667..47c94dad 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt.c +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt.c @@ -97,7 +97,7 @@ _crypto_scrypt(const uint8_t * passwd, size_t passwdlen, goto err1; XY = (uint32_t *)(XY0); #if !defined(MAP_ANON) || !defined(HAVE_MMAP) - if ((errno = posix_memalign(&V0, 64, 128 * r * N)) != 0) + if ((errno = posix_memalign(&V0, 64, (size_t)(128 * r * N))) != 0) goto err2; V = (uint32_t *)(V0); #endif diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt.h b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt.h similarity index 100% rename from vendor/scrypt/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt.h rename to vendor/scrypt/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt.h diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt_smix.c b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt_smix.c similarity index 99% rename from vendor/scrypt/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt_smix.c rename to vendor/scrypt/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt_smix.c index ec3ec29b..bcdd8b05 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt_smix.c +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt_smix.c @@ -27,9 +27,7 @@ * online backup system. */ #include -#include -#include "sha256.h" #include "sysendian.h" #include "crypto_scrypt_smix.h" diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt_smix.h b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt_smix.h similarity index 92% rename from vendor/scrypt/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt_smix.h rename to vendor/scrypt/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt_smix.h index b52067fe..576cf989 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt_smix.h +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt_smix.h @@ -1,6 +1,9 @@ #ifndef _CRYPTO_SCRYPT_SMIX_H_ #define _CRYPTO_SCRYPT_SMIX_H_ +#include +#include + /** * crypto_scrypt_smix(B, r, N, V, XY): * Compute B = SMix_r(B, N). The input B must be 128r bytes in length; diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt_smix_sse2.c b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt_smix_sse2.c similarity index 98% rename from vendor/scrypt/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt_smix_sse2.c rename to vendor/scrypt/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt_smix_sse2.c index 9fd03086..19dde683 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt_smix_sse2.c +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt_smix_sse2.c @@ -165,6 +165,7 @@ blockmix_salsa8(const __m128i * Bin, __m128i * Bout, __m128i * X, size_t r) /** * integerify(B, r): * Return the result of parsing B_{2r-1} as a little-endian integer. + * Note that B's layout is permuted compared to the generic implementation. */ static uint64_t integerify(const void * B, size_t r) diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt_smix_sse2.h b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt_smix_sse2.h similarity index 93% rename from vendor/scrypt/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt_smix_sse2.h rename to vendor/scrypt/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt_smix_sse2.h index eda43a44..4a403f7d 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/crypto/crypto_scrypt_smix_sse2.h +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/crypto/crypto_scrypt_smix_sse2.h @@ -1,6 +1,9 @@ #ifndef _CRYPTO_SCRYPT_SMIX_SSE2_H_ #define _CRYPTO_SCRYPT_SMIX_SSE2_H_ +#include +#include + /** * crypto_scrypt_smix_sse2(B, r, N, V, XY): * Compute B = SMix_r(B, N). The input B must be 128r bytes in length; diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/scryptenc/scryptenc.c b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/scryptenc/scryptenc.c similarity index 81% rename from vendor/scrypt/scrypt-1.2.0/scrypt/lib/scryptenc/scryptenc.c rename to vendor/scrypt/scrypt-1.2.1/scrypt/lib/scryptenc/scryptenc.c index fc58c489..90a79288 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/scryptenc/scryptenc.c +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/scryptenc/scryptenc.c @@ -28,16 +28,17 @@ */ #include "scrypt_platform.h" -#include -#include +#include +#include #include #include +#include #include -#include #include "crypto_aes.h" #include "crypto_aesctr.h" #include "crypto_entropy.h" +#include "humansize.h" #include "insecure_memzero.h" #include "sha256.h" #include "sysendian.h" @@ -51,12 +52,34 @@ #define ENCBLOCK 65536 static int pickparams(size_t, double, double, - int *, uint32_t *, uint32_t *); -static int checkparams(size_t, double, double, int, uint32_t, uint32_t); + int *, uint32_t *, uint32_t *, int); +static int checkparams(size_t, double, double, int, uint32_t, uint32_t, int, + int); + +static void +display_params(int logN, uint32_t r, uint32_t p, size_t memlimit, + double opps, double maxtime) +{ + uint64_t N = (uint64_t)(1) << logN; + uint64_t mem_minimum = 128 * r * N; + double expected_seconds = 4 * N * p / opps; + char * human_memlimit = humansize(memlimit); + char * human_mem_minimum = humansize(mem_minimum); + + fprintf(stderr, "Parameters used: N = %" PRIu64 "; r = %" PRIu32 + "; p = %" PRIu32 ";\n", N, r, p); + fprintf(stderr, " This requires at least %s bytes of memory " + "(%s available),\n", human_mem_minimum, human_memlimit); + fprintf(stderr, " and will take approximately %.1f seconds " + "(limit: %.1f seconds).\n", expected_seconds, maxtime); + + free(human_memlimit); + free(human_mem_minimum); +} static int pickparams(size_t maxmem, double maxmemfrac, double maxtime, - int * logN, uint32_t * r, uint32_t * p) + int * logN, uint32_t * r, uint32_t * p, int verbose) { size_t memlimit; double opps; @@ -89,7 +112,7 @@ pickparams(size_t maxmem, double maxmemfrac, double maxtime, fprintf(stderr, "Requiring 128Nr <= %zu, 4Nrp <= %f\n", memlimit, opslimit); #endif - if (opslimit < memlimit/32) { + if (opslimit < (double)memlimit / 32) { /* Set p = 1 and choose N based on the CPU limit. */ *p = 1; maxN = opslimit / (*r * 4); @@ -112,10 +135,8 @@ pickparams(size_t maxmem, double maxmemfrac, double maxtime, *p = (uint32_t)(maxrp) / *r; } -#ifdef DEBUG - fprintf(stderr, "N = %zu r = %d p = %d\n", - (size_t)(1) << *logN, (int)(*r), (int)(*p)); -#endif + if (verbose) + display_params(*logN, *r, *p, memlimit, opps, maxtime); /* Success! */ return (0); @@ -123,7 +144,7 @@ pickparams(size_t maxmem, double maxmemfrac, double maxtime, static int checkparams(size_t maxmem, double maxmemfrac, double maxtime, - int logN, uint32_t r, uint32_t p) + int logN, uint32_t r, uint32_t p, int verbose, int force) { size_t memlimit; double opps; @@ -131,27 +152,37 @@ checkparams(size_t maxmem, double maxmemfrac, double maxtime, uint64_t N; int rc; - /* Figure out the maximum amount of memory we can use. */ - if (memtouse(maxmem, maxmemfrac, &memlimit)) - return (1); - - /* Figure out how fast the CPU is. */ - if ((rc = scryptenc_cpuperf(&opps)) != 0) - return (rc); - opslimit = opps * maxtime; - /* Sanity-check values. */ if ((logN < 1) || (logN > 63)) return (7); if ((uint64_t)(r) * (uint64_t)(p) >= 0x40000000) return (7); - /* Check limits. */ - N = (uint64_t)(1) << logN; - if ((memlimit / N) / r < 128) - return (9); - if ((opslimit / N) / (r * p) < 4) - return (10); + /* Are we forcing decryption, regardless of resource limits? */ + if (!force) { + /* Figure out the maximum amount of memory we can use. */ + if (memtouse(maxmem, maxmemfrac, &memlimit)) + return (1); + + /* Figure out how fast the CPU is. */ + if ((rc = scryptenc_cpuperf(&opps)) != 0) + return (rc); + opslimit = opps * maxtime; + + /* Check limits. */ + N = (uint64_t)(1) << logN; + if ((memlimit / N) / r < 128) + return (9); + if ((opslimit / N) / (r * p) < 4) + return (10); + } else { + /* We have no limit. */ + memlimit = 0; + opps = 0; + } + + if (verbose) + display_params(logN, r, p, memlimit, opps, maxtime); /* Success! */ return (0); @@ -160,7 +191,7 @@ checkparams(size_t maxmem, double maxmemfrac, double maxtime, static int scryptenc_setup(uint8_t header[96], uint8_t dk[64], const uint8_t * passwd, size_t passwdlen, - size_t maxmem, double maxmemfrac, double maxtime) + size_t maxmem, double maxmemfrac, double maxtime, int verbose) { uint8_t salt[32]; uint8_t hbuf[32]; @@ -175,10 +206,13 @@ scryptenc_setup(uint8_t header[96], uint8_t dk[64], /* Pick values for N, r, p. */ if ((rc = pickparams(maxmem, maxmemfrac, maxtime, - &logN, &r, &p)) != 0) + &logN, &r, &p, verbose)) != 0) return (rc); N = (uint64_t)(1) << logN; + /* Sanity check. */ + assert((logN > 0) && (logN < 256)); + /* Get some salt. */ if (crypto_entropy_read(salt, 32)) return (4); @@ -190,7 +224,7 @@ scryptenc_setup(uint8_t header[96], uint8_t dk[64], /* Construct the file header. */ memcpy(header, "scrypt", 6); header[6] = 0; - header[7] = logN; + header[7] = logN & 0xff; be32enc(&header[8], r); be32enc(&header[12], p); memcpy(&header[16], salt, 32); @@ -214,7 +248,8 @@ scryptenc_setup(uint8_t header[96], uint8_t dk[64], static int scryptdec_setup(const uint8_t header[96], uint8_t dk[64], const uint8_t * passwd, size_t passwdlen, - size_t maxmem, double maxmemfrac, double maxtime) + size_t maxmem, double maxmemfrac, double maxtime, int verbose, + int force) { uint8_t salt[32]; uint8_t hbuf[32]; @@ -243,9 +278,10 @@ scryptdec_setup(const uint8_t header[96], uint8_t dk[64], /* * Check whether the provided parameters are valid and whether the * key derivation function can be computed within the allowed memory - * and CPU time. + * and CPU time, unless the user chose to disable this test. */ - if ((rc = checkparams(maxmem, maxmemfrac, maxtime, logN, r, p)) != 0) + if ((rc = checkparams(maxmem, maxmemfrac, maxtime, logN, r, p, + verbose, force)) != 0) return (rc); /* Compute the derived keys. */ @@ -266,14 +302,14 @@ scryptdec_setup(const uint8_t header[96], uint8_t dk[64], /** * scryptenc_buf(inbuf, inbuflen, outbuf, passwd, passwdlen, - * maxmem, maxmemfrac, maxtime): + * maxmem, maxmemfrac, maxtime, verbose): * Encrypt inbuflen bytes from inbuf, writing the resulting inbuflen + 128 * bytes to outbuf. */ int scryptenc_buf(const uint8_t * inbuf, size_t inbuflen, uint8_t * outbuf, const uint8_t * passwd, size_t passwdlen, - size_t maxmem, double maxmemfrac, double maxtime) + size_t maxmem, double maxmemfrac, double maxtime, int verbose) { uint8_t dk[64]; uint8_t hbuf[32]; @@ -287,7 +323,7 @@ scryptenc_buf(const uint8_t * inbuf, size_t inbuflen, uint8_t * outbuf, /* Generate the header and derived key. */ if ((rc = scryptenc_setup(header, dk, passwd, passwdlen, - maxmem, maxmemfrac, maxtime)) != 0) + maxmem, maxmemfrac, maxtime, verbose)) != 0) return (rc); /* Copy header into output buffer. */ @@ -317,15 +353,17 @@ scryptenc_buf(const uint8_t * inbuf, size_t inbuflen, uint8_t * outbuf, /** * scryptdec_buf(inbuf, inbuflen, outbuf, outlen, passwd, passwdlen, - * maxmem, maxmemfrac, maxtime): + * maxmem, maxmemfrac, maxtime, verbose, force): * Decrypt inbuflen bytes from inbuf, writing the result into outbuf and the * decrypted data length to outlen. The allocated length of outbuf must - * be at least inbuflen. + * be at least inbuflen. If ${force} is 1, do not check whether + * decryption will exceed the estimated available memory or time. */ int scryptdec_buf(const uint8_t * inbuf, size_t inbuflen, uint8_t * outbuf, size_t * outlen, const uint8_t * passwd, size_t passwdlen, - size_t maxmem, double maxmemfrac, double maxtime) + size_t maxmem, double maxmemfrac, double maxtime, int verbose, + int force) { uint8_t hbuf[32]; uint8_t dk[64]; @@ -353,7 +391,7 @@ scryptdec_buf(const uint8_t * inbuf, size_t inbuflen, uint8_t * outbuf, /* Parse the header and generate derived keys. */ if ((rc = scryptdec_setup(inbuf, dk, passwd, passwdlen, - maxmem, maxmemfrac, maxtime)) != 0) + maxmem, maxmemfrac, maxtime, verbose, force)) != 0) return (rc); /* Decrypt data. */ @@ -382,14 +420,14 @@ scryptdec_buf(const uint8_t * inbuf, size_t inbuflen, uint8_t * outbuf, /** * scryptenc_file(infile, outfile, passwd, passwdlen, - * maxmem, maxmemfrac, maxtime): + * maxmem, maxmemfrac, maxtime, verbose): * Read a stream from infile and encrypt it, writing the resulting stream to * outfile. */ int scryptenc_file(FILE * infile, FILE * outfile, const uint8_t * passwd, size_t passwdlen, - size_t maxmem, double maxmemfrac, double maxtime) + size_t maxmem, double maxmemfrac, double maxtime, int verbose) { uint8_t buf[ENCBLOCK]; uint8_t dk[64]; @@ -405,7 +443,7 @@ scryptenc_file(FILE * infile, FILE * outfile, /* Generate the header and derived key. */ if ((rc = scryptenc_setup(header, dk, passwd, passwdlen, - maxmem, maxmemfrac, maxtime)) != 0) + maxmem, maxmemfrac, maxtime, verbose)) != 0) return (rc); /* Hash and write the header. */ @@ -453,14 +491,16 @@ scryptenc_file(FILE * infile, FILE * outfile, /** * scryptdec_file(infile, outfile, passwd, passwdlen, - * maxmem, maxmemfrac, maxtime): + * maxmem, maxmemfrac, maxtime, verbose, force): * Read a stream from infile and decrypt it, writing the resulting stream to - * outfile. + * outfile. If ${force} is 1, do not check whether decryption + * will exceed the estimated available memory or time. */ int scryptdec_file(FILE * infile, FILE * outfile, const uint8_t * passwd, size_t passwdlen, - size_t maxmem, double maxmemfrac, double maxtime) + size_t maxmem, double maxmemfrac, double maxtime, int verbose, + int force) { uint8_t buf[ENCBLOCK + 32]; uint8_t header[96]; @@ -505,7 +545,7 @@ scryptdec_file(FILE * infile, FILE * outfile, /* Parse the header and generate derived keys. */ if ((rc = scryptdec_setup(header, dk, passwd, passwdlen, - maxmem, maxmemfrac, maxtime)) != 0) + maxmem, maxmemfrac, maxtime, verbose, force)) != 0) return (rc); /* Start hashing with the header. */ diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/scryptenc/scryptenc.h b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/scryptenc/scryptenc.h similarity index 87% rename from vendor/scrypt/scrypt-1.2.0/scrypt/lib/scryptenc/scryptenc.h rename to vendor/scrypt/scrypt-1.2.1/scrypt/lib/scryptenc/scryptenc.h index 99090d41..d81c3b7c 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/scryptenc/scryptenc.h +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/scryptenc/scryptenc.h @@ -36,7 +36,7 @@ * NOTE: This file provides prototypes for routines which encrypt/decrypt data * using a key derived from a password by using the scrypt key derivation * function. If you are just trying to "hash" a password for user logins, - * this is not the code you are looking for. You want to use the crypt_scrypt + * this is not the code you are looking for. You want to use the crypto_scrypt * function directly. */ @@ -82,39 +82,41 @@ /** * scryptenc_buf(inbuf, inbuflen, outbuf, passwd, passwdlen, - * maxmem, maxmemfrac, maxtime): + * maxmem, maxmemfrac, maxtime, verbose): * Encrypt inbuflen bytes from inbuf, writing the resulting inbuflen + 128 * bytes to outbuf. */ int scryptenc_buf(const uint8_t *, size_t, uint8_t *, - const uint8_t *, size_t, size_t, double, double); + const uint8_t *, size_t, size_t, double, double, int); /** * scryptdec_buf(inbuf, inbuflen, outbuf, outlen, passwd, passwdlen, - * maxmem, maxmemfrac, maxtime): + * maxmem, maxmemfrac, maxtime, verbose, force): * Decrypt inbuflen bytes from inbuf, writing the result into outbuf and the * decrypted data length to outlen. The allocated length of outbuf must - * be at least inbuflen. + * be at least inbuflen. If ${force} is 1, do not check whether + * decryption will exceed the estimated available memory or time. */ int scryptdec_buf(const uint8_t *, size_t, uint8_t *, size_t *, - const uint8_t *, size_t, size_t, double, double); + const uint8_t *, size_t, size_t, double, double, int, int); /** * scryptenc_file(infile, outfile, passwd, passwdlen, - * maxmem, maxmemfrac, maxtime): + * maxmem, maxmemfrac, maxtime, verbose): * Read a stream from infile and encrypt it, writing the resulting stream to * outfile. */ int scryptenc_file(FILE *, FILE *, const uint8_t *, size_t, - size_t, double, double); + size_t, double, double, int); /** * scryptdec_file(infile, outfile, passwd, passwdlen, - * maxmem, maxmemfrac, maxtime): + * maxmem, maxmemfrac, maxtime, verbose, force): * Read a stream from infile and decrypt it, writing the resulting stream to - * outfile. + * outfile. If ${force} is 1, do not check whether decryption + * will exceed the estimated available memory or time. */ int scryptdec_file(FILE *, FILE *, const uint8_t *, size_t, - size_t, double, double); + size_t, double, double, int, int); #endif /* !_SCRYPTENC_H_ */ diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/scryptenc/scryptenc_cpuperf.c b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/scryptenc/scryptenc_cpuperf.c similarity index 99% rename from vendor/scrypt/scrypt-1.2.0/scrypt/lib/scryptenc/scryptenc_cpuperf.c rename to vendor/scrypt/scrypt-1.2.1/scrypt/lib/scryptenc/scryptenc_cpuperf.c index 1e69e758..c9c082ba 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/scryptenc/scryptenc_cpuperf.c +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/scryptenc/scryptenc_cpuperf.c @@ -40,7 +40,7 @@ #ifdef HAVE_CLOCK_GETTIME -static clock_t clocktouse; +static clockid_t clocktouse; static int getclockres(double * resd) diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/scryptenc/scryptenc_cpuperf.h b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/scryptenc/scryptenc_cpuperf.h similarity index 100% rename from vendor/scrypt/scrypt-1.2.0/scrypt/lib/scryptenc/scryptenc_cpuperf.h rename to vendor/scrypt/scrypt-1.2.1/scrypt/lib/scryptenc/scryptenc_cpuperf.h diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/util/memlimit.c b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/util/memlimit.c similarity index 93% rename from vendor/scrypt/scrypt-1.2.0/scrypt/lib/util/memlimit.c rename to vendor/scrypt/scrypt-1.2.1/scrypt/lib/util/memlimit.c index a2e1da2f..7bd1949e 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/util/memlimit.c +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/util/memlimit.c @@ -26,6 +26,10 @@ * This file was originally written by Colin Percival as part of the Tarsnap * online backup system. */ + +/* We use non-POSIX functionality in this file. */ +#undef _POSIX_C_SOURCE + #include "scrypt_platform.h" #include @@ -92,7 +96,7 @@ memlimit_sysctl_hw(size_t * memlimit, int mibleaf) if (sysctlval > SIZE_MAX) *memlimit = SIZE_MAX; else - *memlimit = sysctlval; + *memlimit = (size_t)sysctlval; #else *memlimit = sysctlval; #endif @@ -134,7 +138,7 @@ memlimit_sysinfo(size_t * memlimit) if (totalmem > SIZE_MAX) *memlimit = SIZE_MAX; else - *memlimit = totalmem; + *memlimit = (size_t)totalmem; #else *memlimit = totalmem; #endif @@ -159,7 +163,7 @@ memlimit_rlimit(size_t * memlimit) return (1); if ((rl.rlim_cur != RLIM_INFINITY) && ((uint64_t)rl.rlim_cur < memrlimit)) - memrlimit = rl.rlim_cur; + memrlimit = (uint64_t)rl.rlim_cur; #endif /* ... RLIMIT_DATA... */ @@ -167,7 +171,7 @@ memlimit_rlimit(size_t * memlimit) return (1); if ((rl.rlim_cur != RLIM_INFINITY) && ((uint64_t)rl.rlim_cur < memrlimit)) - memrlimit = rl.rlim_cur; + memrlimit = (uint64_t)rl.rlim_cur; /* ... and RLIMIT_RSS. */ #ifdef RLIMIT_RSS @@ -175,7 +179,7 @@ memlimit_rlimit(size_t * memlimit) return (1); if ((rl.rlim_cur != RLIM_INFINITY) && ((uint64_t)rl.rlim_cur < memrlimit)) - memrlimit = rl.rlim_cur; + memrlimit = (uint64_t)rl.rlim_cur; #endif /* Return the value, but clamp to SIZE_MAX if necessary. */ @@ -183,7 +187,7 @@ memlimit_rlimit(size_t * memlimit) if (memrlimit > SIZE_MAX) *memlimit = SIZE_MAX; else - *memlimit = memrlimit; + *memlimit = (size_t)memrlimit; #else *memlimit = memrlimit; #endif @@ -212,8 +216,11 @@ memlimit_sysconf(size_t * memlimit) /* Read the two limits. */ if (((pagesize = sysconf(_SC_PAGE_SIZE)) == -1) || ((physpages = sysconf(_SC_PHYS_PAGES)) == -1)) { - /* Did an error occur? */ - if (errno != 0) + /* + * Did an error occur? OS X may return EINVAL due to not + * supporting _SC_PHYS_PAGES in spite of defining it. + */ + if (errno != 0 && errno != EINVAL) return (1); /* If not, there is no limit. */ @@ -228,7 +235,7 @@ memlimit_sysconf(size_t * memlimit) if (totalmem > SIZE_MAX) *memlimit = SIZE_MAX; else - *memlimit = totalmem; + *memlimit = (size_t)totalmem; #else *memlimit = totalmem; #endif @@ -298,7 +305,7 @@ memtouse(size_t maxmem, double maxmemfrac, size_t * memlimit) /* Only use the specified fraction of the available memory. */ if ((maxmemfrac > 0.5) || (maxmemfrac == 0.0)) maxmemfrac = 0.5; - memavail = maxmemfrac * memlimit_min; + memavail = (size_t)(maxmemfrac * memlimit_min); /* Don't use more than the specified maximum. */ if ((maxmem > 0) && (memavail > maxmem)) diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/lib/util/memlimit.h b/vendor/scrypt/scrypt-1.2.1/scrypt/lib/util/memlimit.h similarity index 100% rename from vendor/scrypt/scrypt-1.2.0/scrypt/lib/util/memlimit.h rename to vendor/scrypt/scrypt-1.2.1/scrypt/lib/util/memlimit.h diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/alg/sha256.c b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/alg/sha256.c similarity index 52% rename from vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/alg/sha256.c rename to vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/alg/sha256.c index e2045018..7d5f732f 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/alg/sha256.c +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/alg/sha256.c @@ -41,6 +41,26 @@ be32dec_vect(uint32_t * dst, const uint8_t * src, size_t len) dst[i] = be32dec(src + i * 4); } +/* SHA256 round constants. */ +static const uint32_t Krnd[64] = { + 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, + 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, + 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, + 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, + 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, + 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, + 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, + 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, + 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, + 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, + 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, + 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, + 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, + 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, + 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, + 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2 +}; + /* Elementary functions used by SHA256 */ #define Ch(x, y, z) ((x & (y ^ z)) ^ z) #define Maj(x, y, z) ((x & (y | z)) | (y & z)) @@ -53,117 +73,84 @@ be32dec_vect(uint32_t * dst, const uint8_t * src, size_t len) /* SHA256 round function */ #define RND(a, b, c, d, e, f, g, h, k) \ - t0 = h + S1(e) + Ch(e, f, g) + k; \ - t1 = S0(a) + Maj(a, b, c); \ - d += t0; \ - h = t0 + t1; + h += S1(e) + Ch(e, f, g) + k; \ + d += h; \ + h += S0(a) + Maj(a, b, c); /* Adjusted round function for rotating state */ -#define RNDr(S, W, i, k) \ +#define RNDr(S, W, i, ii) \ RND(S[(64 - i) % 8], S[(65 - i) % 8], \ S[(66 - i) % 8], S[(67 - i) % 8], \ S[(68 - i) % 8], S[(69 - i) % 8], \ S[(70 - i) % 8], S[(71 - i) % 8], \ - W[i] + k) + W[i + ii] + Krnd[i + ii]) + +/* Message schedule computation */ +#define MSCH(W, ii, i) \ + W[i + ii + 16] = s1(W[i + ii + 14]) + W[i + ii + 9] + s0(W[i + ii + 1]) + W[i + ii] /* * SHA256 block compression function. The 256-bit state is transformed via * the 512-bit input block to produce a new state. */ static void -SHA256_Transform(uint32_t * state, const uint8_t block[64]) +SHA256_Transform(uint32_t state[static restrict 8], + const uint8_t block[static restrict 64], + uint32_t W[static restrict 64], uint32_t S[static restrict 8]) { - uint32_t W[64]; - uint32_t S[8]; - uint32_t t0, t1; int i; - /* 1. Prepare message schedule W. */ + /* 1. Prepare the first part of the message schedule W. */ be32dec_vect(W, block, 64); - for (i = 16; i < 64; i++) - W[i] = s1(W[i - 2]) + W[i - 7] + s0(W[i - 15]) + W[i - 16]; /* 2. Initialize working variables. */ memcpy(S, state, 32); /* 3. Mix. */ - RNDr(S, W, 0, 0x428a2f98); - RNDr(S, W, 1, 0x71374491); - RNDr(S, W, 2, 0xb5c0fbcf); - RNDr(S, W, 3, 0xe9b5dba5); - RNDr(S, W, 4, 0x3956c25b); - RNDr(S, W, 5, 0x59f111f1); - RNDr(S, W, 6, 0x923f82a4); - RNDr(S, W, 7, 0xab1c5ed5); - RNDr(S, W, 8, 0xd807aa98); - RNDr(S, W, 9, 0x12835b01); - RNDr(S, W, 10, 0x243185be); - RNDr(S, W, 11, 0x550c7dc3); - RNDr(S, W, 12, 0x72be5d74); - RNDr(S, W, 13, 0x80deb1fe); - RNDr(S, W, 14, 0x9bdc06a7); - RNDr(S, W, 15, 0xc19bf174); - RNDr(S, W, 16, 0xe49b69c1); - RNDr(S, W, 17, 0xefbe4786); - RNDr(S, W, 18, 0x0fc19dc6); - RNDr(S, W, 19, 0x240ca1cc); - RNDr(S, W, 20, 0x2de92c6f); - RNDr(S, W, 21, 0x4a7484aa); - RNDr(S, W, 22, 0x5cb0a9dc); - RNDr(S, W, 23, 0x76f988da); - RNDr(S, W, 24, 0x983e5152); - RNDr(S, W, 25, 0xa831c66d); - RNDr(S, W, 26, 0xb00327c8); - RNDr(S, W, 27, 0xbf597fc7); - RNDr(S, W, 28, 0xc6e00bf3); - RNDr(S, W, 29, 0xd5a79147); - RNDr(S, W, 30, 0x06ca6351); - RNDr(S, W, 31, 0x14292967); - RNDr(S, W, 32, 0x27b70a85); - RNDr(S, W, 33, 0x2e1b2138); - RNDr(S, W, 34, 0x4d2c6dfc); - RNDr(S, W, 35, 0x53380d13); - RNDr(S, W, 36, 0x650a7354); - RNDr(S, W, 37, 0x766a0abb); - RNDr(S, W, 38, 0x81c2c92e); - RNDr(S, W, 39, 0x92722c85); - RNDr(S, W, 40, 0xa2bfe8a1); - RNDr(S, W, 41, 0xa81a664b); - RNDr(S, W, 42, 0xc24b8b70); - RNDr(S, W, 43, 0xc76c51a3); - RNDr(S, W, 44, 0xd192e819); - RNDr(S, W, 45, 0xd6990624); - RNDr(S, W, 46, 0xf40e3585); - RNDr(S, W, 47, 0x106aa070); - RNDr(S, W, 48, 0x19a4c116); - RNDr(S, W, 49, 0x1e376c08); - RNDr(S, W, 50, 0x2748774c); - RNDr(S, W, 51, 0x34b0bcb5); - RNDr(S, W, 52, 0x391c0cb3); - RNDr(S, W, 53, 0x4ed8aa4a); - RNDr(S, W, 54, 0x5b9cca4f); - RNDr(S, W, 55, 0x682e6ff3); - RNDr(S, W, 56, 0x748f82ee); - RNDr(S, W, 57, 0x78a5636f); - RNDr(S, W, 58, 0x84c87814); - RNDr(S, W, 59, 0x8cc70208); - RNDr(S, W, 60, 0x90befffa); - RNDr(S, W, 61, 0xa4506ceb); - RNDr(S, W, 62, 0xbef9a3f7); - RNDr(S, W, 63, 0xc67178f2); + for (i = 0; i < 64; i += 16) { + RNDr(S, W, 0, i); + RNDr(S, W, 1, i); + RNDr(S, W, 2, i); + RNDr(S, W, 3, i); + RNDr(S, W, 4, i); + RNDr(S, W, 5, i); + RNDr(S, W, 6, i); + RNDr(S, W, 7, i); + RNDr(S, W, 8, i); + RNDr(S, W, 9, i); + RNDr(S, W, 10, i); + RNDr(S, W, 11, i); + RNDr(S, W, 12, i); + RNDr(S, W, 13, i); + RNDr(S, W, 14, i); + RNDr(S, W, 15, i); + + if (i == 48) + break; + MSCH(W, 0, i); + MSCH(W, 1, i); + MSCH(W, 2, i); + MSCH(W, 3, i); + MSCH(W, 4, i); + MSCH(W, 5, i); + MSCH(W, 6, i); + MSCH(W, 7, i); + MSCH(W, 8, i); + MSCH(W, 9, i); + MSCH(W, 10, i); + MSCH(W, 11, i); + MSCH(W, 12, i); + MSCH(W, 13, i); + MSCH(W, 14, i); + MSCH(W, 15, i); + } /* 4. Mix local working variables into global state. */ for (i = 0; i < 8; i++) state[i] += S[i]; - - /* Clean the stack. */ - insecure_memzero(W, 256); - insecure_memzero(S, 32); - insecure_memzero(&t0, sizeof(uint32_t)); - insecure_memzero(&t1, sizeof(uint32_t)); } -static uint8_t PAD[64] = { +static const uint8_t PAD[64] = { 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -172,28 +159,35 @@ static uint8_t PAD[64] = { /* Add padding and terminating bit-count. */ static void -SHA256_Pad(SHA256_CTX * ctx) +SHA256_Pad(SHA256_CTX * ctx, uint32_t tmp32[static restrict 72]) { - uint8_t len[8]; - uint32_t r, plen; + size_t r; - /* - * Convert length to a vector of bytes -- we do this now rather - * than later because the length will change after we pad. - */ - be64enc(len, ctx->count); - - /* Add 1--64 bytes so that the resulting length is 56 mod 64. */ + /* Figure out how many bytes we have buffered. */ r = (ctx->count >> 3) & 0x3f; - plen = (r < 56) ? (56 - r) : (120 - r); - SHA256_Update(ctx, PAD, (size_t)plen); + + /* Pad to 56 mod 64, transforming if we finish a block en route. */ + if (r < 56) { + /* Pad to 56 mod 64. */ + memcpy(&ctx->buf[r], PAD, 56 - r); + } else { + /* Finish the current block and mix. */ + memcpy(&ctx->buf[r], PAD, 64 - r); + SHA256_Transform(ctx->state, ctx->buf, &tmp32[0], &tmp32[64]); + + /* The start of the final block is all zeroes. */ + memset(&ctx->buf[0], 0, 56); + } /* Add the terminating bit-count. */ - SHA256_Update(ctx, len, 8); + be64enc(&ctx->buf[56], ctx->count); + + /* Mix in the final block. */ + SHA256_Transform(ctx->state, ctx->buf, &tmp32[0], &tmp32[64]); } /* Magic initialization constants. */ -static const uint32_t initstate[8] = { +static const uint32_t initial_state[8] = { 0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A, 0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19 }; @@ -210,15 +204,16 @@ SHA256_Init(SHA256_CTX * ctx) ctx->count = 0; /* Initialize state. */ - memcpy(ctx->state, initstate, sizeof(initstate)); + memcpy(ctx->state, initial_state, sizeof(initial_state)); } /** * SHA256_Update(ctx, in, len): * Input ${len} bytes from ${in} into the SHA256 context ${ctx}. */ -void -SHA256_Update(SHA256_CTX * ctx, const void * in, size_t len) +static void +_SHA256_Update(SHA256_CTX * ctx, const void * in, size_t len, + uint32_t tmp32[static restrict 72]) { uint32_t r; const uint8_t * src = in; @@ -241,13 +236,13 @@ SHA256_Update(SHA256_CTX * ctx, const void * in, size_t len) /* Finish the current block. */ memcpy(&ctx->buf[r], src, 64 - r); - SHA256_Transform(ctx->state, ctx->buf); + SHA256_Transform(ctx->state, ctx->buf, &tmp32[0], &tmp32[64]); src += 64 - r; len -= 64 - r; /* Perform complete blocks. */ while (len >= 64) { - SHA256_Transform(ctx->state, src); + SHA256_Transform(ctx->state, src, &tmp32[0], &tmp32[64]); src += 64; len -= 64; } @@ -256,37 +251,69 @@ SHA256_Update(SHA256_CTX * ctx, const void * in, size_t len) memcpy(ctx->buf, src, len); } +/* Wrapper function for intermediate-values sanitization. */ +void +SHA256_Update(SHA256_CTX * ctx, const void * in, size_t len) +{ + uint32_t tmp32[72]; + + /* Call the real function. */ + _SHA256_Update(ctx, in, len, tmp32); + + /* Clean the stack. */ + insecure_memzero(tmp32, 288); +} + /** * SHA256_Final(digest, ctx): * Output the SHA256 hash of the data input to the context ${ctx} into the * buffer ${digest}. */ -void -SHA256_Final(uint8_t digest[32], SHA256_CTX * ctx) +static void +_SHA256_Final(uint8_t digest[32], SHA256_CTX * ctx, + uint32_t tmp32[static restrict 72]) { /* Add padding. */ - SHA256_Pad(ctx); + SHA256_Pad(ctx, tmp32); /* Write the hash. */ be32enc_vect(digest, ctx->state, 32); +} + +/* Wrapper function for intermediate-values sanitization. */ +void +SHA256_Final(uint8_t digest[32], SHA256_CTX * ctx) +{ + uint32_t tmp32[72]; + + /* Call the real function. */ + _SHA256_Final(digest, ctx, tmp32); /* Clear the context state. */ insecure_memzero(ctx, sizeof(SHA256_CTX)); + + /* Clean the stack. */ + insecure_memzero(tmp32, 288); } /** * SHA256_Buf(in, len, digest): - * Compute the SHA256 hash of ${len} bytes from $in} and write it to ${digest}. + * Compute the SHA256 hash of ${len} bytes from ${in} and write it to ${digest}. */ void SHA256_Buf(const void * in, size_t len, uint8_t digest[32]) { SHA256_CTX ctx; + uint32_t tmp32[72]; SHA256_Init(&ctx); - SHA256_Update(&ctx, in, len); - SHA256_Final(digest, &ctx); + _SHA256_Update(&ctx, in, len, tmp32); + _SHA256_Final(digest, &ctx, tmp32); + + /* Clean the stack. */ + insecure_memzero(&ctx, sizeof(SHA256_CTX)); + insecure_memzero(tmp32, 288); } /** @@ -294,19 +321,19 @@ SHA256_Buf(const void * in, size_t len, uint8_t digest[32]) * Initialize the HMAC-SHA256 context ${ctx} with ${Klen} bytes of key from * ${K}. */ -void -HMAC_SHA256_Init(HMAC_SHA256_CTX * ctx, const void * _K, size_t Klen) +static void +_HMAC_SHA256_Init(HMAC_SHA256_CTX * ctx, const void * _K, size_t Klen, + uint32_t tmp32[static restrict 72], uint8_t pad[static restrict 64], + uint8_t khash[static restrict 32]) { - uint8_t pad[64]; - uint8_t khash[32]; const uint8_t * K = _K; size_t i; /* If Klen > 64, the key is really SHA256(K). */ if (Klen > 64) { SHA256_Init(&ctx->ictx); - SHA256_Update(&ctx->ictx, K, Klen); - SHA256_Final(khash, &ctx->ictx); + _SHA256_Update(&ctx->ictx, K, Klen, tmp32); + _SHA256_Final(khash, &ctx->ictx, tmp32); K = khash; Klen = 32; } @@ -316,16 +343,29 @@ HMAC_SHA256_Init(HMAC_SHA256_CTX * ctx, const void * _K, size_t Klen) memset(pad, 0x36, 64); for (i = 0; i < Klen; i++) pad[i] ^= K[i]; - SHA256_Update(&ctx->ictx, pad, 64); + _SHA256_Update(&ctx->ictx, pad, 64, tmp32); /* Outer SHA256 operation is SHA256(K xor [block of 0x5c] || hash). */ SHA256_Init(&ctx->octx); memset(pad, 0x5c, 64); for (i = 0; i < Klen; i++) pad[i] ^= K[i]; - SHA256_Update(&ctx->octx, pad, 64); + _SHA256_Update(&ctx->octx, pad, 64, tmp32); +} + +/* Wrapper function for intermediate-values sanitization. */ +void +HMAC_SHA256_Init(HMAC_SHA256_CTX * ctx, const void * _K, size_t Klen) +{ + uint32_t tmp32[72]; + uint8_t pad[64]; + uint8_t khash[32]; + + /* Call the real function. */ + _HMAC_SHA256_Init(ctx, _K, Klen, tmp32, pad, khash); /* Clean the stack. */ + insecure_memzero(tmp32, 288); insecure_memzero(khash, 32); insecure_memzero(pad, 64); } @@ -334,12 +374,26 @@ HMAC_SHA256_Init(HMAC_SHA256_CTX * ctx, const void * _K, size_t Klen) * HMAC_SHA256_Update(ctx, in, len): * Input ${len} bytes from ${in} into the HMAC-SHA256 context ${ctx}. */ -void -HMAC_SHA256_Update(HMAC_SHA256_CTX * ctx, const void * in, size_t len) +static void +_HMAC_SHA256_Update(HMAC_SHA256_CTX * ctx, const void * in, size_t len, + uint32_t tmp32[static restrict 72]) { /* Feed data to the inner SHA256 operation. */ - SHA256_Update(&ctx->ictx, in, len); + _SHA256_Update(&ctx->ictx, in, len, tmp32); +} + +/* Wrapper function for intermediate-values sanitization. */ +void +HMAC_SHA256_Update(HMAC_SHA256_CTX * ctx, const void * in, size_t len) +{ + uint32_t tmp32[72]; + + /* Call the real function. */ + _HMAC_SHA256_Update(ctx, in, len, tmp32); + + /* Clean the stack. */ + insecure_memzero(tmp32, 288); } /** @@ -347,21 +401,33 @@ HMAC_SHA256_Update(HMAC_SHA256_CTX * ctx, const void * in, size_t len) * Output the HMAC-SHA256 of the data input to the context ${ctx} into the * buffer ${digest}. */ +static void +_HMAC_SHA256_Final(uint8_t digest[32], HMAC_SHA256_CTX * ctx, + uint32_t tmp32[static restrict 72], uint8_t ihash[static restrict 32]) +{ + + /* Finish the inner SHA256 operation. */ + _SHA256_Final(ihash, &ctx->ictx, tmp32); + + /* Feed the inner hash to the outer SHA256 operation. */ + _SHA256_Update(&ctx->octx, ihash, 32, tmp32); + + /* Finish the outer SHA256 operation. */ + _SHA256_Final(digest, &ctx->octx, tmp32); +} + +/* Wrapper function for intermediate-values sanitization. */ void HMAC_SHA256_Final(uint8_t digest[32], HMAC_SHA256_CTX * ctx) { + uint32_t tmp32[72]; uint8_t ihash[32]; - /* Finish the inner SHA256 operation. */ - SHA256_Final(ihash, &ctx->ictx); - - /* Feed the inner hash to the outer SHA256 operation. */ - SHA256_Update(&ctx->octx, ihash, 32); - - /* Finish the outer SHA256 operation. */ - SHA256_Final(digest, &ctx->octx); + /* Call the real function. */ + _HMAC_SHA256_Final(digest, ctx, tmp32, ihash); /* Clean the stack. */ + insecure_memzero(tmp32, 288); insecure_memzero(ihash, 32); } @@ -375,10 +441,17 @@ HMAC_SHA256_Buf(const void * K, size_t Klen, const void * in, size_t len, uint8_t digest[32]) { HMAC_SHA256_CTX ctx; + uint32_t tmp32[72]; + uint8_t tmp8[96]; - HMAC_SHA256_Init(&ctx, K, Klen); - HMAC_SHA256_Update(&ctx, in, len); - HMAC_SHA256_Final(digest, &ctx); + _HMAC_SHA256_Init(&ctx, K, Klen, tmp32, &tmp8[0], &tmp8[64]); + _HMAC_SHA256_Update(&ctx, in, len, tmp32); + _HMAC_SHA256_Final(digest, &ctx, tmp32, &tmp8[0]); + + /* Clean the stack. */ + insecure_memzero(&ctx, sizeof(HMAC_SHA256_CTX)); + insecure_memzero(tmp32, 288); + insecure_memzero(tmp8, 96); } /** @@ -390,7 +463,9 @@ void PBKDF2_SHA256(const uint8_t * passwd, size_t passwdlen, const uint8_t * salt, size_t saltlen, uint64_t c, uint8_t * buf, size_t dkLen) { - HMAC_SHA256_CTX PShctx, hctx; + HMAC_SHA256_CTX Phctx, PShctx, hctx; + uint32_t tmp32[72]; + uint8_t tmp8[96]; size_t i; uint8_t ivec[4]; uint8_t U[32]; @@ -402,9 +477,13 @@ PBKDF2_SHA256(const uint8_t * passwd, size_t passwdlen, const uint8_t * salt, /* Sanity-check. */ assert(dkLen <= 32 * (size_t)(UINT32_MAX)); + /* Compute HMAC state after processing P. */ + _HMAC_SHA256_Init(&Phctx, passwd, passwdlen, + tmp32, &tmp8[0], &tmp8[64]); + /* Compute HMAC state after processing P and S. */ - HMAC_SHA256_Init(&PShctx, passwd, passwdlen); - HMAC_SHA256_Update(&PShctx, salt, saltlen); + memcpy(&PShctx, &Phctx, sizeof(HMAC_SHA256_CTX)); + _HMAC_SHA256_Update(&PShctx, salt, saltlen, tmp32); /* Iterate through the blocks. */ for (i = 0; i * 32 < dkLen; i++) { @@ -413,17 +492,17 @@ PBKDF2_SHA256(const uint8_t * passwd, size_t passwdlen, const uint8_t * salt, /* Compute U_1 = PRF(P, S || INT(i)). */ memcpy(&hctx, &PShctx, sizeof(HMAC_SHA256_CTX)); - HMAC_SHA256_Update(&hctx, ivec, 4); - HMAC_SHA256_Final(U, &hctx); + _HMAC_SHA256_Update(&hctx, ivec, 4, tmp32); + _HMAC_SHA256_Final(U, &hctx, tmp32, tmp8); /* T_i = U_1 ... */ memcpy(T, U, 32); for (j = 2; j <= c; j++) { /* Compute U_j. */ - HMAC_SHA256_Init(&hctx, passwd, passwdlen); - HMAC_SHA256_Update(&hctx, U, 32); - HMAC_SHA256_Final(U, &hctx); + memcpy(&hctx, &Phctx, sizeof(HMAC_SHA256_CTX)); + _HMAC_SHA256_Update(&hctx, U, 32, tmp32); + _HMAC_SHA256_Final(U, &hctx, tmp32, tmp8); /* ... xor U_j ... */ for (k = 0; k < 32; k++) @@ -437,6 +516,12 @@ PBKDF2_SHA256(const uint8_t * passwd, size_t passwdlen, const uint8_t * salt, memcpy(&buf[i * 32], T, clen); } - /* Clean PShctx, since we never called _Final on it. */ + /* Clean the stack. */ + insecure_memzero(&Phctx, sizeof(HMAC_SHA256_CTX)); insecure_memzero(&PShctx, sizeof(HMAC_SHA256_CTX)); + insecure_memzero(&hctx, sizeof(HMAC_SHA256_CTX)); + insecure_memzero(tmp32, 288); + insecure_memzero(tmp8, 96); + insecure_memzero(U, 32); + insecure_memzero(T, 32); } diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/alg/sha256.h b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/alg/sha256.h similarity index 97% rename from vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/alg/sha256.h rename to vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/alg/sha256.h index 5cd824b6..9ed27c9c 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/alg/sha256.h +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/alg/sha256.h @@ -47,7 +47,7 @@ void SHA256_Final(uint8_t[32], SHA256_CTX *); /** * SHA256_Buf(in, len, digest): - * Compute the SHA256 hash of ${len} bytes from $in} and write it to ${digest}. + * Compute the SHA256 hash of ${len} bytes from ${in} and write it to ${digest}. */ void SHA256_Buf(const void *, size_t, uint8_t[32]); diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/Build/cpusupport-X86-AESNI.c b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/Build/cpusupport-X86-AESNI.c similarity index 92% rename from vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/Build/cpusupport-X86-AESNI.c rename to vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/Build/cpusupport-X86-AESNI.c index 2af3b760..0a6f006b 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/Build/cpusupport-X86-AESNI.c +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/Build/cpusupport-X86-AESNI.c @@ -2,7 +2,8 @@ static char a[16]; -int main(void) +int +main(void) { __m128i x, y; diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/Build/cpusupport-X86-CPUID.c b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/Build/cpusupport-X86-CPUID.c similarity index 85% rename from vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/Build/cpusupport-X86-CPUID.c rename to vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/Build/cpusupport-X86-CPUID.c index 96ddde6a..04794d88 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/Build/cpusupport-X86-CPUID.c +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/Build/cpusupport-X86-CPUID.c @@ -1,6 +1,7 @@ #include -int main(void) +int +main(void) { unsigned int a, b, c, d; diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/Build/cpusupport-X86-SSE2.c b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/Build/cpusupport-X86-SSE2.c similarity index 90% rename from vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/Build/cpusupport-X86-SSE2.c rename to vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/Build/cpusupport-X86-SSE2.c index 0a5ad6ca..958db1cc 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/Build/cpusupport-X86-SSE2.c +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/Build/cpusupport-X86-SSE2.c @@ -2,7 +2,8 @@ static char a[16]; -int main(void) +int +main(void) { __m128i x; diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/Build/cpusupport.sh b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/Build/cpusupport.sh similarity index 100% rename from vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/Build/cpusupport.sh rename to vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/Build/cpusupport.sh diff --git a/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/cpusupport.h b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/cpusupport.h new file mode 100644 index 00000000..ec42215e --- /dev/null +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/cpusupport.h @@ -0,0 +1,106 @@ +#ifndef _CPUSUPPORT_H_ +#define _CPUSUPPORT_H_ + +/* + * To enable support for non-portable CPU features at compile time, one or + * more CPUSUPPORT_ARCH_FEATURE macros should be defined. This can be done + * directly on the compiler command line via -D CPUSUPPORT_ARCH_FEATURE or + * -D CPUSUPPORT_ARCH_FEATURE=1; or a file can be created with the + * necessary #define lines and then -D CPUSUPPORT_CONFIG_FILE=cpuconfig.h + * (or similar) can be provided to include that file here. + */ +#ifdef CPUSUPPORT_CONFIG_FILE +#include CPUSUPPORT_CONFIG_FILE +#endif + +/** + * The CPUSUPPORT_FEATURE macro declares the necessary variables and + * functions for detecting CPU feature support at run time. The function + * defined in the macro acts to cache the result of the ..._detect function + * using the ..._present and ..._init variables. The _detect function and the + * _present and _init variables are turn defined by CPUSUPPORT_FEATURE_DECL in + * appropriate cpusupport_foo_bar.c file. + * + * In order to allow CPUSUPPORT_FEATURE to be used for features which do not + * have corresponding CPUSUPPORT_FEATURE_DECL blocks in another source file, + * we abuse the C preprocessor: If CPUSUPPORT_${enabler} is defined to 1, then + * we access _present_1, _init_1, and _detect_1; but if it is not defined, we + * access _present_CPUSUPPORT_${enabler} etc., which we define as static, thus + * preventing the compiler from emitting a reference to an external symbol. + * + * In this way, it becomes possible to issue CPUSUPPORT_FEATURE invocations + * for nonexistent features without running afoul of the requirement that + * "If an identifier declared with external linkage is used... in the entire + * program there shall be exactly one external definition" (C99 standard, 6.9 + * paragraph 5). In practice, this means that users of the cpusupport code + * can omit build and runtime detection files without changing the framework + * code. + */ +#define CPUSUPPORT_FEATURE__(arch_feature, enabler, enabled) \ + static int cpusupport_ ## arch_feature ## _present ## _CPUSUPPORT_ ## enabler; \ + static int cpusupport_ ## arch_feature ## _init ## _CPUSUPPORT_ ## enabler; \ + static inline int cpusupport_ ## arch_feature ## _detect ## _CPUSUPPORT_ ## enabler(void) { return (0); } \ + extern int cpusupport_ ## arch_feature ## _present_ ## enabled; \ + extern int cpusupport_ ## arch_feature ## _init_ ## enabled; \ + int cpusupport_ ## arch_feature ## _detect_ ## enabled(void); \ + \ + static inline int \ + cpusupport_ ## arch_feature(void) \ + { \ + \ + if (cpusupport_ ## arch_feature ## _present_ ## enabled) \ + return (1); \ + else if (cpusupport_ ## arch_feature ## _init_ ## enabled) \ + return (0); \ + cpusupport_ ## arch_feature ## _present_ ## enabled = \ + cpusupport_ ## arch_feature ## _detect_ ## enabled(); \ + cpusupport_ ## arch_feature ## _init_ ## enabled = 1; \ + return (cpusupport_ ## arch_feature ## _present_ ## enabled); \ + } \ + static void (* cpusupport_ ## arch_feature ## _dummyptr)(void); \ + static inline void \ + cpusupport_ ## arch_feature ## _dummyfunc(void) \ + { \ + \ + (void)cpusupport_ ## arch_feature ## _present ## _CPUSUPPORT_ ## enabler; \ + (void)cpusupport_ ## arch_feature ## _init ## _CPUSUPPORT_ ## enabler; \ + (void)cpusupport_ ## arch_feature ## _detect ## _CPUSUPPORT_ ## enabler; \ + (void)cpusupport_ ## arch_feature ## _present_ ## enabled; \ + (void)cpusupport_ ## arch_feature ## _init_ ## enabled; \ + (void)cpusupport_ ## arch_feature ## _detect_ ## enabled; \ + (void)cpusupport_ ## arch_feature ## _dummyptr; \ + } \ + static void (* cpusupport_ ## arch_feature ## _dummyptr)(void) = cpusupport_ ## arch_feature ## _dummyfunc; \ + struct cpusupport_ ## arch_feature ## _dummy +#define CPUSUPPORT_FEATURE_(arch_feature, enabler, enabled) \ + CPUSUPPORT_FEATURE__(arch_feature, enabler, enabled) +#define CPUSUPPORT_FEATURE(arch, feature, enabler) \ + CPUSUPPORT_FEATURE_(arch ## _ ## feature, enabler, CPUSUPPORT_ ## enabler) + +/* + * CPUSUPPORT_FEATURE_DECL(arch, feature): + * Macro which defines variables and provides a function declaration for + * detecting the presence of "feature" on the "arch" architecture. The + * function body following this macro expansion must return nonzero if the + * feature is present, or zero if the feature is not present or the detection + * fails for any reason. + */ +#define CPUSUPPORT_FEATURE_DECL(arch, feature) \ + int cpusupport_ ## arch ## _ ## feature ## _present_1 = 0; \ + int cpusupport_ ## arch ## _ ## feature ## _init_1 = 0; \ + int cpusupport_ ## arch ## _ ## feature ## _detect_1(void); \ + int \ + cpusupport_ ## arch ## _ ## feature ## _detect_1(void) + +/* + * List of features. If a feature here is not enabled by the appropriate + * CPUSUPPORT_ARCH_FEATURE macro being defined, it has no effect; but if the + * relevant macro may be defined (e.g., by Build/cpusupport.sh successfully + * compiling Build/cpusupport-ARCH-FEATURE.c) then the C file containing the + * corresponding run-time detection code (cpusupport_arch_feature.c) must be + * compiled and linked in. + */ +CPUSUPPORT_FEATURE(x86, aesni, X86_AESNI); +CPUSUPPORT_FEATURE(x86, sse2, X86_SSE2); + +#endif /* !_CPUSUPPORT_H_ */ diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/cpusupport_x86_aesni.c b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/cpusupport_x86_aesni.c similarity index 92% rename from vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/cpusupport_x86_aesni.c rename to vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/cpusupport_x86_aesni.c index e4159995..b066dcce 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/cpusupport_x86_aesni.c +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/cpusupport_x86_aesni.c @@ -2,9 +2,9 @@ #ifdef CPUSUPPORT_X86_CPUID #include -#endif #define CPUID_AESNI_BIT (1 << 25) +#endif CPUSUPPORT_FEATURE_DECL(x86, aesni) { @@ -22,7 +22,7 @@ CPUSUPPORT_FEATURE_DECL(x86, aesni) goto unsupported; /* Return the relevant feature bit. */ - return (ecx & CPUID_AESNI_BIT); + return ((ecx & CPUID_AESNI_BIT) ? 1 : 0); unsupported: #endif diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/cpusupport_x86_sse2.c b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/cpusupport_x86_sse2.c similarity index 92% rename from vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/cpusupport_x86_sse2.c rename to vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/cpusupport_x86_sse2.c index 848bcf97..67d95504 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/cpusupport/cpusupport_x86_sse2.c +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/cpusupport/cpusupport_x86_sse2.c @@ -2,9 +2,9 @@ #ifdef CPUSUPPORT_X86_CPUID #include -#endif #define CPUID_SSE2_BIT (1 << 26) +#endif CPUSUPPORT_FEATURE_DECL(x86, sse2) { @@ -22,7 +22,7 @@ CPUSUPPORT_FEATURE_DECL(x86, sse2) goto unsupported; /* Return the relevant feature bit. */ - return (edx & CPUID_SSE2_BIT); + return ((edx & CPUID_SSE2_BIT) ? 1 : 0); unsupported: #endif diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_aes.c b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_aes.c similarity index 89% rename from vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_aes.c rename to vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_aes.c index 41d5e12c..9bd5af82 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_aes.c +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_aes.c @@ -23,16 +23,19 @@ struct crypto_aes_key; #ifdef CPUSUPPORT_X86_AESNI /* Test whether OpenSSL and AESNI code produce the same AES ciphertext. */ static int -aesnitest(uint8_t ptext[16], uint8_t * key, size_t keylen) +aesnitest(uint8_t ptext[16], uint8_t * key, size_t len) { AES_KEY kexp_openssl; void * kexp_aesni; uint8_t ctext_openssl[16]; uint8_t ctext_aesni[16]; + /* Sanity-check. */ + assert((len == 16) || (len == 32)); + /* Expand the key. */ - AES_set_encrypt_key(key, keylen * 8, &kexp_openssl); - if ((kexp_aesni = crypto_aes_key_expand_aesni(key, keylen)) == NULL) + AES_set_encrypt_key(key, (int)(len * 8), &kexp_openssl); + if ((kexp_aesni = crypto_aes_key_expand_aesni(key, len)) == NULL) goto err0; /* Encrypt the block. */ @@ -70,9 +73,9 @@ useaesni(void) /* Test cases: key is 0x00010203..., ptext is 0x00112233... */ for (i = 0; i < 16; i++) - ptext[i] = 0x11 * i; + ptext[i] = (0x11 * i) & 0xff; for (i = 0; i < 32; i++) - key[i] = i; + key[i] = i & 0xff; /* Test that AESNI and OpenSSL produce the same results. */ if (aesnitest(ptext, key, 16) || aesnitest(ptext, key, 32)) { @@ -112,7 +115,7 @@ crypto_aes_key_expand(const uint8_t * key, size_t len) goto err0; /* Expand the key. */ - AES_set_encrypt_key(key, len * 8, kexp); + AES_set_encrypt_key(key, (int)(len * 8), kexp); /* Success! */ return ((void *)kexp); @@ -158,6 +161,10 @@ crypto_aes_key_free(struct crypto_aes_key * key) } #endif + /* Behave consistently with free(NULL). */ + if (key == NULL) + return; + /* Attempt to zero the expanded key. */ insecure_memzero(key, sizeof(AES_KEY)); diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_aes.h b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_aes.h similarity index 100% rename from vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_aes.h rename to vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_aes.h diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_aes_aesni.c b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_aes_aesni.c similarity index 99% rename from vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_aes_aesni.c rename to vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_aes_aesni.c index 4559c1a2..f3eb228f 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_aes_aesni.c +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_aes_aesni.c @@ -3,7 +3,6 @@ #include #include -#include #include #include "insecure_memzero.h" @@ -226,6 +225,10 @@ void crypto_aes_key_free_aesni(void * key) { + /* Behave consistently with free(NULL). */ + if (key == NULL) + return; + /* Attempt to zero the expanded key. */ insecure_memzero(key, sizeof(struct crypto_aes_key_aesni)); diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_aes_aesni.h b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_aes_aesni.h similarity index 100% rename from vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_aes_aesni.h rename to vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_aes_aesni.h diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_aesctr.c b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_aesctr.c similarity index 89% rename from vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_aesctr.c rename to vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_aesctr.c index a8900f0c..981e4f33 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_aesctr.c +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_aesctr.c @@ -2,6 +2,7 @@ #include #include "crypto_aes.h" +#include "insecure_memzero.h" #include "sysendian.h" #include "crypto_aesctr.h" @@ -82,16 +83,13 @@ crypto_aesctr_stream(struct crypto_aesctr * stream, const uint8_t * inbuf, void crypto_aesctr_free(struct crypto_aesctr * stream) { - int i; - /* Be compatible with free(NULL). */ + /* Behave consistently with free(NULL). */ if (stream == NULL) return; /* Zero potentially sensitive information. */ - for (i = 0; i < 16; i++) - stream->buf[i] = 0; - stream->bytectr = stream->nonce = 0; + insecure_memzero(stream, sizeof(struct crypto_aesctr)); /* Free the stream. */ free(stream); @@ -99,7 +97,7 @@ crypto_aesctr_free(struct crypto_aesctr * stream) /** * crypto_aesctr_buf(key, nonce, inbuf, outbuf, buflen): - * Equivalent to init(key, nonce); stream(inbuf, outbuf, buflen); free. + * Equivalent to _init(key, nonce); _stream(inbuf, outbuf, buflen); _free(). */ void crypto_aesctr_buf(const struct crypto_aes_key * key, uint64_t nonce, @@ -107,7 +105,6 @@ crypto_aesctr_buf(const struct crypto_aes_key * key, uint64_t nonce, { struct crypto_aesctr stream_rec; struct crypto_aesctr * stream = &stream_rec; - int i; /* Initialize values. */ stream->key = key; @@ -118,7 +115,5 @@ crypto_aesctr_buf(const struct crypto_aes_key * key, uint64_t nonce, crypto_aesctr_stream(stream, inbuf, outbuf, buflen); /* Zero potentially sensitive information. */ - for (i = 0; i < 16; i++) - stream->buf[i] = 0; - stream->bytectr = stream->nonce = 0; + insecure_memzero(stream, sizeof(struct crypto_aesctr)); } diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_aesctr.h b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_aesctr.h similarity index 90% rename from vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_aesctr.h rename to vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_aesctr.h index 7ab98395..c054cbdd 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_aesctr.h +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_aesctr.h @@ -4,8 +4,9 @@ #include #include -/* Opaque type. */ +/* Opaque types. */ struct crypto_aes_key; +struct crypto_aesctr; /** * crypto_aesctr_init(key, nonce): @@ -33,7 +34,7 @@ void crypto_aesctr_free(struct crypto_aesctr *); /** * crypto_aesctr_buf(key, nonce, inbuf, outbuf, buflen): - * Equivalent to init(key, nonce); stream(inbuf, outbuf, buflen); free. + * Equivalent to _init(key, nonce); _stream(inbuf, outbuf, buflen); _free(). */ void crypto_aesctr_buf(const struct crypto_aes_key *, uint64_t, const uint8_t *, uint8_t *, size_t); diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_entropy.c b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_entropy.c similarity index 100% rename from vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_entropy.c rename to vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_entropy.c diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_entropy.h b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_entropy.h similarity index 100% rename from vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/crypto/crypto_entropy.h rename to vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/crypto/crypto_entropy.h diff --git a/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/util/asprintf.c b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/util/asprintf.c new file mode 100644 index 00000000..d9be9246 --- /dev/null +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/util/asprintf.c @@ -0,0 +1,49 @@ +#include +#include +#include + +#include "asprintf.h" + +/** + * asprintf(ret, format, ...): + * Do asprintf(3) like GNU and BSD do. + */ +int +asprintf(char ** ret, const char * format, ...) +{ + va_list ap; + int len; + size_t buflen; + + /* Figure out how long the string needs to be. */ + va_start(ap, format); + len = vsnprintf(NULL, 0, format, ap); + va_end(ap); + + /* Did we fail? */ + if (len < 0) + goto err0; + buflen = (size_t)(len) + 1; + + /* Allocate memory. */ + if ((*ret = malloc(buflen)) == NULL) + goto err0; + + /* Actually generate the string. */ + va_start(ap, format); + len = vsnprintf(*ret, buflen, format, ap); + va_end(ap); + + /* Did we fail? */ + if (len < 0) + goto err1; + + /* Success! */ + return (len); + +err1: + free(*ret); +err0: + /* Failure! */ + return (-1); +} diff --git a/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/util/asprintf.h b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/util/asprintf.h new file mode 100644 index 00000000..0c8352b9 --- /dev/null +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/util/asprintf.h @@ -0,0 +1,16 @@ +#ifndef _ASPRINTF_H_ +#define _ASPRINTF_H_ + +/* Avoid namespace collisions with BSD/GNU asprintf. */ +#ifdef asprintf +#undef asprintf +#endif +#define asprintf libcperciva_asprintf + +/** + * asprintf(ret, format, ...): + * Do asprintf(3) like GNU and BSD do. + */ +int asprintf(char **, const char *, ...); + +#endif /* !_ASPRINTF_H_ */ diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/util/entropy.c b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/util/entropy.c similarity index 95% rename from vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/util/entropy.c rename to vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/util/entropy.c index 0c6bbf82..9f83f3e7 100644 --- a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/util/entropy.c +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/util/entropy.c @@ -1,3 +1,4 @@ +#include #include #include #include @@ -53,8 +54,8 @@ entropy_read(uint8_t * buf, size_t buflen) } /* We've filled a portion of the buffer. */ - buf += lenread; - buflen -= lenread; + buf += (size_t)lenread; + buflen -= (size_t)lenread; } /* Close the device. */ diff --git a/vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/util/entropy.h b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/util/entropy.h similarity index 100% rename from vendor/scrypt/scrypt-1.2.0/scrypt/libcperciva/util/entropy.h rename to vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/util/entropy.h diff --git a/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/util/getopt.c b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/util/getopt.c new file mode 100644 index 00000000..5277ed01 --- /dev/null +++ b/vendor/scrypt/scrypt-1.2.1/scrypt/libcperciva/util/getopt.c @@ -0,0 +1,358 @@ +#include +#include +#include +#include + +#include "getopt.h" + +/* + * Standard getopt global variables. optreset starts as non-zero in order to + * trigger initialization behaviour. + */ +const char * optarg = NULL; +int optind = 1; +int opterr = 1; +int optreset = 1; + +/* + * Quasi-internal global variables -- these are used via GETOPT macros. + */ +const char * getopt_dummy = "(dummy)"; +int getopt_initialized = 0; + +/* + * Internal variables. + */ +static const char * cmdname = NULL; +static struct opt { + const char * os; + size_t olen; + int hasarg; +} * opts = NULL; +static size_t nopts; +static size_t opt_missing; +static size_t opt_default; +static size_t opt_found; +static const char * packedopts; +static char popt[3]; +static int atexit_registered = 0; + +/* Print a message. */ +#define PRINTMSG(...) do { \ + if (cmdname != NULL) \ + fprintf(stderr, "%s: ", cmdname); \ + fprintf(stderr, __VA_ARGS__); \ + fprintf(stderr, "\n"); \ +} while (0) + +/* Print an error message and die. */ +#define DIE(...) do { \ + PRINTMSG(__VA_ARGS__); \ + abort(); \ +} while (0) + +/* Print a warning, if warnings are enabled. */ +#define WARN(...) do { \ + if (opterr == 0) \ + break; \ + if (opt_missing != opt_default) \ + break; \ + PRINTMSG(__VA_ARGS__); \ +} while (0) + +/* Free allocated options array. */ +static void +atexit_handler(void) +{ + + free(opts); + opts = NULL; +} + +/* Reset internal state. */ +static void +reset(int argc, char * const argv[]) +{ + const char * p; + + /* If we have arguments, stash argv[0] for error messages. */ + if (argc > 0) { + /* Find the basename, without leading directories. */ + for (p = cmdname = argv[0]; *p != '\0'; p++) { + if (*p == '/') + cmdname = p + 1; + } + } + + /* Discard any registered command-line options. */ + free(opts); + opts = NULL; + + /* Register atexit handler if we haven't done so already. */ + if (!atexit_registered) { + atexit(atexit_handler); + atexit_registered = 1; + } + + /* We will start scanning from the first option. */ + optind = 1; + + /* We're not in the middle of any packed options. */ + packedopts = NULL; + + /* We haven't found any option yet. */ + opt_found = (size_t)(-1); + + /* We're not initialized yet. */ + getopt_initialized = 0; + + /* Finished resetting state. */ + optreset = 0; +} + +/* Search for an option string. */ +static size_t +searchopt(const char * os) +{ + size_t i; + + /* Scan the array of options. */ + for (i = 0; i < nopts; i++) { + /* Is there an option in this slot? */ + if (opts[i].os == NULL) + continue; + + /* Does this match up to the length of the option string? */ + if (strncmp(opts[i].os, os, opts[i].olen)) + continue; + + /* Do we have