Rationalize across msvc project versions. #393
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thank you, Eric! Merged. |
jedisct1
added a commit
that referenced
this pull request
Aug 1, 2016
commit 2f4f718 Author: Frank Denis <github@pureftpd.org> Date: Sun Jul 31 16:34:01 2016 +0200 Remove dev flag commit 19a9d18 Author: Frank Denis <github@pureftpd.org> Date: Sun Jul 24 19:58:00 2016 +0200 _MSC_VER > 1600 -> _MSC_VER >= 1700 for consistency commit 5497ca1 Merge: 482ab1e 6b739fc Author: Frank Denis <jedisct1@users.noreply.github.com> Date: Sun Jul 24 19:57:14 2016 +0200 Merge pull request #418 from Jan-E/vs2010x64 Fix x64 builds for MSVC < vc11 commit 482ab1e Author: Frank Denis <github@pureftpd.org> Date: Sun Jul 24 19:53:41 2016 +0200 Reintroduce 27a2756 commit d60b0c3 Author: Frank Denis <github@pureftpd.org> Date: Sun Jul 24 15:36:02 2016 +0200 Revert "VS2010 debug symbols" This reverts commit 48b5f7b. commit ab72d2d Author: Frank Denis <github@pureftpd.org> Date: Sun Jul 24 15:35:56 2016 +0200 Revert "VS2012 debug symbols" This reverts commit 6ff50e4. commit 6996360 Author: Frank Denis <github@pureftpd.org> Date: Sun Jul 24 15:35:51 2016 +0200 Revert "VS2013 debug symbols" This reverts commit 0788e50. commit 27a2756 Merge: 351ae49 0788e50 Author: Frank Denis <jedisct1@users.noreply.github.com> Date: Sun Jul 24 15:16:04 2016 +0200 Merge pull request #417 from Jan-E/debugsymbols Genereate pdb files for VS2010, 2012, 2013 commit 6b739fc Author: Jan-E <github@ehrhardt.nl> Date: Sun Jul 24 02:13:22 2016 +0200 Fix VS2010 (and VC9) x64 build commit 0788e50 Author: Jan-E <github@ehrhardt.nl> Date: Sun Jul 24 01:03:41 2016 +0200 VS2013 debug symbols commit 6ff50e4 Author: Jan-E <github@ehrhardt.nl> Date: Sun Jul 24 01:01:12 2016 +0200 VS2012 debug symbols commit 48b5f7b Author: Jan-E <github@ehrhardt.nl> Date: Sun Jul 24 00:55:45 2016 +0200 VS2010 debug symbols commit 351ae49 Author: Frank Denis <github@pureftpd.org> Date: Wed Jul 6 16:23:50 2016 +0200 cpuid is not available on i686-nacl commit 89918e9 Author: Frank Denis <github@pureftpd.org> Date: Tue Jul 5 12:03:00 2016 +0200 crit_{enter,leave} can fail commit 2949214 Author: Frank Denis <github@pureftpd.org> Date: Sat Jul 2 10:05:43 2016 +0200 Warn if the library is being compiled in a custom way commit a7a3235 Author: Frank Denis <github@pureftpd.org> Date: Thu Jun 30 18:48:16 2016 +0200 Version bump (not released yet) commit eeb08c9 Merge: a162c09 a683111 Author: Frank Denis <github@pureftpd.org> Date: Thu Jun 30 18:48:02 2016 +0200 Merge branch 'master' of https://github.com/jedisct1/libsodium * 'master' of https://github.com/jedisct1/libsodium: Add license title commit a683111 Merge: 2cc0bab 5917d2a Author: Frank Denis <jedisct1@users.noreply.github.com> Date: Thu Jun 30 18:47:53 2016 +0200 Merge pull request #410 from waldyrious/patch-1 Add license title commit 5917d2a Author: Waldir Pimenta <waldyrious@gmail.com> Date: Thu Jun 30 14:18:36 2016 +0100 Add license title It's not strictly required, but it's useful metadata, and part of the recommended license template text (see http://choosealicense.com/licenses/isc/ and https://opensource.org/licenses/isc-license) commit a162c09 Author: Frank Denis <github@pureftpd.org> Date: Wed Jun 29 17:13:11 2016 +0200 Update ChangeLog commit 2cc0bab Author: Frank Denis <github@pureftpd.org> Date: Wed Jun 29 15:31:23 2016 +0200 Update comment commit 648f46d Author: Frank Denis <github@pureftpd.org> Date: Wed Jun 29 15:28:15 2016 +0200 Expose sodium_crit_enter() and sodium_crit_leave() internally commit 5a3ff83 Author: Frank Denis <github@pureftpd.org> Date: Sun Jun 19 23:26:08 2016 +0200 Slightly change how the length of argon2 strings is checked commit 6fad364 Author: Frank Denis <github@pureftpd.org> Date: Wed Jun 15 16:00:59 2016 +0200 Nits commit c399905 Merge: ba9c296 77c05fc Author: Frank Denis <jedisct1@users.noreply.github.com> Date: Wed Jun 15 15:54:36 2016 +0200 Merge pull request #405 from azet/master document why RtlGenRandom is used commit 77c05fc Author: Aaron Zauner <azet@azet.org> Date: Wed Jun 15 21:50:33 2016 +0800 document why RtlGenRandom is used commit ba9c296 Author: Frank Denis <github@pureftpd.org> Date: Wed Jun 15 09:50:45 2016 +0200 Correct whitespace in path detection, and turn it into a fatal error commit aaf6854 Author: Frank Denis <github@pureftpd.org> Date: Wed Jun 8 08:34:45 2016 +0200 Remove extra space commit fcf9656 Author: Frank Denis <github@pureftpd.org> Date: Sun Jun 5 22:04:10 2016 +0200 CRLF commit f8cc885 Author: Frank Denis <github@pureftpd.org> Date: Sun Jun 5 22:00:56 2016 +0200 Android: compile for platform 24, check compat with 16 or 21 (64 bit) commit cc7b57b Author: Frank Denis <github@pureftpd.org> Date: Sat Jun 4 07:09:36 2016 +0200 Forgot to ignore libsodium-uninstalled.pc commit eaba3a4 Author: Frank Denis <github@pureftpd.org> Date: Sat Jun 4 06:57:56 2016 +0200 Ignore test/js.done commit a0e22bd Author: Frank Denis <github@pureftpd.org> Date: Sat Jun 4 06:52:25 2016 +0200 Sort .gitignore commit da05700 Author: Frank Denis <github@pureftpd.org> Date: Sat Jun 4 06:52:08 2016 +0200 Remove curvecp from .gitignore commit 9ecde0c Author: Frank Denis <github@pureftpd.org> Date: Sat Jun 4 06:47:24 2016 +0200 Ignore more specific directories than libsodium-* commit 9c12da0 Author: Frank Denis <github@pureftpd.org> Date: Thu May 26 06:08:26 2016 -0700 Don't include <immintrin.h> if it is not needed Some environments provide <wmmintrin.h> but not <immintrin.h> commit fa4e4bf Author: Frank Denis <github@pureftpd.org> Date: Wed May 18 22:12:07 2016 +0200 Fix & simplify MADV_DO{NO}DUMP alternatives commit d5f77da Merge: f01299a 7a4c445 Author: Frank Denis <jedisct1@users.noreply.github.com> Date: Wed May 18 22:07:59 2016 +0200 Merge pull request #399 from blacklion/patch-1 Support madvise() on FreeBSD commit 7a4c445 Author: Lev Serebryakov <blacklion+git@gmail.com> Date: Wed May 18 23:04:09 2016 +0300 Support madvise() on FreeBSD FreeBSD have madvise() behaviors equivalent to MADV_DONTDUMP and MADV_DODUMP but with its own names. Add definitions for these behaviors used in sodium_mlock() and sodium_munlock() if FreeBSD names are found and Linux ones don't. commit f01299a Author: Frank Denis <github@pureftpd.org> Date: Tue May 17 23:05:04 2016 +0200 Indent commit 0e67b40 Merge: efb81c7 998bacf Author: Frank Denis <jedisct1@users.noreply.github.com> Date: Tue May 17 22:59:44 2016 +0200 Merge pull request #398 from sneves/master don't crash on Win32 commit 998bacf Author: Samuel Neves <sneves@dei.uc.pt> Date: Tue May 17 21:40:56 2016 +0100 don't crash on Win32 commit efb81c7 Author: Frank Denis <github@pureftpd.org> Date: Tue May 17 01:41:06 2016 +0200 CRLF commit 1b30cf1 Merge: 263101c b9c2661 Author: Frank Denis <jedisct1@users.noreply.github.com> Date: Tue May 17 01:36:06 2016 +0200 Merge pull request #397 from ThomasWaldmann/master fix avx2 feature detection, fixes #395 commit b9c2661 Author: Thomas Waldmann <tw@waldmann-edv.de> Date: Tue May 17 01:19:58 2016 +0200 fix avx2 feature detection, fixes #395 cpuid needed to get called with EAX = 7 to get the "extended features" (not with EAX = 1 for the "features"). commit 263101c Author: Frank Denis <github@pureftpd.org> Date: Tue May 17 00:24:33 2016 +0200 sandy2x: don't mix VEX and non-VEX instructions commit 080dcad Merge: f361d1c 0b8cb8a Author: Frank Denis <jedisct1@users.noreply.github.com> Date: Mon May 16 23:42:20 2016 +0200 Merge pull request #396 from langboost/master Fixing a small documentation typo commit f361d1c Author: Frank Denis <github@pureftpd.org> Date: Mon May 16 23:34:03 2016 +0200 sandy2x: clean the upper halves of the AVX registers On Linux, with dynamic linking, upper AVX registers are not 0, which introduces a massive performance penalty due to state transitions. Thanks to to Tung Chou and Samuel Neves for catching this, and to @theakman2 for his initial report. commit 0b8cb8a Author: Jeff R <langboost@gmail.com> Date: Mon May 16 16:05:24 2016 -0500 Fixing a small documentation typo commit 593599a Author: Frank Denis <github@pureftpd.org> Date: Mon May 16 12:25:35 2016 +0200 Align loops commit c303c1f Author: Frank Denis <github@pureftpd.org> Date: Mon May 16 12:20:15 2016 +0200 sandy2x: align branch targets commit c752eb5 Author: Frank Denis <github@pureftpd.org> Date: Sun May 15 17:18:50 2016 +0200 On ancient Linux kernels, block on /dev/random before using /dev/urandom commit 1e1ba1a Merge: 248f381 f8d5cf9 Author: Frank Denis <jedisct1@users.noreply.github.com> Date: Thu May 12 11:23:59 2016 +0200 Merge pull request #393 from evoskuil/master Rationalize across msvc project versions. commit f8d5cf9 Author: evoskuil <eric@voskuil.org> Date: Thu May 12 02:03:23 2016 -0700 Clone msvc .filters (from vs2013 version) for uniformity. commit 3aad5c1 Author: evoskuil <eric@voskuil.org> Date: Thu May 12 02:02:38 2016 -0700 Use lowest common denominator .vcxproj ToolsVersion. commit 248f381 Author: Frank Denis <github@pureftpd.org> Date: Thu May 5 19:10:11 2016 +0200 Rewrite aesni_key256_expand() for clarity commit a37d2b8 Author: Frank Denis <github@pureftpd.org> Date: Wed May 4 23:31:09 2016 +0200 Rename REDUCE4 to MULREDUCE4 for clarity commit 0f053ae Author: Frank Denis <github@pureftpd.org> Date: Wed May 4 23:09:07 2016 +0200 Grammar commit 474952d Author: Frank Denis <github@pureftpd.org> Date: Sat Apr 30 16:23:02 2016 +0200 Try using cpuid on NativeClient commit a87d30f Author: Frank Denis <github@pureftpd.org> Date: Sat Apr 30 16:08:52 2016 +0200 Try MMX/SSE/SSE2/SSE3/SSSE4/SSE4.1 instructions on NativeClient commit a6139c6 Author: Frank Denis <github@pureftpd.org> Date: Sat Apr 30 14:07:50 2016 +0200 Add nativeclient-x86.sh commit 00e1561 Author: Frank Denis <github@pureftpd.org> Date: Sat Apr 30 13:03:31 2016 +0200 Disable SIMD instructions on NativeClient commit 44cd974 Author: Frank Denis <github@pureftpd.org> Date: Sat Apr 30 11:20:14 2016 +0200 Remove extra CRLF commit a91530d Author: Frank Denis <github@pureftpd.org> Date: Sat Apr 30 10:17:47 2016 +0200 Do not use pthreads on NativeClient commit 90603f5 Author: Frank Denis <github@pureftpd.org> Date: Fri Apr 29 22:56:09 2016 +0200 x86-64 -> x86_64 commit d463dad Author: Frank Denis <github@pureftpd.org> Date: Fri Apr 29 22:29:34 2016 +0200 Disable ssp and aesni on nativeclient, nativeclient.sh->nativeclient-pnacl.sh commit 3499cbf Author: Frank Denis <github@pureftpd.org> Date: Fri Apr 29 21:55:06 2016 +0200 Add dist-build/nativeclient-x86-64.sh commit 858b8e8 Author: Frank Denis <github@pureftpd.org> Date: Fri Apr 29 20:49:35 2016 +0200 Put `then` and `if` on the same line. Having `then` aligned with `if` was pretty confusing, and I kept reading `else` instead of `then`. commit 90a5f8e Author: Frank Denis <github@pureftpd.org> Date: Fri Apr 29 20:40:56 2016 +0200 Build scripts don't clean after themselves commit 8326bc1 Author: Frank Denis <github@pureftpd.org> Date: Fri Apr 29 20:36:06 2016 +0200 CRLF commit 251b836 Author: Frank Denis <github@pureftpd.org> Date: Fri Apr 29 20:34:24 2016 +0200 NativeClient complains about __memset_chk being undefined on OSX. Work around this. There might be a better fix, but at least the test suite compiles with the newlib. commit 7a667ed Author: Frank Denis <github@pureftpd.org> Date: Fri Apr 29 10:51:13 2016 +0200 NativeClient: use get_random_bytes directly instead of the wrapper commit 681176e Author: Frank Denis <github@pureftpd.org> Date: Fri Apr 29 10:08:45 2016 +0200 abort() if nacl_secure_random() ever returns 0 but the wrong size commit 40db481 Author: Frank Denis <github@pureftpd.org> Date: Fri Apr 29 09:45:12 2016 +0200 Use pepper_49 commit fbad64f Author: Frank Denis <github@pureftpd.org> Date: Thu Apr 28 21:31:18 2016 +0200 Disable asm on native client commit 5f3b59c Author: Frank Denis <github@pureftpd.org> Date: Wed Apr 27 11:37:17 2016 +0200 Tabify commit 46539b9 Author: Frank Denis <github@pureftpd.org> Date: Wed Apr 27 00:11:00 2016 +0200 Indent commit ffd5987 Author: Frank Denis <jedisct1@users.noreply.github.com> Date: Tue Apr 26 01:43:00 2016 +0200 Proper lock test on Windows commit d908d08 Author: Frank Denis <github@pureftpd.org> Date: Mon Apr 25 20:15:33 2016 +0200 Simplify the fallback _sodium_crit_enter() code commit f8ff8eb Author: Frank Denis <github@pureftpd.org> Date: Mon Apr 25 16:13:46 2016 +0200 Add locks around sodium_init() commit 14211cd Author: Frank Denis <github@pureftpd.org> Date: Fri Apr 22 12:01:56 2016 +0200 Update include guard commit b2586f5 Author: Frank Denis <github@pureftpd.org> Date: Fri Apr 22 11:46:37 2016 +0200 Use the same convention for include guards everywhere commit 801fbde Author: Frank Denis <github@pureftpd.org> Date: Thu Apr 21 20:37:11 2016 +0200 scrypt/sse - Note that B's layout is permuted compared to nosse commit 2de4b3f Author: Frank Denis <github@pureftpd.org> Date: Thu Apr 21 17:17:24 2016 +0200 Hand-roll zeroing instead of relying on memset() commit 24dacca Author: Frank Denis <github@pureftpd.org> Date: Tue Apr 19 02:20:32 2016 +0200 Remove README commit 107513f Author: Frank Denis <github@pureftpd.org> Date: Tue Apr 19 02:16:50 2016 +0200 Larger logo, less prominent saltcellar commit b94a76f Author: Frank Denis <github@pureftpd.org> Date: Tue Apr 19 00:27:35 2016 +0200 Import ax_pthread.m4 commit e816ffb Author: Frank Denis <github@pureftpd.org> Date: Tue Apr 19 00:24:46 2016 +0200 Quotes commit 492d4b1 Author: Frank Denis <github@pureftpd.org> Date: Mon Apr 18 21:40:04 2016 +0200 Repair NativeClient support commit bdf5c82 Author: Frank Denis <github@pureftpd.org> Date: Mon Apr 18 20:54:46 2016 +0200 Compile with pthreads commit 8ab4334 Author: Frank Denis <github@pureftpd.org> Date: Mon Apr 18 16:53:34 2016 +0200 if -> ifdef commit 214f168 Author: Frank Denis <github@pureftpd.org> Date: Sun Apr 17 23:58:44 2016 +0200 Do not use emscripten's headless mode commit 4ff0d32 Author: Frank Denis <github@pureftpd.org> Date: Sun Apr 17 23:18:18 2016 +0200 Remove crypto_pwhash_*() from the non-sumo Javascript distribution commit 9aab628 Author: Frank Denis <github@pureftpd.org> Date: Sun Apr 17 23:15:53 2016 +0200 pwhash_*() require heap allocations, but everything else doesn't commit 5dce2b5 Author: Frank Denis <github@pureftpd.org> Date: Sun Apr 17 22:45:37 2016 +0200 Revamp the emscripten build script commit 7055d81 Author: Frank Denis <github@pureftpd.org> Date: Fri Apr 15 00:32:09 2016 +0200 Reduce TOTAL_MEMORY commit da65a7f Author: Frank Denis <github@pureftpd.org> Date: Thu Apr 14 23:13:40 2016 +0200 JS target: use -Os instead of -O3 Performance is roughly the same, but output is noticeably smaller commit 531ce5b Author: Frank Denis <github@pureftpd.org> Date: Thu Apr 14 17:17:26 2016 +0200 Do not use getrandom(2) on SLES11 service pack 4 commit 9a9dc02 Author: Frank Denis <github@pureftpd.org> Date: Wed Apr 13 11:13:59 2016 +0200 Do not use -Ofast commit c41bf91 Author: Frank Denis <github@pureftpd.org> Date: Wed Apr 13 10:58:35 2016 +0200 Run `make clean` after `./configure` instead of `distclean` before commit 9f1a5e0 Author: Frank Denis <github@pureftpd.org> Date: Wed Apr 13 10:49:55 2016 +0200 Check for MinGW presence commit daeaf63 Author: Frank Denis <github@pureftpd.org> Date: Wed Apr 13 09:22:51 2016 +0200 Not an ELF system, not an Apple system, weak symbols may not work commit 76d061b Author: Frank Denis <github@pureftpd.org> Date: Wed Apr 13 09:11:52 2016 +0200 Revert -lfto addition on msys2 commit 5354496 Author: Frank Denis <github@pureftpd.org> Date: Wed Apr 13 08:52:56 2016 +0200 msys2 supports -Ofast and -flto these days commit 3fe5590 Author: Frank Denis <github@pureftpd.org> Date: Wed Apr 13 08:12:54 2016 +0200 Do not forget crypto_pwhash.c on Visual Studio commit 34aeee6 Author: Frank Denis <github@pureftpd.org> Date: Tue Apr 12 07:30:54 2016 +0200 Replace two more memcpy() with a local loop commit d729432 Author: Frank Denis <github@pureftpd.org> Date: Tue Apr 12 02:14:45 2016 +0200 sha{512,256}: use a local loop instead of if + memcpy() Compilers can't figure out the max inlen value, so help them with an explicit AND. Unify the name of the input pointer by the way. commit 727703a Author: Frank Denis <github@pureftpd.org> Date: Tue Apr 12 01:27:22 2016 +0200 https commit e2f75d6 Author: Frank Denis <github@pureftpd.org> Date: Tue Apr 12 01:23:14 2016 +0200 Make assertions more readable commit bbf1e17 Author: Frank Denis <github@pureftpd.org> Date: Tue Apr 12 00:51:41 2016 +0200 Avoid bit shifting with signed values commit 50e11be Author: Frank Denis <github@pureftpd.org> Date: Tue Apr 12 00:41:37 2016 +0200 memcpy(): pointers must be valid even if the size is 0 commit 0248c38 Author: Frank Denis <github@pureftpd.org> Date: Mon Apr 11 23:21:12 2016 +0200 Use slightly more modern target CPUs for the msys2 builds commit 0a590b0 Author: Frank Denis <github@pureftpd.org> Date: Mon Apr 11 18:33:50 2016 +0200 Decryption functions can now accept a `NULL` pointer for the output This checks the MAC without writing the decrypted message. commit 80310ef Author: Frank Denis <github@pureftpd.org> Date: Fri Apr 8 17:50:18 2016 +0200 Set randombytes_implementation to NULL by default, to cope with Visual Studio 2008 commit a53a9c9 Author: Frank Denis <github@pureftpd.org> Date: Fri Apr 8 08:25:42 2016 +0200 Back to dev mode commit 22ab28b Author: Frank Denis <github@pureftpd.org> Date: Thu Apr 7 18:57:07 2016 +0200 Require Visual Studio 2010+ for AESNI commit 292969b Author: Frank Denis <github@pureftpd.org> Date: Thu Apr 7 08:05:15 2016 +0200 Argon2: initialize ctx{.pwd,.pwdlen} in the verify function Keep initializing the length for clarity; Compilers know how to optimize this out. commit 2e7247d Author: Frank Denis <github@pureftpd.org> Date: Wed Apr 6 18:21:27 2016 +0200 Use absolute .done files commit 99576d4 Author: Frank Denis <github@pureftpd.org> Date: Wed Apr 6 15:05:59 2016 +0200 Use a specific "done" file for every javascript target commit 50a8c61 Author: Frank Denis <github@pureftpd.org> Date: Wed Apr 6 14:53:33 2016 +0200 Use different folders for libsodium-js and for the sumo version commit 1818267 Author: Frank Denis <github@pureftpd.org> Date: Wed Apr 6 00:57:46 2016 +0200 Return -1 if crypto_generichash_final() is called twice commit df91dd1 Author: Frank Denis <github@pureftpd.org> Date: Mon Apr 4 23:54:34 2016 +0200 Remove the "examples" directory. It is very incomplete and hasn't been updated for a long time. The idea was good, and this directory might be resurrected later. But for now, better hide it than keep something unfinished around.
Repository owner
locked and limited conversation to collaborators
Aug 28, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I just ran my code generator against the visual studio solutions. I'm really amazed at how clean they are. These are some trivial tweaks to make them uniform across 2010/12/13/15.