summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix OSS-Fuzz buildtmp-fix-ossfuzzTim Rühsen2018-12-291-1/+1
| | | | Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
* Merge branch 'fix-libressl' into 'master'Dmitry Eremin-Solenikov2018-12-291-6/+13
|\ | | | | | | | | | | | | Fix cipher-openssl-compat failing with LibreSSL Closes #658 See merge request gnutls/gnutls!846
| * tests: cipher-openssl-compat: don't call EVP_CIPHER_CTX_init()Dmitry Eremin-Solenikov2018-12-281-1/+0
| | | | | | | | | | | | | | | | | | There is no need to call EVP_CIPHER_CTX_init() after EVP_CIPHER_CTX_new(). Fixes #658 Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
| * tests: cipher-openssl-compat: don't fail if OpenSSL doesn't provide cipherDmitry Eremin-Solenikov2018-12-281-5/+13
|/ | | | | | | LibreSSL does not provide ChaCha20-Poly1305 through EVP_CIPHER interface, so let's skip the test if cipher is not available. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
* Merge branch 'tmp-test-ecc' into 'master'Dmitry Eremin-Solenikov2018-12-243-0/+26
|\ | | | | | | | | | | | | gnutls_pubkey_import_ecc_raw: set the public key bits Closes #640 See merge request gnutls/gnutls!843
| * gnutls_pubkey_import_ecc_raw: set the public key bitstmp-test-eccNikos Mavrogiannopoulos2018-12-213-0/+26
|/ | | | | | | | This sets the number of key bits once an ECC key is imported. Resolves #640 Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
* Merge branch 'tmp-no-well-defined' into 'master'Tim Rühsen2018-12-216-9/+12
|\ | | | | | | | | GNUTLS_X509_NO_WELL_DEFINED_EXPIRATION: deprecated See merge request gnutls/gnutls!844
| * GNUTLS_X509_NO_WELL_DEFINED_EXPIRATION: deprecatedtmp-no-well-definedNikos Mavrogiannopoulos2018-12-215-8/+12
| | | | | | | | | | | | | | | | | | | | | | This removes the documented use of this macro. It was non-functional. Given the nature of the definition of the non-well defined date for certificates, it may be wise not to use a special macro at all. The reason is that the no-well defined date is a real date (~year 9999), and any approximation with seconds will be unstable due to irregular leap seconds. Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
| * gnutls-cli-debug: removed unused variableNikos Mavrogiannopoulos2018-12-211-1/+0
|/ | | | Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
* Merge branch 'tmp-testrandom.sh' into 'master'Nikos Mavrogiannopoulos2018-12-211-3/+3
|\ | | | | | | | | | | | | testrandom.sh: Fix endless loop Closes #656 See merge request gnutls/gnutls!842
| * testrandom.sh: Fix endless looptmp-testrandom.shTim Rühsen2018-12-201-3/+3
| | | | | | | | Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
* | Merge branch 'use_CertOpenStore' into 'master'Nikos Mavrogiannopoulos2018-12-205-6/+89
|\ \ | |/ |/| | | | | win32: Use CertOpenStore instead of CertOpenSystemStore See merge request gnutls/gnutls!839
| * win32: Check that CertOpenStore is behaving as CertOpenSystemStoreHugo Beauzée-Luyssen2018-12-202-0/+74
| | | | | | | | | | The test isn't located in tests/windows since we need the actual libcrypt32 implementations.
| * win32: Use CertOpenStore instead of CertOpenSystemStoreHugo Beauzée-Luyssen2018-12-193-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | CertOpenSystemStore is not available when building for windows store. Both functions are available since windows XP, so there is no compatibility change. CertOpenSystemStore documentation states "Only current user certificates are accessible using this method, not the local machine store." hence we pass CERT_SYSTEM_STORE_CURRENT_USER. We also use the wide chars variants, in the event the ansi ones are silently rejected by windows store applications (which is not documented, but which I strongly suspect) This is equivalent to Wine's implementation of CertOpenSystemStore: https://github.com/wine-mirror/wine/blob/master/dlls/crypt32/store.c#L904
* | Merge branch 'tmp-comment-style' into 'master'Nikos Mavrogiannopoulos2018-12-191-2/+65
|\ \ | | | | | | | | | | | | CONTRIBUTING.md: added proposal on commenting style and new features See merge request gnutls/gnutls!816
| * | CONTRIBUTING.md: specify rules for static/inline functions [ci skip]tmp-comment-styleNikos Mavrogiannopoulos2018-11-281-2/+6
| | | | | | | | | | | | Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
| * | CONTRIBUTING.md: proposal for new features/modifications approach [ci skip]Nikos Mavrogiannopoulos2018-11-281-0/+18
| | | | | | | | | | | | Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
| * | CONTRIBUTING.md: added proposal on commenting style [ci skip]Nikos Mavrogiannopoulos2018-11-281-0/+41
| | | | | | | | | | | | Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
* | | Merge branch 'winstore_patches' into 'master'Nikos Mavrogiannopoulos2018-12-193-4/+55
|\ \ \ | | | | | | | | | | | | | | | | Windows & Windows Store store patches See merge request gnutls/gnutls!835
| * | | keys-win: Disable private key import on windows storeHugo Beauzée-Luyssen2018-12-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows store drastically limits the available functions. In this case, at least CryptSetProvParam and the NCrypt* functions can't be used Signed-off-by: Hugo Beauzée-Luyssen <hugo@beauzee.fr>
| * | | verify-high2: Fix cert dir iteration on Win32Hugo Beauzée-Luyssen2018-12-191-2/+48
| | | | | | | | | | | | | | | | | | | | And especially when building for windows store, which only allows unicode version of opendir & friends functions.
| * | | lib: Don't hardcode LoadLibraryAHugo Beauzée-Luyssen2018-12-192-2/+2
| | |/ | |/| | | | | | | | | | | | | Those functions are forbidden when building for Windows Store Signed-off-by: Hugo Beauzée-Luyssen <hugo@beauzee.fr>
* | | Merge branch 'tmp-vasprintf' into 'master'Nikos Mavrogiannopoulos2018-12-196-122/+2
|\ \ \ | |/ / |/| | | | | | | | vasprintf: use from gnulib; don't bundle twice See merge request gnutls/gnutls!841
| * | vasprintf: use from gnulib; don't bundle twiceNikos Mavrogiannopoulos2018-12-196-122/+2
|/ / | | | | | | | | | | Relates #653 Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
* | Merge branch 'tmp-portable-tests' into 'master'Tim Rühsen2018-12-1913-116/+133
|\ \ | | | | | | | | | | | | Make some tests more portable See merge request gnutls/gnutls!819
| * | .gitlab-ci.yml: Remove assert in gl/tests/test-strerror.cTim Rühsen2018-12-181-0/+1
| | | | | | | | | | | | | | | | | | | | | A bug made our CI cross builds fail. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916779 Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
| * | tests/cert-tests/certtool-eddsa: Increase portability (fix for busybox)Tim Rühsen2018-12-182-23/+15
| | | | | | | | | | | | Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
| * | tests/cert-tests/certtool: SKIP if --disable-bash-tests was givenTim Rühsen2018-12-183-3/+19
| | | | | | | | | | | | Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
| * | tests/cert-tests/pkcs12-utf8: Use /bin/sh instead of bashTim Rühsen2018-12-181-1/+1
| | | | | | | | | | | | Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
| * | tests/cert-tests/pkcs12-corner-cases: Increase portability (fix for busybox)Tim Rühsen2018-12-181-3/+4
| | | | | | | | | | | | Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
| * | tests/cert-tests/certtool-ecdsa: Increase portability (fix for busybox)Tim Rühsen2018-12-181-3/+3
| | | | | | | | | | | | Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
| * | tests/cert-tests/pem-decoding: Increase portability (fix for busybox)Tim Rühsen2018-12-181-15/+12
| | | | | | | | | | | | Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
| * | tests/cert-tests/certtool-crl-decoding: Increase portability (fix for busybox)Tim Rühsen2018-12-181-6/+5
| | | | | | | | | | | | Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
| * | tests/long-crl.sh: Increase portability (fix for busybox)Tim Rühsen2018-12-181-12/+7
| | | | | | | | | | | | Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
| * | tests/gnutls-cli-debug.sh: Remove bashismsTim Rühsen2018-12-181-47/+43
| | | | | | | | | | | | Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
| * | tests/scripts/common.sh: Add check_if_equal()Tim Rühsen2018-12-181-0/+17
| | | | | | | | | | | | Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
| * | tests/scripts/common.sh: Make random port value work on busyboxTim Rühsen2018-12-181-3/+6
|/ / | | | | | | | | | | | | | | | | On busybox 'date +%N' returns an empty value. On 'dash' (Debian shell) $RANDOM doesn't work. This commit works first tries $RANDOM and then falls back to 'date +%N'. Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
* | Merge branch 'fix-token-info-modname' into 'master'Nikos Mavrogiannopoulos2018-12-161-11/+36
|\ \ | | | | | | | | | | | | Fix gnutls_pkcs11_token_get_info for short output buffers and fix a memleak See merge request gnutls/gnutls!827
| * | pkcs11: fix memleak in gnutls_pkcs11_token_get_ptrPeter Wu2018-12-151-0/+1
| | | | | | | | | | | | | | | find_token_modname_cb uses p11_kit_config_option to retrieve the module name, but its return value (stored in tn.modname) must be freed.
| * | pkcs11: fix memleak when querying for GNUTLS_PKCS11_TOKEN_MODNAMEPeter Wu2018-12-131-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | find_token_modname_cb uses p11_kit_config_option to retrieve the module name, but its return value must be free'd. Other fixes: - Do not silently truncate the output buffer, return an error instead. - If the module name is unavailable, do not write "(null)" to the output. Write an empty string instead. - The module path can be of arbitrary length, so passing output=NULL to learn the length seems reasonable, except that snprintf crashed on a NULL pointer dereference. Fixes: 241f9f0b1 ("Added GNUTLS_PKCS11_TOKEN_MODNAME for gnutls_pkcs11_token_get_info") Signed-off-by: Peter Wu <peter@lekensteyn.nl>
| * | pkcs11: clarify gnutls_pkcs11_*_get_info output_sizePeter Wu2018-12-131-4/+15
| | | | | | | | | | | | | | | | | | | | | It was not clear whether @output_size contains the actual string length or the buffer length (including null terminator). Signed-off-by: Peter Wu <peter@lekensteyn.nl>
* | | doc: minor fixes [ci skip]Nikos Mavrogiannopoulos2018-12-152-8/+12
| | | | | | | | | | | | | | | | | | | | | Created NEWS entry for 3.6.6 and unified the listing of gnutls_init_flags_t items. Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
* | | Merge branch 'rfc7250_rawpk_mr' into 'master'Nikos Mavrogiannopoulos2018-12-1552-941/+2556
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | RFC7250 Raw public keys Closes #280 and #26 See merge request gnutls/gnutls!650
| * | | Implemented support for raw public-key functionality (RFC7250).Tom Vrancken2018-12-1552-941/+2556
| |/ / | | | | | | | | | Signed-off-by: Tom Vrancken <dev@tomvrancken.nl>
* | | Merge branch 'unicode_support' into 'master'Nikos Mavrogiannopoulos2018-12-151-0/+1
|\ \ \ | |/ / |/| | | | | | | | Unicode support See merge request gnutls/gnutls!838
| * | configure.ac: Always enable unicode support on windowsHugo Beauzée-Luyssen2018-12-131-0/+1
| | |
* | | Merge branch 'tmp-autogen-bak-update' into 'master'Dmitry Eremin-Solenikov2018-12-123-36/+18
|\ \ \ | | | | | | | | | | | | | | | | build: remove src/*.bak from distribution See merge request gnutls/gnutls!808
| * | | build: remove src/*.bak from distributionTim Rühsen2018-12-123-36/+18
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, include the autogen-generated *.c, *.h and the stamp files in the distribution. To prevent the bundled files being linked with incompatible autogen libopts, this adds an extra check in configure. If the detected system libopts version is too old, it will use the included libopts implementation. Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de> Signed-off-by: Daiki Ueno <dueno@redhat.com>
* | | Merge branch 'tmp-fix-GNUTLS_PCERT_NO_CERT' into 'master'Tim Rühsen2018-12-122-3/+2
|\ \ \ | | | | | | | | | | | | | | | | GNUTLS_PCERT_NO_CERT: marked as unused/ignored See merge request gnutls/gnutls!837
| * | | GNUTLS_PCERT_NO_CERT: marked as unused/ignoredtmp-fix-GNUTLS_PCERT_NO_CERTNikos Mavrogiannopoulos2018-12-122-3/+2
|/ / / | | | | | | | | | | | | | | | This flag was already a no-op. Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>