summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-07-12Merge "Fix google-explicit-constructor warnings in keystore."android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Treehugger Robot
2016-07-12Fix google-explicit-constructor warnings in keystore.Chih-Hung Hsieh
2016-05-25Merge "Fix misc-macro-parentheses warnings."android-n-preview-4Chih-hung Hsieh
2016-05-11Fix misc-macro-parentheses warnings.Chih-Hung Hsieh
2016-04-25Merge "Fix google-explicit-constructor warnings."android-wear-n-preview-3android-wear-n-preview-1android-n-preview-3Chih-hung Hsieh
2016-04-25Fix google-explicit-constructor warnings.Chih-Hung Hsieh
2016-04-15Merge "Remove RSA_FLAG_EXT_PKEY from android_engine.cpp."Shawn Willden
2016-04-14Merge "Export libbinder headers from libkeystore_binder"Treehugger Robot
2016-04-13Export libbinder headers from libkeystore_binderChristopher Wiley
2016-03-28Remove RSA_FLAG_EXT_PKEY from android_engine.cpp.David Benjamin
2016-03-18Merge "keystore_cli_v2: Update AES parameters"android-n-preview-2Mohammed Habibulla
2016-03-18keystore_cli_v2: Update AES parametersSourabh Banerjee
2016-03-04Merge "keystore_cli_v2: Removed test for KM_TAG_PURPOSE."Darren Krahn
2016-03-04Merge "keystore_cli_v2: Removed test for KM_TAG_PURPOSE."android-n-preview-1Darren Krahn
2016-03-04keystore_cli_v2: Removed test for KM_TAG_PURPOSE.Darren Krahn
2016-03-04Merge "keystore_cli_v2: Add support for testing against v0.3."Darren Krahn
2016-03-04Merge "keystore_cli_v2: Add support for testing against v0.3."Darren Krahn
2016-03-04Merge "Fix various memory errors."Shawn Willden
2016-03-03keystore_cli_v2: Add support for testing against v0.3.Darren Krahn
2016-03-03Merge "Fix various memory errors."Chih-hung Hsieh
2016-03-01Fix various memory errors.Shawn Willden
2016-02-23Merge "system/security/softkeymaster: don\'t pass a structure into |d2i_Priva...Shawn Willden
2016-02-23Merge "system/security/softkeymaster: don't pass a structure into |d2i_Privat...Shawn Willden
2016-02-23system/security/softkeymaster: don't pass a structure into |d2i_PrivateKey|.Adam Langley
2016-02-17Merge commit 'b0adba8170cb5df45629876998229bc0f3c6dd6b' into HEADBill Yi
2016-01-28Merge changes from topic 'km_tag_allow_on_body'brillo-m10-releasebrillo-m10-devShawn Willden
2016-01-27Add KM_TAG_ALLOW_WHILE_ON_BODYShawn Willden
2016-01-27Add attestation support to keystore.Shawn Willden
2016-01-27Merge "Update Keystore to use keymaster2 HAL."Shawn Willden
2016-01-26Merge "Refactor keystore."Shawn Willden
2016-01-26Update Keystore to use keymaster2 HAL.Shawn Willden
2016-01-26Refactor keystore.Shawn Willden
2016-01-25Merge "Update keystore_cli_v2 for keymaster_defs changes."Shawn Willden
2016-01-20Update keystore_cli_v2 for keymaster_defs changes.Shawn Willden
2015-11-23Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5Shawn Willden
2015-11-23Merge "Limit maximum number of concurrent keystore operations."brillo-m9-releasebrillo-m9-devbrillo-m8-releasebrillo-m8-devShawn Willden
2015-11-23Merge "Limit maximum number of concurrent keystore operations."Shawn Willden
2015-11-23Merge "ECIES: adding ECIES-KEM" am: ab42146068Shawn Willden
2015-11-23Merge "ECIES: adding ECIES-KEM"Shawn Willden
2015-11-23Merge "ECIES: adding ECIES-KEM"Shawn Willden
2015-11-23Limit maximum number of concurrent keystore operations.Shawn Willden
2015-11-23ECIES: adding ECIES-KEMShawn Willden
2015-11-10Merge "keystore: Add a test suitable for Brillo PTS." am: 296727f895Darren Krahn
2015-11-10Merge "keystore: Add a test suitable for Brillo PTS."Darren Krahn
2015-11-10Merge "keystore: Add a test suitable for Brillo PTS."Darren Krahn
2015-11-09keystore: Add a test suitable for Brillo PTS.Darren Krahn
2015-11-09Merge "Add keystore to AID_READPROC" am: 641c6299e5Nick Kralevich
2015-11-09Merge "Add keystore to AID_READPROC"Nick Kralevich
2015-11-09Merge "Add keystore to AID_READPROC"Nick Kralevich
2015-11-07Add keystore to AID_READPROCNick Kralevich