aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-05-24Merge remote-tracking branch 'origin/henrik/update-copyright-year'Henrik
2018-05-24Update copyright yearHenrik Nord
2018-05-24Merge pull request #1821 from IngelaAndin/ingela/ssl/DTLS-transparancyIngela Andin
ssl: Generalize DTLS packet multiplexing OTP-14888
2018-05-23Update logger.xmlKenneth Lundin
corrected spelling reffering -> referring
2018-05-23ssl: Generalize DTLS packet multiplexingIngela Anderton Andin
We want to prepare the code for more advanced DTLS usage and possibility to run over SCTP. First assumption was that the demultiplexer process "dtls listener" was needed for UDP only and SCTP could be made more TLS like. However the assumption seems not to hold. This commit prepares for customization possibilities.
2018-05-23configure.in: Add back accidentally deleted AC_SUBST(FPE)Björn Gustavsson
AC_SUBST(FPE) was accidentally deleted in 13bcae12947603.
2018-05-23Merge branch 'ingela/gen-fsm-deprecation'Ingela Anderton Andin
* ingela/gen-fsm-deprecation: gen_fsm: should be deprecated eventually
2018-05-23Merge pull request #1788 from max-au/pkcs8_private_key_supportIngela Andin
Compleate PKCS-8 encoding support and enhance the decoding of 'PrivateKeyInfo' to conform to the rest of Erlang public_key API. OTP-15093
2018-05-23Merge branch 'lukas/kernel/logger-config/OTP-13295'Lukas Larsson
* lukas/kernel/logger-config/OTP-13295: Add Action=differs to logger_filters:domain/2 Format logger timestamps according to RFC3339 Add update_logger_config/1 and update_handler_config/2 to logger Hide handlers field in logger config map from the API Improve santiy check of formatter config Fix error_logger:tty/1 to turn on/off tty logging Add filter to sasl_h which stops log events with remote gl Remove logger env vars for format_depth, max_size and utc Fix some link errors in logger documentation kernel: Make all handler callbacks not block logger logger: Rework configuration of logger
2018-05-23Merge branch 'ingela/ssl/openssl-test-cuddle'Ingela Anderton Andin
* ingela/ssl/openssl-test-cuddle: ssl: anon test should use dh or ecdh anon keyexchange ssl: Cuddle no delivery guarantee at application level ssl: Cuddle timeout ssl: Correct option handling to OpenSSL
2018-05-22Merge branch 'lars/erl_docgen/fix-xsl-makefile/OTP-15091'Lars Thorsen
* lars/erl_docgen/fix-xsl-makefile/OTP-15091: [erl_docgen] Update version [erl_docgen] Add missing file db_funcs.xsl to file list
2018-05-22Merge branch 'lukas/travis-do-release'Lukas Larsson
* lukas/travis-do-release: travis: Do release when building 32-bit
2018-05-22Merge branch 'hasse/stdlib/chars_limit_io/OTP-14983'Hans Bolinder
* hasse/stdlib/chars_limit_io/OTP-14983: stdlib: Document details of fwrite/3 option chars_limit
2018-05-22travis: Do release when building 32-bitLukas Larsson
This is done in order to check that installation works as it should.
2018-05-22hipe: Fix elimination of erlang:get_stacktrace/0Hans Bolinder
2018-05-21PKCS8 encoder must be symmetrical to PKCS8 decoder, thus it has to be in ↵Maxim Fedorov
der_encode, and not pem_encode as it was in original implementation
2018-05-21Use DER_NULL macro instead or <<5,0>>Maxim Fedorov
2018-05-21PKCS8 handling improvements:Maxim Fedorov
* added PKCS8 encoder for DSA, RSA and EC private keys * added tests (full loop, PKCS8 decode/encode operations) * rewritten private key decoder to be more Erlang-y
2018-05-21public_key: PKCS8 (Private-Key Information Syntax Standard) encoded private ↵Maxim Fedorov
key support This patch adds support for RSA, DSA and EC private keys encoded using PKCS8 format. Test *.pem files are made with converting existing *.pem files using openssl: openssl pkcs8 -in ... -out ... -topk8 -nocrypt
2018-05-21Add Action=differs to logger_filters:domain/2Siri Hansen
2018-05-21Format logger timestamps according to RFC3339Siri Hansen
2018-05-21Add update_logger_config/1 and update_handler_config/2 to loggerSiri Hansen
2018-05-21Hide handlers field in logger config map from the APISiri Hansen
This field contains the index of all installed handlers. It is internal and can not be altered by the user, and should therefore not be visible.
2018-05-21Improve santiy check of formatter configSiri Hansen
2018-05-21Fix error_logger:tty/1 to turn on/off tty loggingSiri Hansen
This function earlier only added/removed the old error_logger_tty_h report handler. Since it is mostly used for turning off logging to tty in general, it now also checks the default logger handlers. It works as follows: tty(true): * If default handler is logger_std_h of type standard_io, make sure it has no 'error_logger_tty_false filter'. * Else, add a new instance of logger_std_h with type standard_io with id 'error_logger_tty_true'. tty(false): * Remove error_logger_tty_h report handler if it exists. * Remove error_logger_tty_false logger handler if it exists. * If default handler is logger_std_h of type standard_io, add a filter named 'error_logger_tty_false', which stops all events.
2018-05-21Add filter to sasl_h which stops log events with remote glSiri Hansen
2018-05-21Remove logger env vars for format_depth, max_size and utcSiri Hansen
These are replaced by new config handling and must not be used any more.
2018-05-21Fix some link errors in logger documentationSiri Hansen
2018-05-21kernel: Make all handler callbacks not block loggerLukas Larsson
2018-05-21logger: Rework configuration of loggerLukas Larsson
Most logger configuration that was possible through kernel application variables have been moved into a common 'logger' application environment in kernel. Now all the configuration possible through the logger API can be done as sys config. The handler started by kernel has been renamed to 'default' instead of logger_std_h. There is a new logger:setup_handlers/1 function that given an application name can be used to setup handlers in other applications.
2018-05-21Merge branch 'lukas/ssl/fix_erl_epmd_usage/OTP-15086'Lukas Larsson
* lukas/ssl/fix_erl_epmd_usage/OTP-15086: ssl: Fix usage of erl_epmd in tls dist
2018-05-21ssl: Fix usage of erl_epmd in tls distLukas Larsson
Fixes: 662f3c7ba50ff8ec13d8
2018-05-21Merge branch 'lukas/erts/cpu_time_thread/OTP-15090'Lukas Larsson
* lukas/erts/cpu_time_thread/OTP-15090: erts: Make cpu_timestamp use per thread on Linux
2018-05-21gen_fsm: should be deprecated eventuallyIngela Anderton Andin
2018-05-21stdlib: Document details of fwrite/3 option chars_limitHans Bolinder
2018-05-21Merge remote-tracking branch 'peppe/peppe/kernel/logger_handler_fixes'Siri Hansen
* peppe/peppe/kernel/logger_handler_fixes: Various logger handler improvements and updated test cases Make it possible to disable sync and drop mode Conflicts: lib/kernel/test/logger_disk_log_h_SUITE.erl lib/kernel/test/logger_std_h_SUITE.erl
2018-05-21bs_match_SUITE: Add test of multiple matchesBjörn Gustavsson
2018-05-21[erl_docgen] Update versionLars Thorsen
2018-05-21[erl_docgen] Add missing file db_funcs.xsl to file listLars Thorsen
2018-05-21Merge branch 'hasse/dialyzer/funs_in_dead_code/OTP-15079/ERL-593'Hans Bolinder
* hasse/dialyzer/funs_in_dead_code/OTP-15079/ERL-593: dialyzer: Do not emit warnings for unreachable funs
2018-05-21ssl: anon test should use dh or ecdh anon keyexchangeIngela Anderton Andin
2018-05-21ssl: Cuddle no delivery guarantee at application levelIngela Anderton Andin
2018-05-21ssl: Cuddle timeoutIngela Anderton Andin
2018-05-21ssl: Correct option handling to OpenSSLIngela Anderton Andin
2018-05-21Merge remote-tracking branch 'origin/ingela/ssl/deprecate-ssl-accept/OTP-15056'Ingela Anderton Andin
* origin/ingela/ssl/deprecate-ssl-accept/OTP-15056: ssl: Deprecate ssl:ssl_accept/[1,2,3]
2018-05-18erts: Add some missing doxygen docsSverker Eriksson
2018-05-18ssl: Deprecate ssl:ssl_accept/[1,2,3]Ingela Anderton Andin
2018-05-18Merge branch 'sverker/ets-delete_all_objects-trap/OTP-15078'Sverker Eriksson
* sverker/ets-delete_all_objects-trap/OTP-15078: erts: Rename untrapping db_free_*empty*_table erts: Make ets:delete_all_objects yield on fixed table erts: Optimize ets delete all in fixed table erts: Refactor ets select iteration code erts: Cleanup ets code erts: Optimize ets hash object deallocactions erts: Refactor pseudo deleted ets objects erts: Make atomic ets:delete_all_objects yield erts: Fix reduction bump for ets:delete/1
2018-05-18Merge branch 'sverker/system-profile-bug/OTP-15085'Sverker Eriksson
* sverker/system-profile-bug/OTP-15085: erts: Fix bug in system_profile
2018-05-18erts: Fix bug in system_profileSverker Eriksson
seen to cause redundant {profile,_,active,_,_} messages when process is terminating.