aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2011-05-20Merge branch 'rickard/driver_async_cancel/OTP-9302' into devRickard Green
* rickard/driver_async_cancel/OTP-9302: Fix testcase
2011-05-20Fix testcaseRickard Green
2011-05-20Merge branch 'dgud/wx/app-file/OTP-9324' into devDan Gudmundsson
* dgud/wx/app-file/OTP-9324: Fix wx app file, sed didn't work on all platforms
2011-05-19Merge branch 'sverker/crypto-aes-ctr-stream/OTP-9275' into devSverker Eriksson
* sverker/crypto-aes-ctr-stream/OTP-9275: Stepping vsn for R14B03 Add true streaming AES (CTR) encryption and streaming HMAC operations
2011-05-19Merge branch 'pan/stdlib_doc_fixes/OTP-9318' into devPatrik Nyblom
* pan/stdlib_doc_fixes/OTP-9318: Fixup of re doc and specs
2011-05-19Merge branch 'pan/epmd_testcase/OTP-9214' into devPatrik Nyblom
* pan/epmd_testcase/OTP-9214: Make ssh proxy work with older versions of ssh Mend epmd testcases that test remote access
2011-05-19Merge branch 'pan/win_testcases_R14B03' into devPatrik Nyblom
* pan/win_testcases_R14B03: Fix bug in make_del_dir testcases Teach (prim_)file_SUITE about directory access on Windows OTP-9325
2011-05-19Merge branch 'nick/ssh-test-suite' into devNiclas Eklund
* nick/ssh-test-suite: Removed unused record and fixed a few failing test cases, Generic key management for test suites. Some minor updates regarding how test data is generated. Fixed host handling in ssh_test_lib (daemon and connect functions). Fixed include problem. Corrected include path and spelling of a test case function. Resolved merge conflict. Resolved merge issue. Added code for generating certificates. Altering SSH test keys. Add test suite for ssh Update init_per_suite so that tests are skipped if crypto/ssh cannot be started. Add cover spec file Convert ssh test cases to common test stardard Add test suite for ssh
2011-05-19Removed unused record and fixed a few failing test cases,Niclas Eklund
2011-05-19Generic key management for test suites.Niclas Eklund
2011-05-19Some minor updates regarding how test data is generated.Niclas Eklund
2011-05-19Fixed host handling in ssh_test_lib (daemon and connect functions).Niclas Eklund
2011-05-19Fixed include problem.Niclas Eklund
2011-05-19Corrected include path and spelling of a test case function.Niclas Eklund
2011-05-19Resolved merge conflict.Niclas Eklund
2011-05-19Resolved merge issue.Niclas Eklund
2011-05-19Added code for generating certificates.Niclas Eklund
2011-05-19Altering SSH test keys.Niclas Eklund
2011-05-19Add test suite for sshBjörn-Egil Dahlberg
2011-05-19Update init_per_suite so that tests are skipped if crypto/ssh cannot be started.Lukas Larsson
2011-05-19Add cover spec fileLukas Larsson
2011-05-19Convert ssh test cases to common test stardardLukas Larsson
2011-05-19Add test suite for sshBjörn-Egil Dahlberg
2011-05-19Merge branch 'maint-r14' into devNiclas Eklund
2011-05-19Fix wx app file, sed didn't work on all platformsDan Gudmundsson
2011-05-19Merge branch 'peppe/test_server/OTP-9249' into devPeter Andersson
* peppe/test_server/OTP-9249: Add DragonflyBSD support to test_server
2011-05-19Add DragonflyBSD support to test_serverTuncer Ayaz
2011-05-19Merge branch 'dgud/mnesia/prepare-release' into devDan Gudmundsson
* dgud/mnesia/prepare-release: Prepare mnesia release Remove deadcode
2011-05-19Merge branch 'dgud/mnesia/fix_majority_test' into devDan Gudmundsson
* dgud/mnesia/fix_majority_test: Convert majority tests to common test framework
2011-05-19Merge branch 'rickard/driver_async_cancel/OTP-9302' into devRikard Green
* rickard/driver_async_cancel/OTP-9302: Fix driver_async_cancel()
2011-05-19Merge branch 'hb/erl_eval_docfix/OTP-9322' into devHans Bolinder
* hb/erl_eval_docfix/OTP-9322: Fix a bug in erl_eval(3)
2011-05-19Fix a bug in erl_eval(3)Hans Bolinder
2011-05-18Merge branch 'anders/diameter_import/OTP-9321' into devAnders Svensson
* anders/diameter_import/OTP-9321: Initial commit of the diameter application.
2011-05-18Initial commit of the diameter application.Anders Svensson
The application provides an implementation of the Diameter protocol as defined in RFC 3588.
2011-05-18Merge branch 'bmk/snmp/snmp420_integration' into devMicael Karlberg
2011-05-18Fixed bad links in documentation.Micael Karlberg
2011-05-18Stepping vsn for R14B03Sverker Eriksson
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