aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2010-10-01Merge branch 'maint-r14' into devIngela Anderton Andin
Conflicts: lib/public_key/src/pubkey_cert.erl
2010-09-30Merge branch 'ks/dialyzer-fixes' into devBjörn Gustavsson
* ks/dialyzer-fixes: Fix two errors in dialyzer
2010-09-30Merge branch 'ks/hipe-cleanups' into devBjörn Gustavsson
* ks/hipe-cleanups: Cleanup and small fixes in hipe files
2010-09-30Merge branch 'mh/dollar-font-lock' into devBjörn Gustavsson
* mh/dollar-font-lock: Emacs erlang-mode: fix syntax highlighting of $ in two cases
2010-09-30Emacs erlang-mode: fix syntax highlighting of $ in two casesMagnus Henoch
A string whose last character is a dollar sign used to make the syntax highlighter believe that the string never ends, breaking highlighting of following code: -vsn("$Revision: 42 $"). And the double quote as a character constant with a (superfluous) backslash used to make the syntax highlighter believe that a new string started: foo() -> $\". This change fixes both problems by adding two regexps to font-lock-syntactic-keywords in erlang-font-lock-init. One case that is still broken is when a multi-line string ends with a dollar sign: bar() -> "This multi-line string ends with a $". baz() -> this_gets_incorrectly_highlighted.
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-27Merge branch 'ia/public_key/basic_constraints/OTP-8867' into devIngela Anderton Andin
* ia/public_key/basic_constraints/OTP-8867: Better handling of v1 and v2 certificates.
2010-09-27Merge branch 'ia/ssl-and-public_key/backwards-compatibility/OTP-8858' into devIngela Anderton Andin
* ia/ssl-and-public_key/backwards-compatibility/OTP-8858: Backwards compatibility Conflicts: lib/ssl/src/ssl_certificate_db.erl Use short INFO-message. Debugging information can be fairly easily recreated so we do not want to clutter the logs.
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-24Remove stray use of _VOID_Björn Gustavsson
In a70159b33f20a26b2674d7cf777617c5f0261a5c, the _VOID_ macro was eliminated, but one use of it inside an "#ifdef DEBUG" was forgotten.
2010-09-24Fix two errors in dialyzerKostis Sagonas
Changes which fix some problems reported by dialyzer users: 1. The handling of nested opaque types 2. The handling of remote types in record expressions used as types While at it, updated dialyzer's RELEASE_NOTES to reflect these fixes and did some cleanups to dialyzer_utils.erl so that it gets in sync with dialyzer's main development branch.
2010-09-24Fix crash in epp_dodger:tokens_to_string/1Maria Christakis
Add a function clause in the epp_dodger:tokens_to_string/1 to avoid a crash in case the argument is a character.
2010-09-24Cleanup and small fixes in hipe filesKostis Sagonas
2010-09-23Better 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-21Merge branch 'maint-r13' into devBjörn Gustavsson
* maint-r13: Add test suites for (most) CORBA applications
2010-09-21Add test suites for (most) CORBA applicationsNiclas Eklund
2010-09-21Merge branch 'ia/ssl-asn1-spec-dss-params/OTP-7884' into devIngela Anderton Andin
* ia/ssl-asn1-spec-dss-params/OTP-7884: Handling of DSA key parameters
2010-09-21Merge branch 'maint-r13' into devLars Thorsen
2010-09-21Merge branch 'pl/observer-installation' into devBjörn Gustavsson
* pl/observer-installation: Fix installation of example file in lib/observer OTP-8857
2010-09-21Merge branch 'ta/eliminate-warnings' into devBjörn Gustavsson
* ta/eliminate-warnings: mnesia: Do not auto-import error/2 hipe: Do not auto-import min/2 and max/2 edoc: Do not auto-import error/1 OTP-8855
2010-09-21Correct leading whitespace in C port tutorialTuncer Ayaz
2010-09-21Merge branch 'vd/otpmbox_hash' into devBjörn Gustavsson
* vd/otpmbox_hash: add OtpMbox.hash() method OTP-8854
2010-09-21Handling of DSA key parametersIngela Anderton Andin
DSS-Params may be null in a certificate as it can inherit the parameters. Also ignore CA-certs that do not follow ASN-1 spec in RFC 5280.
2010-09-20add OtpMbox.hash() methodVlad Dumitrescu
The OtpMbox class was missing the hash() method while overriding equals(). This can cause problems when using jinterface in a larger Java application.
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-17Merge branch 'ia/fix-dialyzer-specs' into devIngela Anderton Andin
* ia/fix-dialyzer-specs: Corrected and added dialyzer specs
2010-09-17Fix installation of example file in lib/observerPeter Lemenkov
Files (actually one file - multitrace.erl), marked as EXAMPLE_FILES are installed into $(RELSYSDIR)/src which is inconsistent with installation procedure for other example file in other modules. This file should be installed into $(RELSYSDIR)/examples directory. Signed-off-by: Peter Lemenkov <[email protected]>
2010-09-17Clarify documentation of shutdown timeout in supervisor child specsMagnus Henoch
Make it explicit that the shutdown timeout is to be specified in milliseconds.
2010-09-15mnesia: Do not auto-import error/2Tuncer Ayaz
Resolve name clash with auto-imported BIF error/2.
2010-09-15hipe: Do not auto-import min/2 and max/2Tuncer Ayaz
Resolve name clash with auto-imported BIFs min/2 and max/2.
2010-09-15edoc: Do not auto-import error/1Tuncer Ayaz
Resolve name clash with auto-imported BIF error/1.
2010-09-15Corrected and added dialyzer specsIngela Anderton Andin
2010-09-15Clean up bootstrap targets and documentationTuncer Ayaz
Remove cleartool invocation and adapt docs to reflect git transition.
2010-09-14Update version numbersBjörn Gustavsson
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 08:33:15 +0000