aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2011-05-18Merge branch 'lukas/test_server/timetrap_factor/OTP-9320' into devLukas Larsson
* lukas/test_server/timetrap_factor/OTP-9320: Update ts to propigate the timetrap factor gotten from test_server:timetrap_scale_factor to common test when starting a test run.
2011-05-18Merge branch 'dev' of super:otp into devLukas Larsson
* 'dev' of super:otp: (166 commits) Corrected documentation error and added examples to Users Guide In TLS 1.1, failure to properly close a connection no longer requires that a session not be resumed. This is a change from TLS 1.0 to conform with widespread implementation practice. Erlang ssl will now in TLS 1.0 conform to the widespread implementation practice instead of the specification to avoid performance issues. Add escript to bootstrap/bin Remove unused variable warning in inet_res Remove unused variable in epmd_port Remove compiler warnings in inet_drv Add SASL test suite Allow same module name in multiple applications if explicitely excluded Fix bugs concerning the option report_missing_types Fix default encoding in SAX parser. re: remove gratuitous "it " in manpage Spelling in (backward *compatibility*) comment. Improve erl_docgen's support for Dialyzer specs and types dialyzer warning on mnesia_tm Add documentation text about majority checking add mnesia_majority_test suite where_to_wlock optimization + change_table_majority/2 bug in mnesia_tm:needs_majority/2 optimize sticky_lock maj. check check majority for sticky locks ...
2011-05-18Merge branch 'egil/remove-compile-warnings' into devBjörn-Egil Dahlberg
* egil/remove-compile-warnings: Remove unused variable warning in inet_res Remove unused variable in epmd_port Remove compiler warnings in inet_drv
2011-05-18Make ssh proxy work with older versions of sshPatrik Nyblom
2011-05-18Merge branch 'pan/escript_in_bootstrap/OTP-9309' into devPatrik Nyblom
* pan/escript_in_bootstrap/OTP-9309: Add escript to bootstrap/bin
2011-05-18Merge branch 'pan/win_static_openssl/OTP-9280' into devPatrik Nyblom
* pan/win_static_openssl/OTP-9280: Mend --with-ssl= in erts/configure Update OpenSSL license text in crypto Link OpenSSL libraries static on Windows
2011-05-18Fixup of re doc and specsPatrik Nyblom
2011-05-18Add true streaming AES (CTR) encryption and streaming HMAC operationsTravis Jensen
The current crypto module implementations require all of the data being encrypted or authenticated to be in memory at one time. When trying to encrypt or authenticate a large file (on order of GBs), this is problematic. The implementation of AES CTR uses the same underlying implementation as aes_ctr_[en|de]crypt, but hands the state back to the client after every operation. The HMAC implementation differs from the previous implementations of sha_mac and md5_mac. The old implementations did not utilize the OpenSSL HMAC implementation. In order to ensure that I didn't implement something incorrectly, I chose to use the OpenSSL HMAC implementation directly, since it handles streaming as well. This has the added side benefit of allowing other hash functions to be used as desired (for instances, I added support for ripemd160 hashing). While I haven't done this, it seems like the existing md5_mac and sha_mac functions could either be depricated or redefined in terms of the new hmac_ functions. Update AES CTR and HMAC streaming with code review input Ensure that memcpy operations in hmac operations are being size checked properly. Rename aes_ctr_XXX_with_state to aes_ctr_stream_XXX. Remove redundant hmac_init_[sha|md5|ripemd160] functions. Fix documentation for hmac_final_n. Fix possible error using negative value as a marker on an unsigned int Now, use a separate marker and add a unit test to test specifically for a case where HashLen is larger than the underlying resultant hash. Revert "Fix possible error using negative value as a marker on an unsigned int" This reverts commit 59cb177aa96444c0fd3ace6d01f7b8a70dd69cc9. Resolve buffer overflow posibility on an unsigned int. Change handling the marker for HashLen to use the fact that a second parameter that has to be the the HashLen was passed. Also, ensure that HashLen parameter is positive.
2011-05-18Merge branch 'ia/public_key/users-guide/examples' into devIngela Anderton Andin
* ia/public_key/users-guide/examples: Corrected documentation error and added examples to Users Guide
2011-05-18Merge branch 'ia/ssl/do_not_invalidate_session_on_improper_close/OTP-9310' ↵Ingela Anderton Andin
into dev * ia/ssl/do_not_invalidate_session_on_improper_close/OTP-9310: In TLS 1.1, failure to properly close a connection no longer requires that a session not be resumed. This is a change from TLS 1.0 to conform with widespread implementation practice. Erlang ssl will now in TLS 1.0 conform to the widespread implementation practice instead of the specification to avoid performance issues.
2011-05-18Fix bug in make_del_dir testcasesPatrik Nyblom
2011-05-18Fix driver_async_cancel()Rickard Green
2011-05-18Convert majority tests to common test frameworkDan Gudmundsson
2011-05-18Corrected documentation error and added examples to Users GuideIngela Anderton Andin
2011-05-18Merge branch 'hb/edoc/bugfixes/OTP-9301' into devHans Bolinder
* hb/edoc/bugfixes/OTP-9301: Fix bugs concerning the option report_missing_types
2011-05-17In TLS 1.1, failure to properly close a connection no longer requiresIngela Anderton Andin
that a session not be resumed. This is a change from TLS 1.0 to conform with widespread implementation practice. Erlang ssl will now in TLS 1.0 conform to the widespread implementation practice instead of the specification to avoid performance issues.
2011-05-17Add escript to bootstrap/binPatrik Nyblom
2011-05-17Remove unused variable warning in inet_resBjörn-Egil Dahlberg
2011-05-17Merge branch 'ta/re-doc' into devHenrik Nord
* ta/re-doc: re: remove gratuitous "it " in manpage OTP-9307
2011-05-17Remove unused variable in epmd_portBjörn-Egil Dahlberg
2011-05-17Prepare mnesia releaseDan Gudmundsson
2011-05-17Remove deadcodeDan Gudmundsson
2011-05-17Remove compiler warnings in inet_drvBjörn-Egil Dahlberg
2011-05-17Merge branch 'ta/gitignore-xmerl_test' into devHenrik Nord
* ta/gitignore-xmerl_test: git ignore lib/xmerl/test/xmerl_test.erl
2011-05-17Merge branch 'uw/mnesia-majority' into devHenrik Nord
* uw/mnesia-majority: dialyzer warning on mnesia_tm Add documentation text about majority checking add mnesia_majority_test suite where_to_wlock optimization + change_table_majority/2 bug in mnesia_tm:needs_majority/2 optimize sticky_lock maj. check check majority for sticky locks Write locks now check majority when needed. Add {majority, boolean()} per-table option. OTP-9304
2011-05-17Merge branch 'siri/sasl/test-suites/OTP-5802' into devSiri Hansen
* siri/sasl/test-suites/OTP-5802: Add SASL test suite
2011-05-17Add SASL test suiteSiri Hansen
2011-05-17Merge branch 'siri/reltool/duplicated-module/OTP-9229' into devSiri Hansen
* siri/reltool/duplicated-module/OTP-9229: Allow same module name in multiple applications if explicitely excluded
2011-05-17Allow same module name in multiple applications if explicitely excludedSiri Hansen
Earlier, reltool expected all module names detected under the lib directories to have unique names. If this was not the case, the result was undefined - i.e. the beam file of the duplicated module might be included in multiple applications in the target area, or it might even be excluded from all applications. This commit adds awareness in reltool that a module might occur in multiple applications, and it is allowed as long as the module or it's application is explicitely excluded in all but one of the containing applications.
2011-05-17Merge branch 'siri/sasl/rb-bugs/OTP-9149' into devSiri Hansen
* siri/sasl/rb-bugs/OTP-9149: Bugfix in rb:filter when using 're' (regexp) and 'no' Don't attempt to do supervisor:delete_child for temporary child Never fail when stopping rb, and fix file descriptor leak
2011-05-17Fix bugs concerning the option report_missing_typesHans Bolinder
Bugs concerning the option report_missing_types that was added in EDoc-0.7.7 have been corrected: the option was misspelled in the source, and local definitions as well as the function tags @private and @hidden were not handled correctly. (Thanks to Manolis Papadakis.)
2011-05-17Merge branch 'lars/xmerl/default-encoding/OTP-9288' into devLars Thorsen
* lars/xmerl/default-encoding/OTP-9288: Fix default encoding in SAX parser.
2011-05-17Fix default encoding in SAX parser.Lars Thorsen
2011-05-16re: remove gratuitous "it " in manpageTuncer Ayaz
2011-05-16Corrected some (backward compatibility) comment spelling.Micael Karlberg
Merge branch 'bmk/snmp/snmp420_integration' into dev
2011-05-16Spelling in (backward *compatibility*) comment.Micael Karlberg
2011-05-16Merge branch 'nick/ssh/handle_unexpected_msg/OTP-9273' into maint-r14Erlang/OTP
* nick/ssh/handle_unexpected_msg/OTP-9273: An unexpected message would crash the ssh_connection_handler and close the connection. Now an error message is generated instead.
2011-05-16Merge branch 'ss/fix-cover-fd-leak' into devHenrik Nord
* ss/fix-cover-fd-leak: Add a check logic to prevent file descriptor leak Fix file descriptor leak OTP-9300
2011-05-16Merge branch 'hb/erl_docgen/specs_and_types_improvements/OTP-9261' into devHans Bolinder
* hb/erl_docgen/specs_and_types_improvements/OTP-9261: Improve erl_docgen's support for Dialyzer specs and types
2011-05-16Improve erl_docgen's support for Dialyzer specs and typesHans Bolinder
The support for using Dialyzer specifications and types has been improved.
2011-05-16Update ts to propigate the timetrap factor gotten from ↵Lukas Larsson
test_server:timetrap_scale_factor to common test when starting a test run.
2011-05-16Update ts to propigate the timetrap factor gotten from ↵Lukas Larsson
test_server:timetrap_scale_factor to common test when starting a test run.
2011-05-16dialyzer warning on mnesia_tmUlf Wiger
2011-05-16Add documentation text about majority checkingUlf Wiger
2011-05-16add mnesia_majority_test suiteUlf Wiger
2011-05-16where_to_wlock optimization + change_table_majority/2Ulf Wiger
2011-05-16bug in mnesia_tm:needs_majority/2Ulf Wiger
2011-05-16optimize sticky_lock maj. checkUlf Wiger
2011-05-16check majority for sticky locksUlf Wiger
2011-05-16Write locks now check majority when needed.Ulf Wiger
Since the table loader also sets (table) write locks, a special lock type, 'load', was needed. Unfortunately, this affects mnesia activity callbacks that redefine the lock operation.