aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Have X509_load_cert_crl_file() clear error queuetopic/X509_load_cert_crl_file-errorleakfixKazuki Yamaguchi2017-03-301-4/+20
| | | | | | | | | | Handle the return value from X509_STORE_add_{cert,crl}() appropriately so that no errors leak on the OpenSSL error queue on a successful return. A specific error "cert already in hash table" from these functions is ignored as there's software expecting it to skip already-loaded certificates.
* Documentation cleanup for man1/enc.podPauli2017-03-301-35/+45
| | | | | | | [skip ci] Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3073)
* bio/b_print.c: fix %z failure in 32-bit build.Andy Polyakov2017-03-291-2/+2
| | | | Reviewed-by: Richard Levitte <levitte@openssl.org>
* Add a simple test for the z modifierRichard Levitte2017-03-291-1/+46
| | | | Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3064)
* Use the z modifier instead of OSSLzu with BIO_printfRichard Levitte2017-03-291-1/+1
| | | | Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3064)
* Add z modifier parsing to the BIO_printf et all format stringRichard Levitte2017-03-293-5/+26
| | | | Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3064)
* cipherbytes_test: remove unused includesEmilia Kasper2017-03-291-2/+0
| | | | | | cipherbytes_test does not use the testutil / test_main test framework. Reviewed-by: Andy Polyakov <appro@openssl.org>
* engines/e_capi.c: slip in PROV_RSA_AES for interchangable CSP only.Andy Polyakov2017-03-291-12/+15
| | | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3034)
* engines/e_capi.c: adhere to CryptAcquireContextW unconditionally.Andy Polyakov2017-03-291-47/+27
| | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org>
* engine/e_capi.c: more formatting and styling fixes.Andy Polyakov2017-03-291-31/+31
| | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org>
* Documentation cleanup for man1/nseq.podPauli2017-03-291-4/+4
| | | | | Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3074)
* Documentation clean up for man1/list.podPauli2017-03-291-2/+2
| | | | | | | [skip ci] Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3072)
* doc: Add stitched ciphers to EVP_EncryptInit.podSteven Collison2017-03-291-2/+4
| | | | | | | | | | These ciphers don't appear to be documented anywhere. Given the performance[1] benefits I think it makes sense to expose them. [1] https://software.intel.com/sites/default/files/open-ssl-performance-paper.pdf Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3067)
* doc: Add missing options in s_{server,client}Steven Collison2017-03-292-0/+29
| | | | | | | These were added to the help in ad775e04f6dab but not the pods. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3065)
* Fix the build warning under OPENSSL_NO_GOSTQin Long2017-03-291-2/+2
| | | | | | | | Variable 'pktype' was set but not used under OPENSSL_NO_GOST. This change will fix the build warning under [-Werror=unused-but-set-variable]. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2961)
* Cleaning UEFI Build with additional OPENSSL_SYS_UEFI flagsQin Long2017-03-292-2/+2
| | | | | | | | Add OPENSSL_SYS_UEFI to remove unused syslog and uid stuffs for more clean UEFI build. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2961)
* Further de-obfuscationBenjamin Kaduk2017-03-291-3/+2
| | | | | | | | A similar change that probably should have been wrapped into commit e0926ef49df09a85117d7442db83f321aeb5b982. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3010)
* Add documentation for SNI APIsJon Spillett2017-03-291-0/+62
| | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3071)
* Remove duplicate docRich Salz2017-03-291-7/+2
| | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3068)
* More typo fixesFdaSilvaYY2017-03-2938-66/+61
| | | | | | | | Fix some comments too [skip ci] Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3069)
* Typo in SSL_CTX_sess_number.pod - startedJon Spillett2017-03-291-2/+2
| | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3070)
* Tidy up the SSL options in SSL_CTX_set_options.podJon Spillett2017-03-291-42/+50
| | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3070)
* SSL_CTX_use_PrivateKey_file uses private key, not certificateJon Spillett2017-03-291-1/+1
| | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3070)
* Typo in SSL_CONF_cmd_argv.podJon Spillett2017-03-291-1/+1
| | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3070)
* Typo in SSL_CONF_CTX_set1_prefix.pod - change SSL_CTX_cmd to SSL_CONF_cmdJon Spillett2017-03-292-7/+7
| | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3070)
* Typo in SSL_CONF_CTX_set_flags.podJon Spillett2017-03-291-1/+1
| | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3070)
* Test infrastructure additions.Pauli2017-03-2920-453/+1128
| | | | | | | Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Emilia Käsper <emilia@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3011)
* Fix 0 -> NULL, indentationFdaSilvaYY2017-03-282-3/+3
| | | | | Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3066)
* Refomat a few comments on 80 colsFdaSilvaYY2017-03-281-8/+4
| | | | | Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3066)
* Spelling fixesFdaSilvaYY2017-03-281-2/+2
| | | | | Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3066)
* Fix a few more typosFdaSilvaYY2017-03-283-6/+6
| | | | | Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3066)
* Add documentation for SSL_*_ex_data() functionsJon Spillett2017-03-281-0/+57
| | | | | | | [skip ci] Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3050)
* Add documentation for SSL version methodsJon Spillett2017-03-281-3/+42
| | | | | | | [skip ci] Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3049)
* Provide documentation for some state machine related functionsMatt Caswell2017-03-281-0/+110
| | | | Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3051)
* update READMEDr. Stephen Henson2017-03-281-0/+1
| | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3059)
* Add X25519 docDr. Stephen Henson2017-03-281-0/+58
| | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3059)
* fix typoDr. Stephen Henson2017-03-281-1/+1
| | | | Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3059)
* Provide documentation for missing SSL_SESSION_* functionsMatt Caswell2017-03-288-5/+213
| | | | Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3052)
* Move PRIu64, OSSLzu to e_os.hRich Salz2017-03-284-24/+28
| | | | | | Those macros are private, not public. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3044)
* Add enable-aria where rc5 and md2 are built.Pauli2017-03-281-5/+5
| | | | | Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3046)
* asynctest: don't depend on appsEmilia Kasper2017-03-281-1/+0
| | | | | | | | | Remove unnecessary include of apps.h. Tests shouldn't take a dependency on apps. In this case, there is no dependency, the include is unnecessary. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org>
* X509_cmp_time.pod: fix doc nitsEmilia Kasper2017-03-281-1/+2
| | | | Reviewed-by: Richard Levitte <levitte@openssl.org>
* Remove redundant decl of 509_STORE_set_flagsHannes Magnusson2017-03-281-1/+0
| | | | | | | | | | | a47bc283 accidentally adds another define for X509_STORE_set_flags It is already defined 5lines prior CLA: trivial Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3047)
* Add documentation for X509 time functionsEmilia Kasper2017-03-281-9/+30
| | | | | | [ci skip] Reviewed-by: Tim Hudson <tjh@openssl.org>
* apps/passwd.c: 32 bits are sufficient to hold ROUNDS_MAX.Andy Polyakov2017-03-271-3/+3
| | | | | | | | Even though C standard defines 'z' modifier, recent mingw compilers break the contract by defining __STDC_VERSION__ with non-compliant MSVCRT.DLL. In other words we can't use %zu with mingw, but insteadl of cooking Reviewed-by: Tim Hudson <tjh@openssl.org>
* In err_cleanup(), cleanup the thread local storage tooRichard Levitte2017-03-271-0/+1
| | | | | | Fixes #3033 Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3035)
* aes/asm/bsaes-armv7.pl: relax stack alignment requirement.Andy Polyakov2017-03-261-1/+1
| | | | | | | | | | | Even though Apple refers to Procedure Call Standard for ARM Architecture (AAPCS), they apparently adhere to custom version that doesn't follow stack alignment constraints in the said standard. [Why or why? If it's vendor lock-in thing, then it would be like worst spot ever.] And since bsaes-armv7 relied on standard alignment, it became problematic to execute the code on iOS. Reviewed-by: Rich Salz <rsalz@openssl.org>
* engines/e_capi.c: formatting and styling fixes.Andy Polyakov2017-03-251-70/+59
| | | | Reviewed-by: Richard Levitte <levitte@openssl.org>
* Don't access memory before checking the correct length in ↵Bernd Edlinger2017-03-251-1/+3
| | | | | | | | aesni_cbc_hmac_sha256_ctrl in case EVP_CTRL_AEAD_TLS1_AAD. Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3023)
* Move the downgrade sentinel declarations to a header fileMatt Caswell2017-03-243-15/+11
| | | | Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3022)