aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-04-21Merge branch 'rickard/sigterm/OTP-14358' into maint-19Erlang/OTP
* rickard/sigterm/OTP-14358: Do not ignore SIGTERM when VM has been started with +Bi
2017-04-21Do not ignore SIGTERM when VM has been started with +BiRickard Green
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-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-27ssl: Prepare for releaseIngela Anderton Andin
2017-03-27ssl: Avoid data loss in active onceIngela Anderton Andin
Emulate active once in such a way that data recived by the TLS connection process, but not fetch via active once option by the user, can be delivered at next active once before final close.
2017-03-24ssh: fixed crash in ssh:daemon_infoHans Nilsson
2017-03-21erts: Make sigterm signal safe for non-smp beamBjörn-Egil Dahlberg
The signal handler will now schedule a sigterm message instead of sending the message in the signal handler. The signal handler must refrain from memory allocations and thus the event is scheduled.
2017-03-17Omit port from Host header on redirect to well-known portBram Verburg
ERL-316, as part of 19.3, adds the port number to the Host header upon automatic redirection. The port number is included even if it is a well-known port (80, 443). This is different from the behaviour of most HTTP clients, as well as httpc's own for new requests. The added port number can lead to problems such as this one, where the request signature assumes the client will not send the :443 suffix on redirection to an https URL: https://github.com/nerves-project/nerves/issues/96 I was unable to add a test case, since that would require a server on a well-known port, but I manually verified that the GitHub/S3 signing issue was indeed resolved with this patch.
2017-03-15inets/ftp: spelling correctionHans Nilsson
2017-03-15inets/ftp: DBG macro changeHans Nilsson
2017-03-15inets/ftp: Fixed fault with operations after recv_chunks.Hans Nilsson
2017-03-15inets/ftp: Testcase for repeating chunked fetchHans Nilsson
2017-03-14Updated OTP versionOTP-19.3Erlang/OTP
2017-03-14Prepare releaseErlang/OTP
2017-03-13Fix xml warnings in old release notesRickard Green
2017-03-10Update preloaded modulesRickard Green
2017-03-10Update primary bootstrapRickard Green
2017-03-10Update copyright yearRickard Green
2017-03-09Merge branch 'hans/ssh/update_app_file' into maintHans Nilsson
2017-03-09ssh: Update .app fileHans Nilsson
2017-03-09Merge pull request #1368 from bjorng/bjorn/travis/multiple-platformsBjörn Gustavsson
Extend Travis CI to test more configurations
2017-03-09Merge branch 'siri/appups-19.3' into maintSiri Hansen
* siri/appups-19.3: Update appups in kernel and stdlib for OTP-19.3
2017-03-08Travis CI: Add building of Erlang/OTP on 32-bit LinuxBjörn Gustavsson
Build Erlang and run smoke test in a Docker container running 32-bit Linxux.
2017-03-08Run the smoke test for both SMP and non-SMP emulatorBjörn Gustavsson
2017-03-08run-smoke-test: Let ERL_TOP default to current working directoryBjörn Gustavsson
2017-03-08build-docker-otp: Avoid copying the git repository to docker daemonBjörn Gustavsson
Since docker is run from the top-level of the otp repository, the entire repository will be the context for the docker daemon. In my private repository, more than 800Mb had to be copied before the build could be started. Let the ./scripts directory be the context for docker instead. That way, only the otp.tar.gz file needs to be copied. While we are it, also use the ADD command in the Dockerfiles to pack up the tar file and avoid copying the tar file itself to the Docker image.
2017-03-08Merge branch 'anders/diameter/capx_strictness/OTP-14257' into maintAnders Svensson
* anders/diameter/capx_strictness/OTP-14257: Add transport_opt() capx_strictness
2017-03-08Update appups in kernel and stdlib for OTP-19.3Siri Hansen
2017-03-08Merge branch 'anders/diameter/19.3/OTP-14252' into maintAnders Svensson
* anders/diameter/19.3/OTP-14252: vsn -> 1.12.2 Update appup for 19.3
2017-03-08Merge branch 'anders/diameter/19.2/failover/OTP-14206' into maintAnders Svensson
* anders/diameter/19.2/failover/OTP-14206: Avoid sending large terms between nodes unnecessarily Don't use request table for answer routing Fix/redo failover optimization
2017-03-08builder-docker-otp: Fix passing of commandBjörn Gustavsson
Pass all argument except the first as the command for "docker run".
2017-03-08Merge branch 'ingela/ssl/next-maint-version' into maintIngela Anderton Andin
* ingela/ssl/next-maint-version: ssl: Version update
2017-03-08Merge branch 'ingela/ssl/dtls-cont' into maintIngela Anderton Andin
* ingela/ssl/dtls-cont: dtls: Only test this for TLS for now dtls: Avoid mixup of protocol to test dtls: 'dtlsv1.2' corresponds to 'tlsv1.2' dtls: Correct dialyzer spec and postpone inclusion of test dtls: Erlang distribution over DTLS is not supported dtls: Enable some DTLS tests in ssl_to_openssl_SUITE dtls: Enable DTLS test in ssl_certificate_verify_SUITE dtls: Hibernation and retransmit timers dtls: Make sure retransmission timers are run dtls: DTLS specific handling of socket and ciphers
2017-03-08dtls: Only test this for TLS for nowIngela Anderton Andin
We want to avoid failing test cases but still be able to merge DTLS progress for 19.3
2017-03-08Add transport_opt() capx_strictnessAnders Svensson
To allow the Peer State Machine requirement that only the expected capabilities exchange message be received in the relevant state to be relaxed. If {capx_strictness, false} is configured then anything bu the expected CER/CEA is ignored. This is non-standard behaviour, and thusfar undocumented. Use at your own risk.
2017-03-08Reduce number of jobs for makeBjörn Gustavsson
Running fewer jobs in parallel reduces the risk of running out of memory.
2017-03-08Add docker images for building 32/64 bit erlangLukas Larsson
2017-03-08Travis CI: Change the language to CBjörn Gustavsson
We never use the installed Erlang package. Setting the language to C could also allow us to build on platforms that don't support the Erlang language (e.g. osx).