aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2010-10-08Merge branch 'maint-r13' into maint-r14Björn Gustavsson
* maint-r13: Prepare release Add additional test to cover this correction correct the encoding of ExtensionAdditionGroup temp Add support for ExtensionAdditionGroup notation in nested types as well Add test suites for (most) CORBA applications Prepare release An empty element declared as simpleContent was not properly validated. Conflicts: lib/asn1/doc/src/notes.xml lib/asn1/test/asn1_SUITE.erl.src lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl lib/asn1/test/test_undecoded_rest.erl lib/asn1/vsn.mk lib/xmerl/doc/src/notes.xml lib/xmerl/vsn.mk
2010-10-05Prepare releaseErlang/OTP
2010-10-05Merge branch 'pan/win2003-crash/OTP-8876' into maint-r14Erlang/OTP
* pan/win2003-crash/OTP-8876: Teach read_topology not to crash on W2K3
2010-10-04Prepare releaseErlang/OTP
2010-10-04Merge branch 'kenneth/asn1/enc_extaddgrp/OTP-8866' into maint-r13Erlang/OTP
* kenneth/asn1/enc_extaddgrp/OTP-8866: Add additional test to cover this correction correct the encoding of ExtensionAdditionGroup temp Add support for ExtensionAdditionGroup notation in nested types as well
2010-10-04Add additional test to cover this correctionKenneth Lundin
2010-10-01Teach read_topology not to crash on W2K3Patrik Nyblom
2010-09-29Prepare releaseErlang/OTP
2010-09-29Merge branch 'ia/ssl-and-public_key/verify_fun_peer_awarness/OTP-8873' into ↵Erlang/OTP
maint-r14 * ia/ssl-and-public_key/verify_fun_peer_awarness/OTP-8873: Peer awarness
2010-09-29Merge branch 'ia/public_key/basic_constraints/OTP-8867' into maint-r14Erlang/OTP
* ia/public_key/basic_constraints/OTP-8867: Better handling of v1 and v2 certificates.
2010-09-29Merge branch 'ia/ssl-and-public_key/backwards-compatibility/OTP-8858' into ↵Erlang/OTP
maint-r14 * ia/ssl-and-public_key/backwards-compatibility/OTP-8858: Backwards compatibility
2010-09-29Peer awarnessIngela Anderton Andin
Changed the verify fun so that it differentiate between the peer certificate and CA certificates by using valid_peer or valid as the second argument to the verify fun. It may not always be trivial or even possible to know when the peer certificate is reached otherwise.
2010-09-28Better handling of v1 and v2 certificates.Ingela Anderton Andin
V1 and v2 certificates does not have any extensions so then validate_extensions should just accept that there are none and not end up in missing_basic_constraints clause.
2010-09-24Backwards compatibilityIngela Anderton Andin
Changed implementation to retain backwards compatibility for old option {verify, 0} that shall be equivalent to {verify, verify_none}, also separate the cases unknown CA and selfsigned peer cert, and restored return value of deprecated function public_key:pem_to_der/1.
2010-09-24correct the encoding of ExtensionAdditionGroupKenneth Lundin
2010-09-23tempKenneth Lundin
2010-09-23Add support for ExtensionAdditionGroup notation in nested types as wellKenneth Lundin
In the previous version support for ExtensionAdditionGroups (i.e [[...]]) was added but it did not handle the occurence of the notation in nested types. Now this is handled as well and the support is hopefully complete. Also cleanup of warnings for obsolete guard functions in test suites.
2010-09-21Add test suites for (most) CORBA applicationsNiclas Eklund
2010-09-20Prepare releaseErlang/OTP
2010-09-20Merge branch 'lars/xmerl/validation-of-empty-element/OTP-8599' of ↵Erlang/OTP
../lars_otp into maint-r13 * 'lars/xmerl/validation-of-empty-element/OTP-8599' of ../lars_otp: An empty element declared as simpleContent was not properly validated.
2010-09-20An empty element declared as simpleContent was not properly validated.Lars Thorsen
2010-09-13Prepare releaseOTP_R14BErlang/OTP
2010-09-13Merge branch 'egil/fix-ei-on-vxwork/OTP-8838' of ../egil_otp into devErlang/OTP
* 'egil/fix-ei-on-vxwork/OTP-8838' of ../egil_otp: Fix ei to build on vxworks
2010-09-13Merge branch 'bmk/inets/prepare_for_r14b' of ../bmk_otp into devErlang/OTP
* 'bmk/inets/prepare_for_r14b' of ../bmk_otp: Prepare release for inets-5.5 (R14B).
2010-09-13Merge branch 'bmk/snmp/prepare_for_r14b' of ../bjorn_otp into devErlang/OTP
* 'bmk/snmp/prepare_for_r14b' of ../bjorn_otp: Prepare for R14B
2010-09-13Merge branch 'bmk/megaco/prepare_for_r14b' of ../bjorn_otp into devErlang/OTP
* 'bmk/megaco/prepare_for_r14b' of ../bjorn_otp: Prepare release of megaco-3.15 (R14B)
2010-09-13Prepare release for inets-5.5 (R14B).Micael Karlberg
2010-09-13Prepare for R14BMicael Karlberg
2010-09-13Prepare release of megaco-3.15 (R14B)Micael Karlberg
2010-09-13Fix ei to build on vxworksBjörn-Egil Dahlberg
2010-09-13Merge branch 'pan/epmd-vulnerabilities/OTP-8780' into devPatrik Nyblom
* pan/epmd-vulnerabilities/OTP-8780: Teach testcases to survive TIME_WAIT overload Update erl_interface doc and testsuite for epmd changes Restore null termination of input buffer Teach testcase epmd_SUITE:too_large to accept econnaborted Teach epmd_cli.c to not respond 'Killed' when killing denied Calculate minimal packet size for ALIVE2 requests correctly Document epmd and it's options properly and fixup help text Fix anomalies in epmd not yet reported as security issues Remove two buffer overflow vulnerabilities in EPMD Remove all support for ancient EPMD protocol Remove very old protocol from EPMD Conflicts: lib/erl_interface/src/epmd/epmd_port.c
2010-09-13Merge branch 'sv/ei-writev' into devBjörn-Egil Dahlberg
* sv/ei-writev: fix incorrect writev iovec buffer handling in ei OTP-8837
2010-09-13Merge branch 'rickard/timer-wheel/OTP-8835' into devRickard Green
* rickard/timer-wheel/OTP-8835: Use mutex instead of rwlock
2010-09-13Merge branch 'pan/windows-testcases/OTP-8820' into devPatrik Nyblom
* pan/windows-testcases/OTP-8820: Teach Winsock initialization to be thread safe Make ei_threaded_send synchronized Increase timeout value in ei_accept_SUITE Teach ei_accept_SUITE to wait for node publish instead of using random sleeps Teach port suite to not use unix-specific commands and not leave them running Add line macros to gen_udp_SUITE:connect
2010-09-13Teach Winsock initialization to be thread safePatrik Nyblom
2010-09-13Make ei_threaded_send synchronizedPatrik Nyblom
2010-09-13Increase timeout value in ei_accept_SUITEPatrik Nyblom
2010-09-13Teach ei_accept_SUITE to wait for node publish instead of using random sleepsPatrik Nyblom
2010-09-13Teach port suite to not use unix-specific commands and not leave them runningPatrik Nyblom
2010-09-13Add line macros to gen_udp_SUITE:connectPatrik Nyblom
2010-09-13Merge branch 'egil/ei/fix-declspec/OTP-8826' into devBjörn-Egil Dahlberg
* egil/ei/fix-declspec/OTP-8826: Remove USE_DECLSPEC_THREAD from erl_interface
2010-09-13Merge branch 'ia/public_key-subject-alternative-name/OTP-8825' into devIngela Anderton Andin
* ia/public_key-subject-alternative-name/OTP-8825: Improved certificate extension handling Add handling of SubjectAltName of type otherName
2010-09-11fix incorrect writev iovec buffer handling in eiSteve Vinoski
For platforms that support writev, ei uses iovec structures to be able to easily send noncontiguous data buffers. When sending large messages, the socket can of course block, in which case ei adjusts its iovecs to pick up where it left off when the socket becomes writeable again. Unfortunately the code that handled the case when the number of bytes written are less than the current iovec size adjusted only the iovec byte count but not the iovec data pointer, resulting in the same data being sent multiple times. The fix is trivial: in addition to subtracting the count of bytes already written from the current iovec's size, also increment the current iovec's data pointer by the number of bytes already written. Tested manually on Linux and verified to fix a problem detected in production with writing large binaries from a cnode to a regular node. No unit tests were added, however, because they use the local loopback which acts more like a pipe than an inter-host TCP connection. The closing of the TCP window on the receiving side and the resultant write blocking on the socket, which in turn caused the code that mishandled the iovecs to be exercised, could unfortunately not be readily duplicated in the erl_interface test suite.
2010-09-10Merge branch 'pan/binary-bif-valgrind-leak/OTP-8823' into devPatrik Nyblom
* pan/binary-bif-valgrind-leak/OTP-8823: Teach erl_bif_binary not leak memory by doing malloc(0)
2010-09-10Update preloaded modulesPatrik Nyblom
2010-09-10Use mutex instead of rwlockRickard Green
Use mutex instead of rwlock since the read lock is more or less unused and it can be quite contended.
2010-09-10Update primary bootstrapPatrik Nyblom
2010-09-10Merge branch 'pan/added-autoimports/OTP-8763' into devPatrik Nyblom
* pan/added-autoimports/OTP-8763: Remove warnings for clashes with new autoimported BIFs Add testcase for autoimport and the erlang.xml doc consistency Correct erlang.xml regarding autoimports Add new autoimports for R14B
2010-09-10Remove warnings for clashes with new autoimported BIFsPatrik Nyblom
2010-09-10Add testcase for autoimport and the erlang.xml doc consistencyPatrik Nyblom