aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-11-15public_key: Modified PKCS-7.asn1, removing unnecessary IMPORTS.Kenneth Lundin
The ASN-1 compiler could not handle these IMPORTS properly causing compilation errors.
2012-11-15public_key: Add PKCS-7Ingela Anderton Andin
First attempt to add PKCS-7 does not compile
2012-11-14Merge branch 'ia/ssl/terminate-handling/OTP-10574' into maintIngela Anderton Andin
* ia/ssl/terminate-handling/OTP-10574: ssl: Make sure that the ssl connection process will not hang in terminate function. ssl: Add default values to emulated socket options in internal record
2012-11-13Merge branch 'sverk/hipe-solaris-m4-bug/OTP-10577' into maintSverker Eriksson
* sverk/hipe-solaris-m4-bug/OTP-10577: erts: Change assembler comment for hipe on x86 and amd64 erts: Fix compile error on solaris in generated hipe_amd64_bifs.S
2012-11-13erts: Change assembler comment for hipe on x86 and amd64Sverker Eriksson
Previously done for ppc in c469d8ce14e9544a297d9af48c9da43137122d9a
2012-11-13erts: Fix compile error on solaris in generated hipe_amd64_bifs.SSverker Eriksson
2012-11-13ssl: Make sure that the ssl connection process will not hang in terminate ↵Ingela Anderton Andin
function. Avoid doing gen_tcp/inet socket operations in terminate if socket is already closed. Call gen_tcp:recv/3 in the "data delivery workaround" to avoid hanging.
2012-11-13ssl: Add default values to emulated socket options in internal recordIngela Anderton Andin
The absence of the active default values could cause a process leak
2012-11-12Merge branch 'sverk/halfword-valgrind-suppressions' into maintSverker Eriksson
* sverk/halfword-valgrind-suppressions: crypto: Add valgrind suppression for AES_cbc_encrypt erts: Expand valgrind suppression for zlib Add extra valgrind suppression file for halfword emulator
2012-11-12Merge branch 'bjorn/compiler/binary-matching/OTP-10567' into maintBjörn Gustavsson
* bjorn/compiler/binary-matching/OTP-10567: Fix compiler crash for binary matching and a complicated guard
2012-11-12Merge branch 'rickard/port-sched-bug/OTP-10556' into maintRickard Green
* rickard/port-sched-bug/OTP-10556: Fix bug in erts_port_task_schedule()
2012-11-12Merge branch 'rickard/sched-wakeup/OTP-10476' into maintRickard Green
* rickard/sched-wakeup/OTP-10476: Use reduction limit in order to determine when to do wakeup
2012-11-12ssl: Adopt test case to not take so longIngela Anderton Andin
2012-11-12Merge branch 'fredrik/ssh-password-conf/OTP-10511' into maintFredrik Gustafsson
* fredrik/ssh-password-conf/OTP-10511: Ssh appup modifications Updated appup for ssh Bumped revision Removed some testing variables ssh_opts is now a proper list After auth rsa and dsa passwords is set to undefined Removing the password after auth
2012-11-09Ssh appup modificationsFredrik Gustafsson
2012-11-09Merge branch 'lukas/common_test/multi_require_bug/OTP-10572' into maintLukas Larsson
* lukas/common_test/multi_require_bug/OTP-10572: Fix bug where require of same name at same config would return name in use
2012-11-09Fix bug where require of same name at same config would return name in useLukas Larsson
2012-11-09Merge branch 'ia/ssl/gen-fsm-timout/OTP-10569' into maintIngela Anderton Andin
* ia/ssl/gen-fsm-timout/OTP-10569: ssl: Do not use gen_fsm:sync_send_all_state_event/3 timeout
2012-11-09ssl: Do not use gen_fsm:sync_send_all_state_event/3 timeoutIngela Anderton Andin
The gen_fsm:sync_send_all_state_event/3 timout is a client side timeout. If timeouts are needed we want them to be server side timeouts.
2012-11-08Merge branch 'fredrik/ssh-quiet-mode/OTP-10429' into maintFredrik Gustafsson
* fredrik/ssh-quiet-mode/OTP-10429: Doc for quiet_mode SSH quiet mode
2012-11-08Updated appup for sshFredrik Gustafsson
2012-11-08Merge branch 'bjorn/erts/binary-append/OTP-10524' into maintBjörn Gustavsson
* bjorn/erts/binary-append/OTP-10524: Fix binary append exceptions
2012-11-08Doc for quiet_modeFredrik Gustafsson
2012-11-08Merge branch 'maint-r15' into maintFredrik Gustafsson
2012-11-08Merge branch 'anders/diameter/upgrade/OTP-10550' into maintAnders Svensson
* anders/diameter/upgrade/OTP-10550: Allow for no diameter on remote node in connection guard
2012-11-08Merge branch 'anders/diameter/peer_mapping/OTP-10470' into maintAnders Svensson
* anders/diameter/peer_mapping/OTP-10470: Document peer_ref() service_info Use peer_ref() service_info in traffic suite Add service_info for a peer_ref()
2012-11-08Merge branch 'anders/diameter/shared_transport/OTP-10443' into maintAnders Svensson
* anders/diameter/shared_transport/OTP-10443: Use multiple connections in traffic suite Implement service_opt() restrict_connections Document service_opt() restrict_connections
2012-11-08Merge branch 'anders/diameter/sequence_masks/OTP-10445' into maintAnders Svensson
* anders/diameter/sequence_masks/OTP-10445: Redo watchdog test suite Update/clarify some comments Add reopen message from watchdog Add options service_info Add diameter_reg:wait/1 Clarify diameter_transport doc Remove pre-OTP configure support Remove obsolete make target Use sequence masks in test suites Implement sequence masks Document sequence masks
2012-11-07Bumped revisionFredrik Gustafsson
2012-11-06Fix compiler crash for binary matching and a complicated guardBjörn Gustavsson
The compiler would crash when attempting to compile a function head that did binary matching and had a complex expression using 'andalso' and 'not'. Noticed-by: José Valim
2012-11-06Fix bug in erts_port_task_schedule()Rickard Green
2012-11-05Merge branch 'anders/diameter/patch/R15B02/OTP-10555' into maint-r15Erlang/OTP
* anders/diameter/patch/R15B02/OTP-10555: vsn -> 1.2.1 Update appup for OTP-10461/10550 Allow for no diameter on remote node in connection guard Add missing clause for peer failover
2012-11-05vsn -> 1.2.1Anders Svensson
2012-11-05Update appup for OTP-10461/10550Anders Svensson
2012-11-05Merge branch 'anders/diameter/patch/R15B02/upgrade/OTP-10550' into ↵Anders Svensson
anders/diameter/patch/R15B02/OTP-10555 * anders/diameter/patch/R15B02/upgrade/OTP-10550: Allow for no diameter on remote node in connection guard
2012-11-05Merge branch 'anders/diameter/patch/R15B02/failover_error/OTP-10461' into ↵Anders Svensson
anders/diameter/patch/R15B02/OTP-10555 * anders/diameter/patch/R15B02/failover_error/OTP-10461: Add missing clause for peer failover
2012-11-05SSH quiet modeFredrik Gustafsson
2012-11-05Allow for no diameter on remote node in connection guardAnders Svensson
The guard is against a connection to a given peer already existing but fails if diameter is not running on a remote node. Note that the guard itself is to be made configurable in R15B03 (OTP-10493) to allow multiple connections per peer.
2012-11-05Removed some testing variablesFredrik Gustafsson
2012-11-05ssh_opts is now a proper listFredrik Gustafsson
2012-11-05After auth rsa and dsa passwords is set to undefinedFredrik Gustafsson
2012-11-05Removing the password after authFredrik Gustafsson
2012-11-05Merge branch 'fredrik/ssh-use-options-alg/OTP-10498' into maintFredrik Gustafsson
* fredrik/ssh-use-options-alg/OTP-10498: Option to ssh:connect {pref_public_key_algs, list()} where you can give the algorithms you want to use
2012-11-05Fix binary append exceptionsBjörn Gustavsson
Code such as the following should cause an exception: Bin = <<0:1>>, <<Bin/binary,...>> (Because the "binary" type implies that the binary must have a size in bits that is a multiple of 8.) Depending on the binary, either no exception was thrown or the wrong exception was thrown (because c_p->freason was not set). Noticed-by: Adam Rutkowski
2012-11-05Allow for no diameter on remote node in connection guardAnders Svensson
The guard is against a connection to a given peer already existing but fails if diameter is not running on a remote node. Note that the guard itself is to be made configurable in R15B03 (OTP-10493) to allow multiple connections per peer.
2012-11-05Document peer_ref() service_infoAnders Svensson
2012-11-05Use peer_ref() service_info in traffic suiteAnders Svensson
2012-11-05Add service_info for a peer_ref()Anders Svensson
This allows a diameter_app callback to retrieve the corresponding configuration as passed to diameter:add_transport/2.
2012-11-05Use multiple connections in traffic suiteAnders Svensson
2012-11-05Implement service_opt() restrict_connectionsAnders Svensson