aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2010-10-05Merge branch 'maint-r13' into devKenneth Lundin
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
2010-10-04Merge branch 'ks/stdlib-spec-fixes' into devBjörn Gustavsson
* ks/stdlib-spec-fixes: Correct erroneous specs; strengthen some others
2010-10-04Merge branch 'rt/solaris-pty-handling-fixes' into devBjörn Gustavsson
* rt/solaris-pty-handling-fixes: Add corrected support for Solaris PTYs to run_erl Fix a typo that leads to syntax errors with DEBUG defined in run_erl OTP-8878
2010-10-04Merge branch 'mp/fix-hipe-write' into devBjörn Gustavsson
* mp/fix-hipe-write: fix 64-bit writes to 32-bit struct field in HiPE runtime OTP-8877
2010-10-04Merge branch 'ta/eliminate-warning' into devBjörn Gustavsson
* ta/eliminate-warning: emd2exml: Do not auto-import error/2
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-01emulator Makefile: Add missing dependencyBjörn Gustavsson
Make sure that an update to erts/emulator/tools/make_tables will force all generated files to be re-generated.
2010-10-01Merge branch 'bjorn/halfword-emulator' into devBjörn Gustavsson
* bjorn/halfword-emulator: Fix a bug in the ERTS_BIF_PREP_TRAPx() macros ts_install: Identify the halfword emulator
2010-10-01Merge branch 'maint-r14' into devIngela Anderton Andin
Conflicts: lib/public_key/src/pubkey_cert.erl
2010-09-30Fix a bug in the ERTS_BIF_PREP_TRAPx() macrosBjörn Gustavsson
It seems to work (at least on a little-endian architecture) by sheer luck.
2010-09-30ts_install: Identify the halfword emulatorBjörn Gustavsson
2010-09-30fix 64-bit writes to 32-bit struct field in HiPE runtimeMikael Pettersson
In the HiPE part of the runtime system's Process struct there is a state field which is 32 bits wide even on 64-bit machines. There is a single instruction in the HiPE AMD64 runtime where this field is incorrectly written with a 64-bit store. Luckily the extraneous 32 bits are written as zeros to 4 bytes of tail-padding at the end of the struct, so nothing should have broken because of this. The same bug exists in the HiPE PowerPC64 runtime (in development), but on the big-endian PPC64 the effect is to write the actual value to the tail-padding and zero to the struct field, which potentially breaks TRAPs from BIFs (depending on BIF arities and how many parameter registers the runtime has been configured to use). Thanks to Paul Guyot for noticing the oversized write on AMD64.
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-29Add corrected support for Solaris PTYs to run_erlRyan Tilder
Two related but slightly separate issues: run_erl doesn't support Solaris's /dev/ptmx device and run_erl didn't load the necessary STREAMS modules so that to_erl can provide terminal echo of keyboard input. This patch adds ifdef'd support for Solaris and derivatives to open /dev/ptmx directly since adding the C99 defines to CFLAGS breaks all kinds of other things in the build. It also adds ifdef'd ioctl calls to load the necessary STREAMS modules to permit termios to work.
2010-09-29Fix a typo that leads to syntax errors with DEBUG defined in run_erlRyan Tilder
While attempting to debug odd terminal echo issues on Solaris, I noticed that run_erl.c will fail to compile due to a typo causing a syntax error.
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-24Correct erroneous specs; strengthen some othersKostis Sagonas
2010-09-24emd2exml: Do not auto-import error/2Tuncer Ayaz
Eliminate the following warning: Warning: ambiguous call of overridden auto-imported BIF error/2
2010-09-24Cleanup and small fixes in hipe filesKostis Sagonas
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-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