gecko-dev/security/nss/lib/pk11wrap/pk11sdr.c
Franziskus Kiefer 41795a76c0 Bug 1305970 - land NSS 0x0cccc59d04dd, r=me
--HG--
rename : security/nss/external_tests/.clang-format => security/nss/gtests/.clang-format
rename : security/nss/external_tests/Makefile => security/nss/gtests/Makefile
rename : security/nss/external_tests/README => security/nss/gtests/README
rename : security/nss/external_tests/common/Makefile => security/nss/gtests/common/Makefile
rename : security/nss/external_tests/common/gtest.mk => security/nss/gtests/common/gtest.mk
rename : security/nss/external_tests/common/gtests.cc => security/nss/gtests/common/gtests.cc
rename : security/nss/external_tests/common/scoped_ptrs.h => security/nss/gtests/common/scoped_ptrs.h
rename : security/nss/external_tests/der_gtest/Makefile => security/nss/gtests/der_gtest/Makefile
rename : security/nss/external_tests/der_gtest/der_getint_unittest.cc => security/nss/gtests/der_gtest/der_getint_unittest.cc
rename : security/nss/external_tests/der_gtest/der_private_key_import_unittest.cc => security/nss/gtests/der_gtest/der_private_key_import_unittest.cc
rename : security/nss/external_tests/google_test/Makefile => security/nss/gtests/google_test/Makefile
rename : security/nss/external_tests/google_test/google_test.gyp => security/nss/gtests/google_test/google_test.gyp
rename : security/nss/external_tests/google_test/gtest/CHANGES => security/nss/gtests/google_test/gtest/CHANGES
rename : security/nss/external_tests/google_test/gtest/CMakeLists.txt => security/nss/gtests/google_test/gtest/CMakeLists.txt
rename : security/nss/external_tests/google_test/gtest/CONTRIBUTORS => security/nss/gtests/google_test/gtest/CONTRIBUTORS
rename : security/nss/external_tests/google_test/gtest/LICENSE => security/nss/gtests/google_test/gtest/LICENSE
rename : security/nss/external_tests/google_test/gtest/Makefile.am => security/nss/gtests/google_test/gtest/Makefile.am
rename : security/nss/external_tests/google_test/gtest/README => security/nss/gtests/google_test/gtest/README
rename : security/nss/external_tests/google_test/gtest/cmake/internal_utils.cmake => security/nss/gtests/google_test/gtest/cmake/internal_utils.cmake
rename : security/nss/external_tests/google_test/gtest/codegear/gtest.cbproj => security/nss/gtests/google_test/gtest/codegear/gtest.cbproj
rename : security/nss/external_tests/google_test/gtest/codegear/gtest.groupproj => security/nss/gtests/google_test/gtest/codegear/gtest.groupproj
rename : security/nss/external_tests/google_test/gtest/codegear/gtest_all.cc => security/nss/gtests/google_test/gtest/codegear/gtest_all.cc
rename : security/nss/external_tests/google_test/gtest/codegear/gtest_link.cc => security/nss/gtests/google_test/gtest/codegear/gtest_link.cc
rename : security/nss/external_tests/google_test/gtest/codegear/gtest_main.cbproj => security/nss/gtests/google_test/gtest/codegear/gtest_main.cbproj
rename : security/nss/external_tests/google_test/gtest/codegear/gtest_unittest.cbproj => security/nss/gtests/google_test/gtest/codegear/gtest_unittest.cbproj
rename : security/nss/external_tests/google_test/gtest/configure.ac => security/nss/gtests/google_test/gtest/configure.ac
rename : security/nss/external_tests/google_test/gtest/include/gtest/gtest-death-test.h => security/nss/gtests/google_test/gtest/include/gtest/gtest-death-test.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/gtest-message.h => security/nss/gtests/google_test/gtest/include/gtest/gtest-message.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/gtest-param-test.h => security/nss/gtests/google_test/gtest/include/gtest/gtest-param-test.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/gtest-param-test.h.pump => security/nss/gtests/google_test/gtest/include/gtest/gtest-param-test.h.pump
rename : security/nss/external_tests/google_test/gtest/include/gtest/gtest-printers.h => security/nss/gtests/google_test/gtest/include/gtest/gtest-printers.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/gtest-spi.h => security/nss/gtests/google_test/gtest/include/gtest/gtest-spi.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/gtest-test-part.h => security/nss/gtests/google_test/gtest/include/gtest/gtest-test-part.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/gtest-typed-test.h => security/nss/gtests/google_test/gtest/include/gtest/gtest-typed-test.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/gtest.h => security/nss/gtests/google_test/gtest/include/gtest/gtest.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/gtest_pred_impl.h => security/nss/gtests/google_test/gtest/include/gtest/gtest_pred_impl.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/gtest_prod.h => security/nss/gtests/google_test/gtest/include/gtest/gtest_prod.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-death-test-internal.h => security/nss/gtests/google_test/gtest/include/gtest/internal/gtest-death-test-internal.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-filepath.h => security/nss/gtests/google_test/gtest/include/gtest/internal/gtest-filepath.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-internal.h => security/nss/gtests/google_test/gtest/include/gtest/internal/gtest-internal.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-linked_ptr.h => security/nss/gtests/google_test/gtest/include/gtest/internal/gtest-linked_ptr.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h => security/nss/gtests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h.pump => security/nss/gtests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
rename : security/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-param-util.h => security/nss/gtests/google_test/gtest/include/gtest/internal/gtest-param-util.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-port.h => security/nss/gtests/google_test/gtest/include/gtest/internal/gtest-port.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-string.h => security/nss/gtests/google_test/gtest/include/gtest/internal/gtest-string.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-tuple.h => security/nss/gtests/google_test/gtest/include/gtest/internal/gtest-tuple.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-tuple.h.pump => security/nss/gtests/google_test/gtest/include/gtest/internal/gtest-tuple.h.pump
rename : security/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-type-util.h => security/nss/gtests/google_test/gtest/include/gtest/internal/gtest-type-util.h
rename : security/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-type-util.h.pump => security/nss/gtests/google_test/gtest/include/gtest/internal/gtest-type-util.h.pump
rename : security/nss/external_tests/google_test/gtest/m4/acx_pthread.m4 => security/nss/gtests/google_test/gtest/m4/acx_pthread.m4
rename : security/nss/external_tests/google_test/gtest/m4/gtest.m4 => security/nss/gtests/google_test/gtest/m4/gtest.m4
rename : security/nss/external_tests/google_test/gtest/make/Makefile => security/nss/gtests/google_test/gtest/make/Makefile
rename : security/nss/external_tests/google_test/gtest/msvc/gtest-md.sln => security/nss/gtests/google_test/gtest/msvc/gtest-md.sln
rename : security/nss/external_tests/google_test/gtest/msvc/gtest-md.vcproj => security/nss/gtests/google_test/gtest/msvc/gtest-md.vcproj
rename : security/nss/external_tests/google_test/gtest/msvc/gtest.sln => security/nss/gtests/google_test/gtest/msvc/gtest.sln
rename : security/nss/external_tests/google_test/gtest/msvc/gtest.vcproj => security/nss/gtests/google_test/gtest/msvc/gtest.vcproj
rename : security/nss/external_tests/google_test/gtest/msvc/gtest_main-md.vcproj => security/nss/gtests/google_test/gtest/msvc/gtest_main-md.vcproj
rename : security/nss/external_tests/google_test/gtest/msvc/gtest_main.vcproj => security/nss/gtests/google_test/gtest/msvc/gtest_main.vcproj
rename : security/nss/external_tests/google_test/gtest/msvc/gtest_prod_test-md.vcproj => security/nss/gtests/google_test/gtest/msvc/gtest_prod_test-md.vcproj
rename : security/nss/external_tests/google_test/gtest/msvc/gtest_prod_test.vcproj => security/nss/gtests/google_test/gtest/msvc/gtest_prod_test.vcproj
rename : security/nss/external_tests/google_test/gtest/msvc/gtest_unittest-md.vcproj => security/nss/gtests/google_test/gtest/msvc/gtest_unittest-md.vcproj
rename : security/nss/external_tests/google_test/gtest/msvc/gtest_unittest.vcproj => security/nss/gtests/google_test/gtest/msvc/gtest_unittest.vcproj
rename : security/nss/external_tests/google_test/gtest/samples/prime_tables.h => security/nss/gtests/google_test/gtest/samples/prime_tables.h
rename : security/nss/external_tests/google_test/gtest/samples/sample1.cc => security/nss/gtests/google_test/gtest/samples/sample1.cc
rename : security/nss/external_tests/google_test/gtest/samples/sample1.h => security/nss/gtests/google_test/gtest/samples/sample1.h
rename : security/nss/external_tests/google_test/gtest/samples/sample10_unittest.cc => security/nss/gtests/google_test/gtest/samples/sample10_unittest.cc
rename : security/nss/external_tests/google_test/gtest/samples/sample1_unittest.cc => security/nss/gtests/google_test/gtest/samples/sample1_unittest.cc
rename : security/nss/external_tests/google_test/gtest/samples/sample2.cc => security/nss/gtests/google_test/gtest/samples/sample2.cc
rename : security/nss/external_tests/google_test/gtest/samples/sample2.h => security/nss/gtests/google_test/gtest/samples/sample2.h
rename : security/nss/external_tests/google_test/gtest/samples/sample2_unittest.cc => security/nss/gtests/google_test/gtest/samples/sample2_unittest.cc
rename : security/nss/external_tests/google_test/gtest/samples/sample3-inl.h => security/nss/gtests/google_test/gtest/samples/sample3-inl.h
rename : security/nss/external_tests/google_test/gtest/samples/sample3_unittest.cc => security/nss/gtests/google_test/gtest/samples/sample3_unittest.cc
rename : security/nss/external_tests/google_test/gtest/samples/sample4.cc => security/nss/gtests/google_test/gtest/samples/sample4.cc
rename : security/nss/external_tests/google_test/gtest/samples/sample4.h => security/nss/gtests/google_test/gtest/samples/sample4.h
rename : security/nss/external_tests/google_test/gtest/samples/sample4_unittest.cc => security/nss/gtests/google_test/gtest/samples/sample4_unittest.cc
rename : security/nss/external_tests/google_test/gtest/samples/sample5_unittest.cc => security/nss/gtests/google_test/gtest/samples/sample5_unittest.cc
rename : security/nss/external_tests/google_test/gtest/samples/sample6_unittest.cc => security/nss/gtests/google_test/gtest/samples/sample6_unittest.cc
rename : security/nss/external_tests/google_test/gtest/samples/sample7_unittest.cc => security/nss/gtests/google_test/gtest/samples/sample7_unittest.cc
rename : security/nss/external_tests/google_test/gtest/samples/sample8_unittest.cc => security/nss/gtests/google_test/gtest/samples/sample8_unittest.cc
rename : security/nss/external_tests/google_test/gtest/samples/sample9_unittest.cc => security/nss/gtests/google_test/gtest/samples/sample9_unittest.cc
rename : security/nss/external_tests/google_test/gtest/scripts/common.py => security/nss/gtests/google_test/gtest/scripts/common.py
rename : security/nss/external_tests/google_test/gtest/scripts/fuse_gtest_files.py => security/nss/gtests/google_test/gtest/scripts/fuse_gtest_files.py
rename : security/nss/external_tests/google_test/gtest/scripts/gen_gtest_pred_impl.py => security/nss/gtests/google_test/gtest/scripts/gen_gtest_pred_impl.py
rename : security/nss/external_tests/google_test/gtest/scripts/gtest-config.in => security/nss/gtests/google_test/gtest/scripts/gtest-config.in
rename : security/nss/external_tests/google_test/gtest/scripts/pump.py => security/nss/gtests/google_test/gtest/scripts/pump.py
rename : security/nss/external_tests/google_test/gtest/scripts/release_docs.py => security/nss/gtests/google_test/gtest/scripts/release_docs.py
rename : security/nss/external_tests/google_test/gtest/scripts/test/Makefile => security/nss/gtests/google_test/gtest/scripts/test/Makefile
rename : security/nss/external_tests/google_test/gtest/scripts/upload.py => security/nss/gtests/google_test/gtest/scripts/upload.py
rename : security/nss/external_tests/google_test/gtest/scripts/upload_gtest.py => security/nss/gtests/google_test/gtest/scripts/upload_gtest.py
rename : security/nss/external_tests/google_test/gtest/src/gtest-all.cc => security/nss/gtests/google_test/gtest/src/gtest-all.cc
rename : security/nss/external_tests/google_test/gtest/src/gtest-death-test.cc => security/nss/gtests/google_test/gtest/src/gtest-death-test.cc
rename : security/nss/external_tests/google_test/gtest/src/gtest-filepath.cc => security/nss/gtests/google_test/gtest/src/gtest-filepath.cc
rename : security/nss/external_tests/google_test/gtest/src/gtest-internal-inl.h => security/nss/gtests/google_test/gtest/src/gtest-internal-inl.h
rename : security/nss/external_tests/google_test/gtest/src/gtest-port.cc => security/nss/gtests/google_test/gtest/src/gtest-port.cc
rename : security/nss/external_tests/google_test/gtest/src/gtest-printers.cc => security/nss/gtests/google_test/gtest/src/gtest-printers.cc
rename : security/nss/external_tests/google_test/gtest/src/gtest-test-part.cc => security/nss/gtests/google_test/gtest/src/gtest-test-part.cc
rename : security/nss/external_tests/google_test/gtest/src/gtest-typed-test.cc => security/nss/gtests/google_test/gtest/src/gtest-typed-test.cc
rename : security/nss/external_tests/google_test/gtest/src/gtest.cc => security/nss/gtests/google_test/gtest/src/gtest.cc
rename : security/nss/external_tests/google_test/gtest/src/gtest_main.cc => security/nss/gtests/google_test/gtest/src/gtest_main.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest-death-test_ex_test.cc => security/nss/gtests/google_test/gtest/test/gtest-death-test_ex_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest-death-test_test.cc => security/nss/gtests/google_test/gtest/test/gtest-death-test_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest-filepath_test.cc => security/nss/gtests/google_test/gtest/test/gtest-filepath_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest-linked_ptr_test.cc => security/nss/gtests/google_test/gtest/test/gtest-linked_ptr_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest-listener_test.cc => security/nss/gtests/google_test/gtest/test/gtest-listener_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest-message_test.cc => security/nss/gtests/google_test/gtest/test/gtest-message_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest-options_test.cc => security/nss/gtests/google_test/gtest/test/gtest-options_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest-param-test2_test.cc => security/nss/gtests/google_test/gtest/test/gtest-param-test2_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest-param-test_test.cc => security/nss/gtests/google_test/gtest/test/gtest-param-test_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest-param-test_test.h => security/nss/gtests/google_test/gtest/test/gtest-param-test_test.h
rename : security/nss/external_tests/google_test/gtest/test/gtest-port_test.cc => security/nss/gtests/google_test/gtest/test/gtest-port_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest-printers_test.cc => security/nss/gtests/google_test/gtest/test/gtest-printers_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest-test-part_test.cc => security/nss/gtests/google_test/gtest/test/gtest-test-part_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest-tuple_test.cc => security/nss/gtests/google_test/gtest/test/gtest-tuple_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest-typed-test2_test.cc => security/nss/gtests/google_test/gtest/test/gtest-typed-test2_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest-typed-test_test.cc => security/nss/gtests/google_test/gtest/test/gtest-typed-test_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest-typed-test_test.h => security/nss/gtests/google_test/gtest/test/gtest-typed-test_test.h
rename : security/nss/external_tests/google_test/gtest/test/gtest-unittest-api_test.cc => security/nss/gtests/google_test/gtest/test/gtest-unittest-api_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_all_test.cc => security/nss/gtests/google_test/gtest/test/gtest_all_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_break_on_failure_unittest.py => security/nss/gtests/google_test/gtest/test/gtest_break_on_failure_unittest.py
rename : security/nss/external_tests/google_test/gtest/test/gtest_break_on_failure_unittest_.cc => security/nss/gtests/google_test/gtest/test/gtest_break_on_failure_unittest_.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_catch_exceptions_test.py => security/nss/gtests/google_test/gtest/test/gtest_catch_exceptions_test.py
rename : security/nss/external_tests/google_test/gtest/test/gtest_catch_exceptions_test_.cc => security/nss/gtests/google_test/gtest/test/gtest_catch_exceptions_test_.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_color_test.py => security/nss/gtests/google_test/gtest/test/gtest_color_test.py
rename : security/nss/external_tests/google_test/gtest/test/gtest_color_test_.cc => security/nss/gtests/google_test/gtest/test/gtest_color_test_.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_env_var_test.py => security/nss/gtests/google_test/gtest/test/gtest_env_var_test.py
rename : security/nss/external_tests/google_test/gtest/test/gtest_env_var_test_.cc => security/nss/gtests/google_test/gtest/test/gtest_env_var_test_.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_environment_test.cc => security/nss/gtests/google_test/gtest/test/gtest_environment_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_filter_unittest.py => security/nss/gtests/google_test/gtest/test/gtest_filter_unittest.py
rename : security/nss/external_tests/google_test/gtest/test/gtest_filter_unittest_.cc => security/nss/gtests/google_test/gtest/test/gtest_filter_unittest_.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_help_test.py => security/nss/gtests/google_test/gtest/test/gtest_help_test.py
rename : security/nss/external_tests/google_test/gtest/test/gtest_help_test_.cc => security/nss/gtests/google_test/gtest/test/gtest_help_test_.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_list_tests_unittest.py => security/nss/gtests/google_test/gtest/test/gtest_list_tests_unittest.py
rename : security/nss/external_tests/google_test/gtest/test/gtest_list_tests_unittest_.cc => security/nss/gtests/google_test/gtest/test/gtest_list_tests_unittest_.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_main_unittest.cc => security/nss/gtests/google_test/gtest/test/gtest_main_unittest.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_no_test_unittest.cc => security/nss/gtests/google_test/gtest/test/gtest_no_test_unittest.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_output_test.py => security/nss/gtests/google_test/gtest/test/gtest_output_test.py
rename : security/nss/external_tests/google_test/gtest/test/gtest_output_test_.cc => security/nss/gtests/google_test/gtest/test/gtest_output_test_.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_output_test_golden_lin.txt => security/nss/gtests/google_test/gtest/test/gtest_output_test_golden_lin.txt
rename : security/nss/external_tests/google_test/gtest/test/gtest_pred_impl_unittest.cc => security/nss/gtests/google_test/gtest/test/gtest_pred_impl_unittest.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_premature_exit_test.cc => security/nss/gtests/google_test/gtest/test/gtest_premature_exit_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_prod_test.cc => security/nss/gtests/google_test/gtest/test/gtest_prod_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_repeat_test.cc => security/nss/gtests/google_test/gtest/test/gtest_repeat_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_shuffle_test.py => security/nss/gtests/google_test/gtest/test/gtest_shuffle_test.py
rename : security/nss/external_tests/google_test/gtest/test/gtest_shuffle_test_.cc => security/nss/gtests/google_test/gtest/test/gtest_shuffle_test_.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_sole_header_test.cc => security/nss/gtests/google_test/gtest/test/gtest_sole_header_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_stress_test.cc => security/nss/gtests/google_test/gtest/test/gtest_stress_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_test_utils.py => security/nss/gtests/google_test/gtest/test/gtest_test_utils.py
rename : security/nss/external_tests/google_test/gtest/test/gtest_throw_on_failure_ex_test.cc => security/nss/gtests/google_test/gtest/test/gtest_throw_on_failure_ex_test.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_throw_on_failure_test.py => security/nss/gtests/google_test/gtest/test/gtest_throw_on_failure_test.py
rename : security/nss/external_tests/google_test/gtest/test/gtest_throw_on_failure_test_.cc => security/nss/gtests/google_test/gtest/test/gtest_throw_on_failure_test_.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_uninitialized_test.py => security/nss/gtests/google_test/gtest/test/gtest_uninitialized_test.py
rename : security/nss/external_tests/google_test/gtest/test/gtest_uninitialized_test_.cc => security/nss/gtests/google_test/gtest/test/gtest_uninitialized_test_.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_unittest.cc => security/nss/gtests/google_test/gtest/test/gtest_unittest.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_xml_outfile1_test_.cc => security/nss/gtests/google_test/gtest/test/gtest_xml_outfile1_test_.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_xml_outfile2_test_.cc => security/nss/gtests/google_test/gtest/test/gtest_xml_outfile2_test_.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_xml_outfiles_test.py => security/nss/gtests/google_test/gtest/test/gtest_xml_outfiles_test.py
rename : security/nss/external_tests/google_test/gtest/test/gtest_xml_output_unittest.py => security/nss/gtests/google_test/gtest/test/gtest_xml_output_unittest.py
rename : security/nss/external_tests/google_test/gtest/test/gtest_xml_output_unittest_.cc => security/nss/gtests/google_test/gtest/test/gtest_xml_output_unittest_.cc
rename : security/nss/external_tests/google_test/gtest/test/gtest_xml_test_utils.py => security/nss/gtests/google_test/gtest/test/gtest_xml_test_utils.py
rename : security/nss/external_tests/google_test/gtest/test/production.cc => security/nss/gtests/google_test/gtest/test/production.cc
rename : security/nss/external_tests/google_test/gtest/test/production.h => security/nss/gtests/google_test/gtest/test/production.h
rename : security/nss/external_tests/google_test/gtest/xcode/Config/DebugProject.xcconfig => security/nss/gtests/google_test/gtest/xcode/Config/DebugProject.xcconfig
rename : security/nss/external_tests/google_test/gtest/xcode/Config/FrameworkTarget.xcconfig => security/nss/gtests/google_test/gtest/xcode/Config/FrameworkTarget.xcconfig
rename : security/nss/external_tests/google_test/gtest/xcode/Config/General.xcconfig => security/nss/gtests/google_test/gtest/xcode/Config/General.xcconfig
rename : security/nss/external_tests/google_test/gtest/xcode/Config/ReleaseProject.xcconfig => security/nss/gtests/google_test/gtest/xcode/Config/ReleaseProject.xcconfig
rename : security/nss/external_tests/google_test/gtest/xcode/Config/StaticLibraryTarget.xcconfig => security/nss/gtests/google_test/gtest/xcode/Config/StaticLibraryTarget.xcconfig
rename : security/nss/external_tests/google_test/gtest/xcode/Config/TestTarget.xcconfig => security/nss/gtests/google_test/gtest/xcode/Config/TestTarget.xcconfig
rename : security/nss/external_tests/google_test/gtest/xcode/Resources/Info.plist => security/nss/gtests/google_test/gtest/xcode/Resources/Info.plist
rename : security/nss/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/Info.plist => security/nss/gtests/google_test/gtest/xcode/Samples/FrameworkSample/Info.plist
rename : security/nss/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj => security/nss/gtests/google_test/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
rename : security/nss/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/runtests.sh => security/nss/gtests/google_test/gtest/xcode/Samples/FrameworkSample/runtests.sh
rename : security/nss/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/widget.cc => security/nss/gtests/google_test/gtest/xcode/Samples/FrameworkSample/widget.cc
rename : security/nss/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/widget.h => security/nss/gtests/google_test/gtest/xcode/Samples/FrameworkSample/widget.h
rename : security/nss/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/widget_test.cc => security/nss/gtests/google_test/gtest/xcode/Samples/FrameworkSample/widget_test.cc
rename : security/nss/external_tests/google_test/gtest/xcode/Scripts/runtests.sh => security/nss/gtests/google_test/gtest/xcode/Scripts/runtests.sh
rename : security/nss/external_tests/google_test/gtest/xcode/Scripts/versiongenerate.py => security/nss/gtests/google_test/gtest/xcode/Scripts/versiongenerate.py
rename : security/nss/external_tests/google_test/gtest/xcode/gtest.xcodeproj/project.pbxproj => security/nss/gtests/google_test/gtest/xcode/gtest.xcodeproj/project.pbxproj
rename : security/nss/external_tests/google_test/manifest.mn => security/nss/gtests/google_test/manifest.mn
rename : security/nss/external_tests/manifest.mn => security/nss/gtests/manifest.mn
rename : security/nss/external_tests/nss_bogo_shim/Makefile => security/nss/gtests/nss_bogo_shim/Makefile
rename : security/nss/external_tests/nss_bogo_shim/config.cc => security/nss/gtests/nss_bogo_shim/config.cc
rename : security/nss/external_tests/nss_bogo_shim/config.h => security/nss/gtests/nss_bogo_shim/config.h
rename : security/nss/external_tests/nss_bogo_shim/config.json => security/nss/gtests/nss_bogo_shim/config.json
rename : security/nss/external_tests/nss_bogo_shim/manifest.mn => security/nss/gtests/nss_bogo_shim/manifest.mn
rename : security/nss/external_tests/nss_bogo_shim/nss_bogo_shim.cc => security/nss/gtests/nss_bogo_shim/nss_bogo_shim.cc
rename : security/nss/external_tests/nss_bogo_shim/nsskeys.cc => security/nss/gtests/nss_bogo_shim/nsskeys.cc
rename : security/nss/external_tests/nss_bogo_shim/nsskeys.h => security/nss/gtests/nss_bogo_shim/nsskeys.h
rename : security/nss/external_tests/der_gtest/Makefile => security/nss/gtests/pk11_gtest/Makefile
rename : security/nss/external_tests/pk11_gtest/pk11_aeskeywrap_unittest.cc => security/nss/gtests/pk11_gtest/pk11_aeskeywrap_unittest.cc
rename : security/nss/external_tests/pk11_gtest/pk11_chacha20poly1305_unittest.cc => security/nss/gtests/pk11_gtest/pk11_chacha20poly1305_unittest.cc
rename : security/nss/external_tests/pk11_gtest/pk11_export_unittest.cc => security/nss/gtests/pk11_gtest/pk11_export_unittest.cc
rename : security/nss/external_tests/pk11_gtest/pk11_pbkdf2_unittest.cc => security/nss/gtests/pk11_gtest/pk11_pbkdf2_unittest.cc
rename : security/nss/external_tests/pk11_gtest/pk11_prf_unittest.cc => security/nss/gtests/pk11_gtest/pk11_prf_unittest.cc
rename : security/nss/external_tests/pk11_gtest/pk11_rsapss_unittest.cc => security/nss/gtests/pk11_gtest/pk11_rsapss_unittest.cc
rename : security/nss/external_tests/ssl_gtest/Makefile => security/nss/gtests/ssl_gtest/Makefile
rename : security/nss/external_tests/ssl_gtest/databuffer.h => security/nss/gtests/ssl_gtest/databuffer.h
rename : security/nss/external_tests/ssl_gtest/gtest_utils.h => security/nss/gtests/ssl_gtest/gtest_utils.h
rename : security/nss/external_tests/ssl_gtest/libssl_internals.c => security/nss/gtests/ssl_gtest/libssl_internals.c
rename : security/nss/external_tests/ssl_gtest/libssl_internals.h => security/nss/gtests/ssl_gtest/libssl_internals.h
rename : security/nss/external_tests/ssl_gtest/ssl_0rtt_unittest.cc => security/nss/gtests/ssl_gtest/ssl_0rtt_unittest.cc
rename : security/nss/external_tests/ssl_gtest/ssl_agent_unittest.cc => security/nss/gtests/ssl_gtest/ssl_agent_unittest.cc
rename : security/nss/external_tests/ssl_gtest/ssl_auth_unittest.cc => security/nss/gtests/ssl_gtest/ssl_auth_unittest.cc
rename : security/nss/external_tests/ssl_gtest/ssl_cert_ext_unittest.cc => security/nss/gtests/ssl_gtest/ssl_cert_ext_unittest.cc
rename : security/nss/external_tests/ssl_gtest/ssl_ciphersuite_unittest.cc => security/nss/gtests/ssl_gtest/ssl_ciphersuite_unittest.cc
rename : security/nss/external_tests/ssl_gtest/ssl_damage_unittest.cc => security/nss/gtests/ssl_gtest/ssl_damage_unittest.cc
rename : security/nss/external_tests/ssl_gtest/ssl_dhe_unittest.cc => security/nss/gtests/ssl_gtest/ssl_dhe_unittest.cc
rename : security/nss/external_tests/ssl_gtest/ssl_drop_unittest.cc => security/nss/gtests/ssl_gtest/ssl_drop_unittest.cc
rename : security/nss/external_tests/ssl_gtest/ssl_ecdh_unittest.cc => security/nss/gtests/ssl_gtest/ssl_ecdh_unittest.cc
rename : security/nss/external_tests/ssl_gtest/ssl_ems_unittest.cc => security/nss/gtests/ssl_gtest/ssl_ems_unittest.cc
rename : security/nss/external_tests/ssl_gtest/ssl_extension_unittest.cc => security/nss/gtests/ssl_gtest/ssl_extension_unittest.cc
rename : security/nss/external_tests/ssl_gtest/ssl_gtest.cc => security/nss/gtests/ssl_gtest/ssl_gtest.cc
rename : security/nss/external_tests/ssl_gtest/ssl_hrr_unittest.cc => security/nss/gtests/ssl_gtest/ssl_hrr_unittest.cc
rename : security/nss/external_tests/ssl_gtest/ssl_loopback_unittest.cc => security/nss/gtests/ssl_gtest/ssl_loopback_unittest.cc
rename : security/nss/external_tests/ssl_gtest/ssl_record_unittest.cc => security/nss/gtests/ssl_gtest/ssl_record_unittest.cc
rename : security/nss/external_tests/ssl_gtest/ssl_resumption_unittest.cc => security/nss/gtests/ssl_gtest/ssl_resumption_unittest.cc
rename : security/nss/external_tests/ssl_gtest/ssl_skip_unittest.cc => security/nss/gtests/ssl_gtest/ssl_skip_unittest.cc
rename : security/nss/external_tests/ssl_gtest/ssl_staticrsa_unittest.cc => security/nss/gtests/ssl_gtest/ssl_staticrsa_unittest.cc
rename : security/nss/external_tests/ssl_gtest/ssl_v2_client_hello_unittest.cc => security/nss/gtests/ssl_gtest/ssl_v2_client_hello_unittest.cc
rename : security/nss/external_tests/ssl_gtest/ssl_version_unittest.cc => security/nss/gtests/ssl_gtest/ssl_version_unittest.cc
rename : security/nss/external_tests/ssl_gtest/test_io.cc => security/nss/gtests/ssl_gtest/test_io.cc
rename : security/nss/external_tests/ssl_gtest/test_io.h => security/nss/gtests/ssl_gtest/test_io.h
rename : security/nss/external_tests/ssl_gtest/tls_agent.cc => security/nss/gtests/ssl_gtest/tls_agent.cc
rename : security/nss/external_tests/ssl_gtest/tls_agent.h => security/nss/gtests/ssl_gtest/tls_agent.h
rename : security/nss/external_tests/ssl_gtest/tls_connect.cc => security/nss/gtests/ssl_gtest/tls_connect.cc
rename : security/nss/external_tests/ssl_gtest/tls_connect.h => security/nss/gtests/ssl_gtest/tls_connect.h
rename : security/nss/external_tests/ssl_gtest/tls_filter.cc => security/nss/gtests/ssl_gtest/tls_filter.cc
rename : security/nss/external_tests/ssl_gtest/tls_filter.h => security/nss/gtests/ssl_gtest/tls_filter.h
rename : security/nss/external_tests/ssl_gtest/tls_hkdf_unittest.cc => security/nss/gtests/ssl_gtest/tls_hkdf_unittest.cc
rename : security/nss/external_tests/ssl_gtest/tls_parser.cc => security/nss/gtests/ssl_gtest/tls_parser.cc
rename : security/nss/external_tests/ssl_gtest/tls_parser.h => security/nss/gtests/ssl_gtest/tls_parser.h
rename : security/nss/external_tests/util_gtest/Makefile => security/nss/gtests/util_gtest/Makefile
rename : security/nss/external_tests/util_gtest/util_utf8_unittest.cc => security/nss/gtests/util_gtest/util_utf8_unittest.cc
extra : rebase_source : 526ff9352caf7c59048807e9606388ac2240840e
2016-11-02 10:29:58 +01:00

438 lines
11 KiB
C

/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "seccomon.h"
#include "secoid.h"
#include "secasn1.h"
#include "pkcs11.h"
#include "pk11func.h"
#include "pk11sdr.h"
/*
* Data structure and template for encoding the result of an SDR operation
* This is temporary. It should include the algorithm ID of the encryption mechanism
*/
struct SDRResult {
SECItem keyid;
SECAlgorithmID alg;
SECItem data;
};
typedef struct SDRResult SDRResult;
SEC_ASN1_MKSUB(SECOID_AlgorithmIDTemplate)
static SEC_ASN1Template template[] = {
{ SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SDRResult) },
{ SEC_ASN1_OCTET_STRING, offsetof(SDRResult, keyid) },
{ SEC_ASN1_INLINE | SEC_ASN1_XTRN, offsetof(SDRResult, alg),
SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) },
{ SEC_ASN1_OCTET_STRING, offsetof(SDRResult, data) },
{ 0 }
};
static unsigned char keyID[] = {
0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
};
static SECItem keyIDItem = {
0,
keyID,
sizeof keyID
};
/* local utility function for padding an incoming data block
* to the mechanism block size.
*/
static SECStatus
padBlock(SECItem *data, int blockSize, SECItem *result)
{
SECStatus rv = SECSuccess;
int padLength;
unsigned int i;
result->data = 0;
result->len = 0;
/* This algorithm always adds to the block (to indicate the number
* of pad bytes). So allocate a block large enough.
*/
padLength = blockSize - (data->len % blockSize);
result->len = data->len + padLength;
result->data = (unsigned char *)PORT_Alloc(result->len);
/* Copy the data */
PORT_Memcpy(result->data, data->data, data->len);
/* Add the pad values */
for (i = data->len; i < result->len; i++)
result->data[i] = (unsigned char)padLength;
return rv;
}
static SECStatus
unpadBlock(SECItem *data, int blockSize, SECItem *result)
{
SECStatus rv = SECSuccess;
int padLength;
unsigned int i;
result->data = 0;
result->len = 0;
/* Remove the padding from the end if the input data */
if (data->len == 0 || data->len % blockSize != 0) {
rv = SECFailure;
goto loser;
}
padLength = data->data[data->len - 1];
if (padLength > blockSize) {
rv = SECFailure;
goto loser;
}
/* verify padding */
for (i = data->len - padLength; i < data->len; i++) {
if (data->data[i] != padLength) {
rv = SECFailure;
goto loser;
}
}
result->len = data->len - padLength;
result->data = (unsigned char *)PORT_Alloc(result->len);
if (!result->data) {
rv = SECFailure;
goto loser;
}
PORT_Memcpy(result->data, data->data, result->len);
if (padLength < 2) {
return SECWouldBlock;
}
loser:
return rv;
}
static PRLock *pk11sdrLock = NULL;
void
pk11sdr_Init(void)
{
pk11sdrLock = PR_NewLock();
}
void
pk11sdr_Shutdown(void)
{
if (pk11sdrLock) {
PR_DestroyLock(pk11sdrLock);
pk11sdrLock = NULL;
}
}
/*
* PK11SDR_Encrypt
* Encrypt a block of data using the symmetric key identified. The result
* is an ASN.1 (DER) encoded block of keyid, params and data.
*/
SECStatus
PK11SDR_Encrypt(SECItem *keyid, SECItem *data, SECItem *result, void *cx)
{
SECStatus rv = SECSuccess;
PK11SlotInfo *slot = 0;
PK11SymKey *key = 0;
SECItem *params = 0;
PK11Context *ctx = 0;
CK_MECHANISM_TYPE type;
SDRResult sdrResult;
SECItem paddedData;
SECItem *pKeyID;
PLArenaPool *arena = 0;
/* Initialize */
paddedData.len = 0;
paddedData.data = 0;
arena = PORT_NewArena(SEC_ASN1_DEFAULT_ARENA_SIZE);
if (!arena) {
rv = SECFailure;
goto loser;
}
/* 1. Locate the requested keyid, or the default key (which has a keyid)
* 2. Create an encryption context
* 3. Encrypt
* 4. Encode the results (using ASN.1)
*/
slot = PK11_GetInternalKeySlot();
if (!slot) {
rv = SECFailure;
goto loser;
}
/* Use triple-DES */
type = CKM_DES3_CBC;
/*
* Login to the internal token before we look for the key, otherwise we
* won't find it.
*/
rv = PK11_Authenticate(slot, PR_TRUE, cx);
if (rv != SECSuccess)
goto loser;
/* Find the key to use */
pKeyID = keyid;
if (pKeyID->len == 0) {
pKeyID = &keyIDItem; /* Use default value */
/* put in a course lock to prevent a race between not finding the
* key and creating one.
*/
if (pk11sdrLock)
PR_Lock(pk11sdrLock);
/* Try to find the key */
key = PK11_FindFixedKey(slot, type, pKeyID, cx);
/* If the default key doesn't exist yet, try to create it */
if (!key)
key = PK11_GenDES3TokenKey(slot, pKeyID, cx);
if (pk11sdrLock)
PR_Unlock(pk11sdrLock);
} else {
key = PK11_FindFixedKey(slot, type, pKeyID, cx);
}
if (!key) {
rv = SECFailure;
goto loser;
}
params = PK11_GenerateNewParam(type, key);
if (!params) {
rv = SECFailure;
goto loser;
}
ctx = PK11_CreateContextBySymKey(type, CKA_ENCRYPT, key, params);
if (!ctx) {
rv = SECFailure;
goto loser;
}
rv = padBlock(data, PK11_GetBlockSize(type, 0), &paddedData);
if (rv != SECSuccess)
goto loser;
sdrResult.data.len = paddedData.len;
sdrResult.data.data = (unsigned char *)PORT_ArenaAlloc(arena, sdrResult.data.len);
rv = PK11_CipherOp(ctx, sdrResult.data.data, (int *)&sdrResult.data.len, sdrResult.data.len,
paddedData.data, paddedData.len);
if (rv != SECSuccess)
goto loser;
PK11_Finalize(ctx);
sdrResult.keyid = *pKeyID;
rv = PK11_ParamToAlgid(SEC_OID_DES_EDE3_CBC, params, arena, &sdrResult.alg);
if (rv != SECSuccess)
goto loser;
if (!SEC_ASN1EncodeItem(0, result, &sdrResult, template)) {
rv = SECFailure;
goto loser;
}
loser:
SECITEM_ZfreeItem(&paddedData, PR_FALSE);
if (arena)
PORT_FreeArena(arena, PR_TRUE);
if (ctx)
PK11_DestroyContext(ctx, PR_TRUE);
if (params)
SECITEM_ZfreeItem(params, PR_TRUE);
if (key)
PK11_FreeSymKey(key);
if (slot)
PK11_FreeSlot(slot);
return rv;
}
/* decrypt a block */
static SECStatus
pk11Decrypt(PK11SlotInfo *slot, PLArenaPool *arena,
CK_MECHANISM_TYPE type, PK11SymKey *key,
SECItem *params, SECItem *in, SECItem *result)
{
PK11Context *ctx = 0;
SECItem paddedResult;
SECStatus rv;
paddedResult.len = 0;
paddedResult.data = 0;
ctx = PK11_CreateContextBySymKey(type, CKA_DECRYPT, key, params);
if (!ctx) {
rv = SECFailure;
goto loser;
}
paddedResult.len = in->len;
paddedResult.data = PORT_ArenaAlloc(arena, paddedResult.len);
rv = PK11_CipherOp(ctx, paddedResult.data,
(int *)&paddedResult.len, paddedResult.len,
in->data, in->len);
if (rv != SECSuccess)
goto loser;
PK11_Finalize(ctx);
/* Remove the padding */
rv = unpadBlock(&paddedResult, PK11_GetBlockSize(type, 0), result);
if (rv)
goto loser;
loser:
if (ctx)
PK11_DestroyContext(ctx, PR_TRUE);
return rv;
}
/*
* PK11SDR_Decrypt
* Decrypt a block of data produced by PK11SDR_Encrypt. The key used is identified
* by the keyid field within the input.
*/
SECStatus
PK11SDR_Decrypt(SECItem *data, SECItem *result, void *cx)
{
SECStatus rv = SECSuccess;
PK11SlotInfo *slot = 0;
PK11SymKey *key = 0;
CK_MECHANISM_TYPE type;
SDRResult sdrResult;
SECItem *params = 0;
SECItem possibleResult = { 0, NULL, 0 };
PLArenaPool *arena = 0;
arena = PORT_NewArena(SEC_ASN1_DEFAULT_ARENA_SIZE);
if (!arena) {
rv = SECFailure;
goto loser;
}
/* Decode the incoming data */
memset(&sdrResult, 0, sizeof sdrResult);
rv = SEC_QuickDERDecodeItem(arena, &sdrResult, template, data);
if (rv != SECSuccess)
goto loser; /* Invalid format */
/* Find the slot and key for the given keyid */
slot = PK11_GetInternalKeySlot();
if (!slot) {
rv = SECFailure;
goto loser;
}
rv = PK11_Authenticate(slot, PR_TRUE, cx);
if (rv != SECSuccess)
goto loser;
/* Get the parameter values from the data */
params = PK11_ParamFromAlgid(&sdrResult.alg);
if (!params) {
rv = SECFailure;
goto loser;
}
/* Use triple-DES (Should look up the algorithm) */
type = CKM_DES3_CBC;
key = PK11_FindFixedKey(slot, type, &sdrResult.keyid, cx);
if (!key) {
rv = SECFailure;
} else {
rv = pk11Decrypt(slot, arena, type, key, params,
&sdrResult.data, result);
}
/*
* if the pad value was too small (1 or 2), then it's statistically
* 'likely' that (1 in 256) that we may not have the correct key.
* Check the other keys for a better match. If we find none, use
* this result.
*/
if (rv == SECWouldBlock) {
possibleResult = *result;
}
/*
* handle the case where your key indicies may have been broken
*/
if (rv != SECSuccess) {
PK11SymKey *keyList = PK11_ListFixedKeysInSlot(slot, NULL, cx);
PK11SymKey *testKey = NULL;
PK11SymKey *nextKey = NULL;
for (testKey = keyList; testKey;
testKey = PK11_GetNextSymKey(testKey)) {
rv = pk11Decrypt(slot, arena, type, testKey, params,
&sdrResult.data, result);
if (rv == SECSuccess) {
break;
}
/* found a close match. If it's our first remember it */
if (rv == SECWouldBlock) {
if (possibleResult.data) {
/* this is unlikely but possible. If we hit this condition,
* we have no way of knowing which possibility to prefer.
* in this case we just match the key the application
* thought was the right one */
SECITEM_ZfreeItem(result, PR_FALSE);
} else {
possibleResult = *result;
}
}
}
/* free the list */
for (testKey = keyList; testKey; testKey = nextKey) {
nextKey = PK11_GetNextSymKey(testKey);
PK11_FreeSymKey(testKey);
}
}
/* we didn't find a better key, use the one with a small pad value */
if ((rv != SECSuccess) && (possibleResult.data)) {
*result = possibleResult;
possibleResult.data = NULL;
rv = SECSuccess;
}
loser:
if (arena)
PORT_FreeArena(arena, PR_TRUE);
if (key)
PK11_FreeSymKey(key);
if (params)
SECITEM_ZfreeItem(params, PR_TRUE);
if (slot)
PK11_FreeSlot(slot);
if (possibleResult.data)
SECITEM_ZfreeItem(&possibleResult, PR_FALSE);
return rv;
}