aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-11-29Merge branch 'ingela/ssl/cleaner-code' into maintIngela Anderton Andin
* ingela/ssl/cleaner-code: ssl: Add gracefullness to dtls code ssl: Remove old softupgrade code ssl: Use genstamtem properly
2017-11-28ssl: Align timing just in caseIngela Anderton Andin
2017-11-28ssl: Make sure all possible data is deliveredIngela Anderton Andin
2017-11-28Merge branch 'hasse/dialyzer/maps_anon_fun/OTP-14743' into maintHans Bolinder
* hasse/dialyzer/maps_anon_fun/OTP-14743: dialyzer: Extend the map implementation's handling of ?unit dialyzer: Use string:find() instead of string:str()
2017-11-28Merge branch 'hans/ssh/public_key/fix_bad_cert_merge' into maintHans Nilsson
* hans/ssh/public_key/fix_bad_cert_merge: public_key: Fix failing pkix_verify_hostname_subjAltName_IP TC
2017-11-27Fix type create_option() in mnesiaAndras Boroska
The create_option() type in mnesia lacks the user_properties field which is used by mnesia in various places.
2017-11-27Merge branch 'sverker/run_erl-log-gen-doc' into maintSverker Eriksson
2017-11-27Merge branch 'dgud/erl_docgen/https2url' into maintDan Gudmundsson
* dgud/erl_docgen/https2url: Update HOWTO with wxWidgets build examples https should be mapped to url and not seealso
2017-11-27Merge branch 'siri/appups-20.2' into maintSiri Hansen
* siri/appups-20.2: Update kernel appup for OTP-20.2
2017-11-27public_key: Fix failing pkix_verify_hostname_subjAltName_IP TCHans Nilsson
Was due to an unresolved merge conflict in a453532fe31eecd8c39b5035702ee20b402fd687
2017-11-27Merge branch 'john/erts/fix-nif-ioq-version/OTP-14779' into maintJohn Högberg
2017-11-27Merge pull request #1644 from bjorng/bjorn/erts/fix-literal-gc/ERL-508Björn Gustavsson
Fix purging of modules with "fake literals" OTP-14791
2017-11-24Fix purging of modules with "fake literals"Björn Gustavsson
When compiling Erlang source code, the literal area for the module can only contain data types that have a literal syntax. However, it is possible to sneak in other data types (such as references) in the literal pool by compiling from abstract or assembly code. Those "fake literals" would work fine, but would crash the runtime system when the module containing the literals was purged. Although fake literals are not officially supported, the runtime should not crash when attempting to use them. Therefore, fix the garbage collection of literals and releasing of literal areas. https://bugs.erlang.org/browse/ERL-508
2017-11-24ssl: Add gracefullness to dtls codeIngela Anderton Andin
Also make tls code a little more direct for easier uderstanding
2017-11-24ssl: Remove old softupgrade codeIngela Anderton Andin
This code is only relevant in version is was written in.
2017-11-24ssl: Use genstamtem properlyIngela Anderton Andin
2017-11-24Merge branch 'ingela/dtls/merge-fix' into maintIngela Anderton Andin
* ingela/dtls/merge-fix: ssl: Fix incorrect merge conflict resolution
2017-11-24ssl: Fix incorrect merge conflict resolutionIngela Anderton Andin
When handling merging of back ported Counter measurements for Bleichenbacher attack a line from DTLS was accidentally lost.
2017-11-24Merge branch 'bjorn/base64-in-dumps/OTP-14686' into maintBjörn Gustavsson
* bjorn/base64-in-dumps/OTP-14686: Use base64 encoding in crash dumps Correct parsing of sub binaries Generalize passing of options for decoding
2017-11-23Merge branch 'doc-fix' into maintIngela Anderton Andin
* doc-fix: fix missing document tag lost during merge
2017-11-23fix missing document tag lost during mergeIngela Anderton Andin
2017-11-23Merge branch 'maint-18' into maintIngela Anderton Andin
2017-11-23Merge branch 'merge-fix' into maintIngela Anderton Andin
* merge-fix: Fix merge resolution
2017-11-23Fix merge resolutionIngela Anderton Andin
2017-11-23Merge branch 'maint-19' into maintIngela Anderton Andin
2017-11-23Merge branch 'maint-20' into maintIngela Anderton Andin
* maint-20: Updated OTP version Update release notes Update version numbers public_key: verify ip (both v4 and v6) public_key: Added IP4 address checks to hostname_verification tests ssl: Fix test cases to work on all test platforms public_key: Fix dialyzer spec ssl: Sessions must be registered with SNI if exists ssl: Extend hostname check to fallback to checking IP-address public_key, ssl: Handles keys so that APIs are preserved correctly ssl: Use ?FUNCTION_NAME ssl: Prepare for release ssl: Countermeasurements for Bleichenbacher attack Conflicts: lib/public_key/doc/src/public_key.xml lib/public_key/test/public_key_SUITE.erl lib/public_key/test/public_key_SUITE_data/pkix_verify_hostname_subjAltName_IP.pem lib/public_key/test/public_key_SUITE_data/verify_hostname_ip.conf lib/ssl/src/dtls_connection.erl lib/ssl/src/ssl_connection.erl lib/ssl/src/ssl_handshake.erl
2017-11-23run_erl: Cleanup buggy retry of closeSverker Eriksson
The retry loop wasn't working anyway as it tested fd<0 instead of res. So, there is no real semantic change here.
2017-11-23Merge tag 'OTP-18.3.4.1.1' into maint-18Ingela Anderton Andin
=== OTP-18.3.4.1.1 === Changed Applications: - ssl-7.3.3.0.1 Unchanged Applications: - asn1-4.0.2 - common_test-1.12.1 - compiler-6.0.3 - cosEvent-2.2 - cosEventDomain-1.2 - cosFileTransfer-1.2 - cosNotification-1.2.1 - cosProperty-1.2 - cosTime-1.2.1 - cosTransactions-1.3.1 - crypto-3.6.3 - debugger-4.1.2 - dialyzer-2.9 - diameter-1.11.2 - edoc-0.7.18 - eldap-1.2.1 - erl_docgen-0.4.2 - erl_interface-3.8.2 - erts-7.3.1 - et-1.5.1 - eunit-2.2.13 - gs-1.6 - hipe-3.15 - ic-4.4 - inets-6.2.4 - jinterface-1.6.1 - kernel-4.2 - megaco-3.18 - mnesia-4.13.4 - observer-2.1.2 - odbc-2.11.1 - orber-3.8.1 - os_mon-2.4 - ose-1.1 - otp_mibs-1.1 - parsetools-2.1.1 - percept-0.8.11 - public_key-1.1.1 - reltool-0.7 - runtime_tools-1.9.3 - sasl-2.7 - snmp-5.2.2 - ssh-4.2.2.1 - stdlib-2.8 - syntax_tools-1.7 - test_server-3.10 - tools-2.8.3 - typer-0.9.10 - webtool-0.9.1 - wx-1.6.1 - xmerl-1.3.10 Conflicts: OTP_VERSION lib/ssl/vsn.mk otp_versions.table
2017-11-23Document alignment guarantees of enif_alloc and enif_reallocAnthony Ramine
2017-11-23Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
* hans/ssh/cuddle_tests: ssh: remove left-over msg traceing
2017-11-23Merge branch 'hans/asn1/asn1ct_test_fix/ERL-518/OTP-14787' into maintHans Nilsson
* hans/asn1/asn1ct_test_fix/ERL-518/OTP-14787: asn1: asn1:test now handles no_ok_wrapper and undec_rest
2017-11-23Merge branch 'hans/asn1/catch_error/ERL-518/OTP-14786' into maintHans Nilsson
2017-11-23Merge branch 'hans/crypto/doc_engine_keys/OTP-14735' into maintHans Nilsson
2017-11-22Updated OTP versionOTP-18.3.4.1.1Ingela Anderton Andin
2017-11-22Prepare releaseIngela Anderton Andin
2017-11-22ssl: Countermeasurements for Bleichenbacher attackIngela Anderton Andin
Back ported for security reasons. Remove DTLS changes as DTLS is not at all working in OTP 18.
2017-11-22Updated OTP versionOTP-18.3.4.7Erlang/OTP
2017-11-22Update release notesErlang/OTP
2017-11-22Merge branch 'ingela/maint-18/ssl/Bleichenbacher/OTP-14748' into maint-18Erlang/OTP
* ingela/maint-18/ssl/Bleichenbacher/OTP-14748: ssl: Prepare for release ssl: Countermeasurements for Bleichenbacher attack
2017-11-22Updated OTP versionOTP-19.3.6.4Erlang/OTP
2017-11-22Update release notesErlang/OTP
2017-11-22Merge branch 'ingela/maint-19/ssl/Bleichenbacher/OTP-14748' into maint-19Erlang/OTP
* ingela/maint-19/ssl/Bleichenbacher/OTP-14748: ssl: Prepare for release ssl: Countermeasurements for Bleichenbacher attack
2017-11-22dialyzer: Extend the map implementation's handling of ?unitHans Bolinder
The Maps implementation handles ?unit in more cases. Exactly when t_is_none_or_unit() is to be called is not clear to me. The added cases are about a map type being ?unit, but the key or the value of an association can also be ?unit, but that is not always checked.
2017-11-22dialyzer: Use string:find() instead of string:str()Hans Bolinder
2017-11-22Update HOWTO with wxWidgets build examplesDan Gudmundsson
It lacked build examples for linux, also suggest using wxWidgets-3.0.3 also add information about wxWidgets-3.1
2017-11-22ssh: remove left-over msg traceingHans Nilsson
2017-11-22Updated OTP versionOTP-20.1.7Erlang/OTP
2017-11-22Update release notesErlang/OTP
2017-11-22Update version numbersErlang/OTP
2017-11-22Merge branch 'hans/public_key/verify_hostname_ip_address_maint20/OTP-14653' ↵Erlang/OTP
into maint-20 * hans/public_key/verify_hostname_ip_address_maint20/OTP-14653: public_key: verify ip (both v4 and v6) public_key: Added IP4 address checks to hostname_verification tests