aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-11-23Merge branch 'maint'Ingela Anderton Andin
Conflicts: OTP_VERSION
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-23Merge branch 'sverker/async-auto-connect/OTP-14370' AGAINSverker Eriksson
2017-11-23erts: Fix erlang:monitor toward c-nodesSverker Eriksson
by suppressing DOP_MONITOR_P, DOP_MONITOR_P_EXIT and DOP_DEMONITOR_P if not supported by the remote node. In 17e198d6ee60f7dec9abfed272cf4226aea44535 I changed the behavior of erlang:monitor to not raise badarg for c-nodes but instead create a monitor to only supervise the connection. But I forgot to prevent DOP_MONITOR_P and friends from being sent to the node that does not expect them. Note: We test both DFLAG_DIST_MONITOR and DFLAG_DIST_MONITOR_NAME for the node to support process monitoring. This is because erl_interface is buggy as it sets DFLAG_DIST_MONITOR without really supporting it. ToDo: Should erl_interface stop setting DFLAG_DIST_MONITOR or should we change the meaning of these flags?
2017-11-23Merge branch 'maint'Hans Nilsson
* maint: ssh: remove left-over msg traceing
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 'maint'Hans Nilsson
* maint: asn1: asn1:test now handles no_ok_wrapper and undec_rest asn1: Further adjustments on generated code asn1: Protect more by try..catch
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 'maint'Hans Nilsson
2017-11-23Merge branch 'hans/crypto/doc_engine_keys/OTP-14735' into maintHans Nilsson
2017-11-22Fix broken to_dis after merge from maint to masterBjörn Gustavsson
d8d07a7593d811 that added the to_dis option to the compiler no longer works when merged to master. That is because of 79f28cfd8df1b7 that removed some unused code in erts_debug. Fix this by adding a new function erts_debug:dis_to_file/2 and use it from compile module where we have access to the filename (in beam_listing we only have an opened file).
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
2017-11-22Merge branch ↵Erlang/OTP
'ingela/maint-20/ssl/extend-hostname-check/OTP-14632/OTP-14655/OTP-14766' into maint-20 * ingela/maint-20/ssl/extend-hostname-check/OTP-14632/OTP-14655/OTP-14766: 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
2017-11-22Merge branch 'ingela/maint-20/ssl/Bleichenbacher/OTP-14748' into maint-20Erlang/OTP
* ingela/maint-20/ssl/Bleichenbacher/OTP-14748: ssl: Prepare for release ssl: Countermeasurements for Bleichenbacher attack
2017-11-22Merge branch 'maint'Hans Nilsson
2017-11-22Merge branch 'hans/crypto/cuddle_tests' into maintHans Nilsson
2017-11-22public_key: verify ip (both v4 and v6)Hans Nilsson
2017-11-22public_key: Added IP4 address checks to hostname_verification testsHans Nilsson
2017-11-21asn1: asn1:test now handles no_ok_wrapper and undec_restHans Nilsson
2017-11-21Merge branch 'maint'Sverker Eriksson
2017-11-21Merge branch 'sverker/nif-debug-bin-check' into maintSverker Eriksson
2017-11-21Merge branch 'sverker/crypto/fix-valgrind-assert' into maintSverker Eriksson
2017-11-21asn1: Further adjustments on generated codeHans Nilsson
2017-11-21asn1: Protect more by try..catchHans Nilsson
2017-11-21erts: Fix preemption bug in erts_dist_commandSverker Eriksson
We should break out when out of reductions.
2017-11-21erts: Remove obsolete commentsSverker Eriksson
2017-11-21ssl: Marker inserted to enable a reference from cryptoHans Nilsson
2017-11-21crypto: Changes after reviewHans Nilsson
2017-11-21crypto: Fixes to make privkey_to_pubkey behave similar to other functionsHans Nilsson
2017-11-20Remove core dump risk in crypto.cHans Nilsson
2017-11-20crypto: Printout polishingHans Nilsson
2017-11-20crypto: Correct and extends tests of key fetching/usageHans Nilsson
2017-11-20crypto: Engine stored keys docHans Nilsson
2017-11-20Merge PR-1632 from margnus1/hipe-receive-opt OTP-14785Sverker Eriksson
HiPE: Optimise receives matching unique references
2017-11-20Merge pull request #1631 from peterdmv/stdlib/extend_uri_string/OTP-14747Péter Dimitrov
Extend uri_string module (compose_query and dissect_query)
2017-11-20Merge branch 'peterdmv/inets/autoredirect/ERL-333/OTP-14729'Péter Dimitrov
* peterdmv/inets/autoredirect/ERL-333/OTP-14729: inets: Add support for URI-references in Location
2017-11-20Merge branch 'peterdmv/inets/http_content_injection/ERL-456/OTP-14726'Péter Dimitrov
* peterdmv/inets/http_content_injection/ERL-456/OTP-14726: inets: Fix http content injection bug in httpc
2017-11-20Merge branch 'maint'Hans Nilsson
* maint: Updated OTP version Prepare release ssh: testcases for space trailing Hello msg ssh: Don't remove trailing WS in Hello msg ssh: dialyzer fixes ssh: Fix broken error handling during session setup Remove invalid EINTR loop around close(2) Conflicts: OTP_VERSION
2017-11-20Merge branch 'maint-20' into maintHans Nilsson
* maint-20: Updated OTP version Prepare release ssh: testcases for space trailing Hello msg ssh: Don't remove trailing WS in Hello msg ssh: dialyzer fixes ssh: Fix broken error handling during session setup Remove invalid EINTR loop around close(2) Conflicts: lib/ssh/test/ssh_options_SUITE.erl
2017-11-20Merge branch 'maint'Lukas Larsson
2017-11-20Merge branch 'lukas/system/improve_profile_docs/OTP-14633' into maintLukas Larsson
* lukas/system/improve_profile_docs/OTP-14633: erts: Add term2bin note about encoding guarantee Fix broken link in INSTALL howto system: Add info to profiling effeciency guide Update message queue and pinfo binary docs kernel: Clarify gen_tcp:listen documentation system: Add External OSS tools section to profiling guilde
2017-11-20Merge branch 'maint'Lukas Larsson
Conflicts: lib/compiler/src/beam_listing.erl
2017-11-20Merge branch 'lukas/compiler/add_to_dis/OTP-14784' into maintLukas Larsson
* lukas/compiler/add_to_dis/OTP-14784: compiler: Add +to_dis option that dumps loaded asm
2017-11-20compiler: Add +to_dis option that dumps loaded asmLukas Larsson
2017-11-20Merge branch 'maint'Lukas Larsson