aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-04-04Merge branch 'maint'Ingela Anderton Andin
Conflicts: OTP_VERSION erts/vsn.mk lib/crypto/c_src/crypto.c lib/crypto/src/crypto.erl lib/ssh/src/ssh.erl
2017-04-04Merge branch 'maint-19' into maintIngela Anderton Andin
2017-04-04Merge branch 'maint'Björn-Egil Dahlberg
2017-04-04Merge branch 'egil/erts/fix-sigterm/OTP-14290' into maintBjörn-Egil Dahlberg
* egil/erts/fix-sigterm/OTP-14290: erts: Make sigterm signal safe for non-smp beam
2017-04-04Merge branch 'g-andrade/strong-random-numbers/PR-1367/OTP-14317'Raimo Niskanen
* g-andrade/strong-random-numbers/PR-1367/OTP-14317: Clean up documentation and test cases Attempt faster approach to strong random floats Allow for crypto upgrades when using rand plugin fixup! Support cryptographically strong rand plugin fixup! Support cryptographically strong rand plugin fixup! Support cryptographically strong rand plugin fixup! Support cryptographically strong rand plugin No longer expose strong_rand_(range|float) Support cryptographically strong rand plugin Restyle crypto strong numeric generators for usage in rand Support generation of strong random numbers
2017-04-04Merge branch 'ingela/inets/tests-cuddle'Ingela Anderton Andin
* ingela/inets/tests-cuddle: inets: Do not test https/ftps if crypto can not start
2017-04-04Merge branch 'hasse/debugger/fix_edit_variable/OTP-14318'Hans Bolinder
* hasse/debugger/fix_edit_variable/OTP-14318: debugger: Enable editing of bit strings in the bindings area debugger: Remove a debug printout
2017-04-04Clean up documentation and test casesRaimo Niskanen
2017-04-03Merge PR-1076 from g-andrade/feature/ets_conditional_insert OTP-14319Sverker Eriksson
ETS: Allow for conditional insertions
2017-04-03debugger: Enable editing of bit strings in the bindings areaHans Bolinder
The evaluated string looked like "V=<<1>>", which cannot be scanned correctly. A space after "=" fixes the bug.
2017-04-03debugger: Remove a debug printoutHans Bolinder
2017-04-03stdlib: Fix xmllint warningsHans Bolinder
Commit d2be06f introduced xmllint warnings.
2017-04-03Merge branch 'dgud/observer/keep-selection/OTP-14270'Dan Gudmundsson
* dgud/observer/keep-selection/OTP-14270: observer: (re)store config observer: Use event info to get active tab observer: Keep sel after column change tv observer: Keep port selection after refresh observer: Keep tv selection after refresh
2017-04-03inets: Do not test https/ftps if crypto can not startIngela Anderton Andin
2017-03-31Merge PR-1390 from kostis/on_load-no_native OTP-14316Sverker Eriksson
Add a no_native option to modules with an on_load
2017-03-31Merge branch 'egil/kernel/refactor-supervisor/OTP-14315'Björn-Egil Dahlberg
* egil/kernel/refactor-supervisor/OTP-14315: Update primary bootstrap kernel: Refactor supervision tree
2017-03-31Merge PR-1394 from kostis/hipe-ppc-fixes ERL-369 OTP-14314Sverker Eriksson
HiPE PPC fixes
2017-03-31Updated OTP versionOTP-19.3.1Erlang/OTP
2017-03-31Update release notesErlang/OTP
2017-03-31Update version numbersErlang/OTP
2017-03-31Merge branch 'kellymclaughlin/crypto/aes_cfb_128/PR-1393/OTP-14313' into ↵Erlang/OTP
maint-19 * kellymclaughlin/crypto/aes_cfb_128/PR-1393/OTP-14313: Fix bug with AES CFB 128 Demonstrate the bug with AES CFB 128 encryption
2017-03-31Merge branch 'raimo/file-read_file-leaks-file-descriptors/ERL-383/OTP-14308' ↵Erlang/OTP
into maint-19 * raimo/file-read_file-leaks-file-descriptors/ERL-383/OTP-14308: Close FD after trying to open a directory
2017-03-31Merge branch 'voltone/inets/httpc_redirect_normalize_host/PR-1381/OTP-14301' ↵Erlang/OTP
into maint-19 * voltone/inets/httpc_redirect_normalize_host/PR-1381/OTP-14301: Omit port from Host header on redirect to well-known port
2017-03-31Merge branch 'ingela/maint-19/active-once/ERL-371/OTP-14300' into maint-19Erlang/OTP
* ingela/maint-19/active-once/ERL-371/OTP-14300: ssl: Prepare for release ssl: Avoid data loss in active once
2017-03-31Merge branch 'hans/ssh/daemon_info_crash_ip/OTP-14298' into maint-19Erlang/OTP
* hans/ssh/daemon_info_crash_ip/OTP-14298: ssh: fixed crash in ssh:daemon_info
2017-03-31Merge branch 'egil/erts/fix-sigterm/OTP-14290' into maint-19Erlang/OTP
* egil/erts/fix-sigterm/OTP-14290: erts: Make sigterm signal safe for non-smp beam
2017-03-31Merge branch 'hans/ftp/recv_chunk/OTP-14242' into maint-19Erlang/OTP
* hans/ftp/recv_chunk/OTP-14242: inets/ftp: spelling correction inets/ftp: DBG macro change inets/ftp: Fixed fault with operations after recv_chunks. inets/ftp: Testcase for repeating chunked fetch
2017-03-30Update primary bootstrapBjörn-Egil Dahlberg
2017-03-30kernel: Refactor supervision treeBjörn-Egil Dahlberg
Use maps in definitions to make them more readable.
2017-03-30Merge branch 'goeldeepak/erts/fix_inet_gethost_long/ERL-61/PR-1345/OTP-14310'Lukas Larsson
* goeldeepak/erts/fix_inet_gethost_long/ERL-61/PR-1345/OTP-14310: This patch fixes the issue in which erlang fails to start if the hostname is 64 characters on a linux system.
2017-03-30Add a missing 0 to an address, which was suspiciously missingKostis Sagonas
2017-03-29Partially revert commit 37d63e9b8a0a96125ada858205286a58a5bed1aeKostis Sagonas
The above commit erroneously declared 'ppc64le' as a 'ppc64' for HiPE enabling. These two architectures are different and one can NOT expect that native code generated for one architecture runs on the other one. Rather than reverting this commit, make sure that the architecture is declared correctly instead of pretending it's a PPC64.
2017-03-29Fix bug with AES CFB 128Kelly McLaughlin
Fix a bug with the use of the aes_cfb128 cipher by calling the correct underlying openssl interface function when the cipher is specified.
2017-03-29Demonstrate the bug with AES CFB 128 encryptionKelly McLaughlin
Demonstrate a bug with AES CFB 128 for certain key sizes introduced with the Erlang 19.0 release. The code in the block_crypt_nif function in the crypto.c source file incorrectly calls aes_cfb_8_crypt when the specified cipher is aes_cfb8 or aes_cfb128 and the key size is 24 or 32. The aes_cfb_8_crypt function calls the AES_cfb8_encrypt function from the openssl interface, but this is incorrect when the cipher is aes_cfb128. Unfortunately the test cases in the crypto test suite are insufficient to detect an issue like this because it exercises the encryption and decryption roundtrip using the same incorrect underlying function. The problem was observed when trying to update an application to Erlang 19 that attempted to decrypt data that was encrypted using aes_cfb128 by another source. In this commit I altered the crypto test suite to provide a demonstration of this problem.
2017-03-29Close FD after trying to open a directoryRaimo Niskanen
2017-03-29Merge branch 'egil/erts/fix-copy-sharing-assert'Björn-Egil Dahlberg
* egil/erts/fix-copy-sharing-assert: erts: Fix faulty assert for refs in copy sharing
2017-03-28Merge PR-1379 from ostrovsky/erl-294 OTP-14307Sverker Eriksson
Improve no-pie solution from bug report ERL-294
2017-03-28erts: Fix faulty assert for refs in copy sharingBjörn-Egil Dahlberg
2017-03-28Fix use of uninitialized variable 'ret'Sverker Eriksson
DID_TRAP will read 'ret' even when error is returned. Found by valgrind.
2017-03-28observer: (re)store configDan Gudmundsson
Store config when exiting app and restore config when starting again.
2017-03-28Merge PR-1392 from margnus1/hipe-range-fixpoint-bug OTP-14306Sverker Eriksson
HiPE: Fix ERL-278: Fix range analysis miscompilation bug
2017-03-28hipe_icode_range: Add comment about side-effectsMagnus Lång
2017-03-28observer: Use event info to get active tabDan Gudmundsson
Previously changing tabs during high cpu-load, could make the change go unnoticed, and thus the graphs did not get updated.
2017-03-28Merge branch 'sverker/hipe-long-lived'Sverker Eriksson
* sverker/hipe-long-lived: Make hipe_bifs:alloc_data/3 pad addr to alignment erts: Change HIPE allocations from sys_alloc
2017-03-28Merge branch 'lukas/erts/hide-debug-consoles'Lukas Larsson
* lukas/erts/hide-debug-consoles: erts: Only show debug consoles if ERL_CONSOLE_MODE is defined
2017-03-28Merge branch 'lukas/erts/fix_enif_inspect_binary_emasculate/OTP-14304'Lukas Larsson
* lukas/erts/fix_enif_inspect_binary_emasculate/OTP-14304: erts: Add enif_inspect_binary emasculation of refc bins
2017-03-28observer: Keep sel after column change tvDan Gudmundsson
2017-03-28observer: Keep port selection after refreshDan Gudmundsson
2017-03-28observer: Keep tv selection after refreshDan Gudmundsson
Selection was lost after updates
2017-03-28Merge branch 'lukas/kernel/gen_tcp_close_docs'Lukas Larsson
* lukas/kernel/gen_tcp_close_docs: kernel: Expand gen_tcp:close docs with send text