Commit Graph
68 Commits
Author SHA1 Message Date
Frank Denis d1eb837e21 Merge pull request #419 from ivmaykov/master
Better AVX2 detection for GCC compilers
2016-08-04 02:04:58 +02:00
Frank Denis 5497ca1fad Merge pull request #418 from Jan-E/vs2010x64
Fix x64 builds for MSVC < vc11
2016-07-24 19:57:14 +02:00
Frank Denis 27a2756479 Merge pull request #417 from Jan-E/debugsymbols
Genereate pdb files for VS2010, 2012, 2013
2016-07-24 15:16:04 +02:00
Frank Denis a683111d89 Merge pull request #410 from waldyrious/patch-1
Add license title
2016-06-30 18:47:53 +02:00
Frank Denis c3999056b5 Merge pull request #405 from azet/master
document why RtlGenRandom is used
2016-06-15 15:54:36 +02:00
Frank Denis d5f77da821 Merge pull request #399 from blacklion/patch-1
Support madvise() on FreeBSD
2016-05-18 22:07:59 +02:00
Frank Denis 0e67b4073c Merge pull request #398 from sneves/master
don't crash on Win32
2016-05-17 22:59:44 +02:00
Frank Denis 1b30cf14ed Merge pull request #397 from ThomasWaldmann/master
fix avx2 feature detection, fixes #395
2016-05-17 01:36:06 +02:00
Frank Denis 080dcadb69 Merge pull request #396 from langboost/master
Fixing a small documentation typo
2016-05-16 23:42:20 +02:00
Frank Denis 1e1ba1af02 Merge pull request #393 from evoskuil/master
Rationalize across msvc project versions.
2016-05-12 11:23:59 +02:00
Frank Denis ffd5987e7c Proper lock test on Windows 2016-04-26 01:43:00 +02:00
Frank Denis fdf945afeb Merge pull request #376 from dwrensha/relative-includes
Fix up relative includes of sodium/common.h
2016-04-04 08:36:38 +02:00
Frank Denis a456244a95 Merge pull request #373 from jcolli44/master
Introduce C++Builder compatibility
2016-03-18 22:06:59 +01:00
Frank Denis 5efdbe4e1e Merge pull request #372 from paragonie-scott/patch-1
Make it easier to find the integrity checking instructions
2016-03-17 23:24:16 +01:00
Frank Denis d7ffff1f31 Merge pull request #351 from gnieboer/master
added argon2-fill-block-ssse3.c to VS project
2016-02-07 17:58:11 +01:00
Frank Denis 53419d7b06 Merge pull request #348 from betafive/pbarker/blake2
Add crypt_generichash_blake2b_statebytes function
2016-01-16 20:15:00 +01:00
Frank Denis b6fd83fa2f Merge pull request #340 from neuhaus/patch-1
wipe secret key as soon as it is no longer needed.
2015-12-22 11:16:09 +01:00
Frank Denis c82925f2e6 Merge pull request #334 from bsilver8192/master
Various small cleanups
2015-12-17 09:38:31 +01:00
Frank Denis 37834dab69 Merge pull request #322 from mc10/patch-1
README: Use the svg Travis image
2015-11-18 23:15:05 +01:00
Frank Denis a56274b9ee Merge pull request #311 from angt/angt-patch-1
Fix crypto_aead_aes256gcm_decrypt_afternm() when clen < 16
2015-10-30 19:42:01 +01:00
Frank Denis 4b6348975b Merge pull request #309 from dtorelliitrsgroup/master
Libsodium does not compile for Solaris CC compiler #308
2015-10-22 18:31:03 +02:00
Frank Denis b618248c11 Merge pull request #304 from Sc00bz/patch-1
Zero the padding after having computed a hmac
2015-10-11 02:37:05 +02:00
Frank Denis cccc29cc18 Merge pull request #293 from mvduin/master
improve test for unaligned access
2015-09-04 15:31:01 +02:00
Frank Denis 39bc0980ef Merge pull request #287 from wongsyrone/master
Fix _FORTIFY_SOURCE redefined issue
2015-08-02 08:18:08 +02:00
Frank Denis 024b74c849 Merge pull request #285 from evoskuil/master
Fix VS common props for MT release dll, remove dead code.
2015-07-27 01:19:43 +02:00
Frank Denis 392f094a90 Merge pull request #273 from JackWink/feature/jack/android-armv8-build-script
add arm64-v8a support for android builds
2015-06-17 20:14:20 +02:00
Frank Denis b2dd3453d5 Merge pull request #269 from dconnolly/mscrypto
If browser `crypto` is not available, try `msCrypto` before assuming a Node environment.
2015-06-09 00:49:51 +02:00
Frank Denis 6c11527878 Merge pull request #192 from GraxRabble/c_demos
added gist examples into demos folder; you can figure out where this bel...
2015-05-27 12:34:36 +02:00
Frank Denis 111e79e021 Merge pull request #258 from shancat/master
Use https when linking where possible.
2015-05-08 10:34:44 +02:00
Frank Denis 47dbfb351a Merge pull request #256 from woobs/patch-1
Update NuGet configuration for version 1.0.3
2015-04-27 22:00:59 +02:00
Frank Denis 9eee6e6dd3 Merge pull request #243 from mosin/patch-1
android ndk requires arch to be arm not armv7
2015-02-07 15:43:01 +01:00
Frank Denis 2ebf1ce288 Merge pull request #235 from mhamrle/master
Use bash for NDK make toolchain
2015-01-15 22:27:32 +01:00
Frank Denis 17932c782e Merge pull request #224 from JackWink/feature/jack/pie-linker-flag
Add '-Wl,-pie' check to squash clang warnings
2014-12-29 01:26:24 +01:00
Frank Denis 4c4d04bb2a Merge pull request #222 from stellar/master
Add libsodium-uninstalled.pc.in
2014-12-25 10:56:17 +01:00
Frank Denis 453c687239 Merge pull request #219 from clowwindy/fix_ios_build
Build Both i386 and x86_64 for iOS Simulator
2014-12-12 07:58:52 -08:00
Frank Denis d38d5167e4 Merge pull request #218 from JackWink/feature/jack/update-ios-build
iOS.sh: Update script to include arm64 and current OSX architecture in generated libsodium.a
2014-12-10 21:18:03 -08:00
Frank Denis 4c8a35ca82 Merge pull request #210 from jmue/fix_msbuild_whitespace_within_path
fix building visual studio projects within a path containing white space...
2014-11-21 10:42:57 -08:00
Frank Denis 394c6a1970 Merge pull request #205 from evoskuil/master
Update VS projects and fix test warnings.
2014-11-20 12:00:06 -08:00
Frank Denis fff6c1cdec Merge pull request #204 from pmienk/master
Isolates auxiliary files generated via autogen.sh/autoreconf.
2014-11-02 19:23:38 -08:00
Frank Denis 0f155e068b Merge pull request #197 from AndreLouisCaron/vs2008
Fixes VS 2008 build.
2014-10-13 12:32:40 -07:00
Frank Denis 86a0884ac2 Merge pull request #186 from khungus/master
Update NuGet packaging to 0.7
2014-08-30 15:42:21 -07:00
Frank Denis fbc3b606f8 Merge pull request #176 from evoskuil/master
Update Windows DLL version resource to 0.6.0 and republish NuGet package
2014-07-04 08:42:27 -07:00
Frank Denis 7a7cda0694 Merge pull request #175 from evoskuil/master
Trivial updates to Windows projects, update NuGet version for 0.6.0.
2014-07-03 14:27:47 -07:00
Frank Denis 6afdc96783 Merge pull request #167 from truenull/master
Tarsnap test vectors tested on Windows
2014-06-03 22:53:47 -07:00
Frank Denis c4f7adeda4 Merge pull request #161 from jvarho/crypto-box-seed-keypair
Add crypto_box_seed_keypair
2014-05-25 19:09:27 -07:00
Frank Denis 2270e4dc02 Merge pull request #159 from evoskuil/master
Minor VS build/package updates.
2014-05-21 00:04:46 -07:00
Frank Denis fb5390e829 Merge pull request #158 from GraxRabble/emscripten
prevented 128 bit integers from compiling with emscripten
2014-05-20 21:32:51 -07:00
Frank Denis 5720b23491 Merge pull request #157 from xantares/patch-1
Fix memset_s detection
2014-05-19 10:26:11 -07:00
Frank Denis 43114ff80e Merge pull request #154 from evoskuil/master
Simplify VS project configs and harden MSBUILD script
2014-05-13 06:24:08 -07:00
Frank Denis 66322e887f Merge pull request #153 from evoskuil/master
Remove VS imports custom props dep, batch VS builds.
2014-05-12 02:10:31 -07:00
Frank Denis 67d83a3bf5 Merge pull request #150 from whitequark/patch-1
Update README.markdown
2014-05-08 18:53:55 -07:00
Frank Denis 4722990ec3 Merge pull request #149 from jvarho/divide-by-zero-fix
Check r and p against zero before dividing
2014-05-08 08:07:50 -07:00
Frank Denis baa4deb1f4 Merge pull request #144 from hintjens/master
Problem: utils.h not installed
2014-05-02 23:39:53 -07:00
Frank Denis 40b9d0fdc7 Fix mlock()/munlock() return value on Windows 2014-04-27 09:19:50 -07:00
Frank Denis 643f5f75c4 Merge pull request #138 from evoskuil/master
Share VS props files and increment package version.
2014-04-25 05:58:32 -07:00
Frank Denis 2dc67daaa7 Merge pull request #137 from evoskuil/master
Adding source files to VS project files.
2014-04-24 08:35:16 -07:00
Frank Denis 12281a7312 Merge pull request #124 from Prototik/master
Split for armv6 and armv7 archs in buildscripts
2014-02-24 17:12:50 -08:00
Frank Denis ffe39ab544 Merge pull request #122 from sonOfRa/sonames-again
Repair broken sonames
2014-02-22 17:18:46 -08:00
Frank Denis 7524a9199e Merge pull request #119 from sonOfRa/sonames
Add ./configure option to disable toggle soname versions
2014-02-20 09:03:47 -08:00
Frank Denis 464e590969 Merge pull request #118 from Prototik/android-buildscripts
Build scripts for android arm/x86/mips
2014-02-17 11:03:30 +01:00
Frank Denis 18c0a5f596 Merge pull request #94 from oberstet/master
clarify upstream NaCl version
2013-10-28 09:08:30 -07:00
Frank Denis 7101ee54dd Merge pull request #93 from jpoliv/pkgconfig
Downgrade the minimal pkg-config version from 0.25 to 0.23.
2013-10-23 09:52:14 -07:00
Frank Denis 1a52326f09 Merge pull request #88 from xantares/master
Fixed sodium.h install
2013-10-12 15:37:48 -07:00
Frank Denis 3863f5bb8d Merge pull request #87 from xantares/master
Fixed headers install
2013-10-10 15:27:46 -07:00
Frank Denis f9be0ee733 Merge pull request #86 from xantares/mingw
Fix mingw build
2013-10-09 12:14:06 -07:00
Frank Denis ce22c80116 Merge pull request #79 from sneves/master
Refactor MSVC project files
2013-10-04 13:26:26 -07:00
Frank Denis 5742161416 Merge pull request #73 from ctrix/master
fix compile warnings
2013-09-06 15:57:14 -07:00
Frank Denis dcea4e938b Merge pull request #66 from morfoh/pkgconfig
build: create and install a pkgconfig file
2013-08-11 22:08:20 -07:00