1. 86c942a DO NOT MERGE Delete password as per block encryption by Paul Lawrence · 9 years ago
  2. 2f32cda DO NOT MERGE Retry unmounts in ext4 encryption by Paul Lawrence · 9 years ago
  3. 368d794 DO NOT MERGE Enable properties in ext4enc by Paul Lawrence · 9 years ago
  4. c78c71b DO NOT MERGE Check password is correct by checking hash by Paul Lawrence · 9 years ago
  5. 731a7a2 DO NOT MERGE Securely encrypt the master key by Paul Lawrence · 9 years ago
  6. ce6a913 Exclusive exec() path, format after partition. by Jeff Sharkey · 9 years ago
  7. 9c48498 Support for private (adopted) volumes. by Jeff Sharkey · 9 years ago
  8. 36801cc Progress towards dynamic storage support. by Jeff Sharkey · 9 years ago
  9. 2a8c109 am 8a0fde27: am e9623fed: Merge "Fixed type mismatch for ioctl(BLKGETSIZE)" by Elliott Hughes · 9 years ago
  10. 14eab55 Fixed type mismatch for ioctl(BLKGETSIZE) by Hiroaki Miyazawa · 10 years ago
  11. 8175a0b Adding e4crypt support by Paul Lawrence · 9 years ago
  12. 05335c3 Adding e4crypt support by Paul Lawrence · 9 years ago
  13. 47bc0ff am 5054f7ee: Merge "Rename keymaster_device_t to keymaster0_device_t." by Shawn Willden · 9 years ago
  14. 8af3335 Rename keymaster_device_t to keymaster0_device_t. by Shawn Willden · 9 years ago
  15. d1fd846 Rename keymaster_device_t to keymaster0_device_t. by Shawn Willden · 9 years ago
  16. 933216c crytpfs: fix clobbering of crypto info on keymaster failure by JP Abgrall · 9 years ago
  17. d32b75e am 33b6de4b: am d55d8dac: Merge "prevent ioctl_init() to write outside buffer" by Elliott Hughes · 9 years ago
  18. a655b9a am 38394c7d: am 223fd1ca: Revert "Make encryption configurable" by Paul Lawrence · 9 years ago
  19. 33b6de4 am d55d8dac: Merge "prevent ioctl_init() to write outside buffer" by Elliott Hughes · 9 years ago
  20. d55d8da Merge "prevent ioctl_init() to write outside buffer" by Elliott Hughes · 9 years ago
  21. 38394c7 am 223fd1ca: Revert "Make encryption configurable" by Paul Lawrence · 9 years ago
  22. 223fd1c Revert "Make encryption configurable" by Paul Lawrence · 9 years ago
  23. 5e6b914 prevent ioctl_init() to write outside buffer by Marek Pola · 9 years ago
  24. efb4c6d am 71f8d86f: am f805a8b3: Merge "Change lseek to lseek64" by Elliott Hughes · 9 years ago
  25. 71f8d86 am f805a8b3: Merge "Change lseek to lseek64" by Elliott Hughes · 9 years ago
  26. 394cd68 am e22b21af: am ebc83b3e: Merge "Fix memory leak in upgrade_crypt_ftr" by Elliott Hughes · 9 years ago
  27. e22b21a am ebc83b3e: Merge "Fix memory leak in upgrade_crypt_ftr" by Elliott Hughes · 9 years ago
  28. f805a8b Merge "Change lseek to lseek64" by Elliott Hughes · 9 years ago
  29. ebc83b3 Merge "Fix memory leak in upgrade_crypt_ftr" by Elliott Hughes · 9 years ago
  30. 96dbee7 Change lseek to lseek64 by Björn Landström · 10 years ago
  31. 9106463 Fix memory leak in upgrade_crypt_ftr by Henrik Baard · 9 years ago
  32. db3730c Remove kdfs that were only used internally in LMP by Paul Lawrence · 10 years ago
  33. c19cb9c Make encryption configurable by Paul Lawrence · 10 years ago
  34. 4a36ca0 am 6a69cfc4: Make encryption configurable by Paul Lawrence · 10 years ago
  35. ba5834d am 26970299: Merge "Remove superfluous OpenSSL include paths." by Kenny Root · 10 years ago
  36. 41405bb Remove superfluous OpenSSL include paths. by Adam Langley · 10 years ago
  37. 6a69cfc Make encryption configurable by Paul Lawrence · 10 years ago
  38. da91b19 Remove unused local variable to fix the build by Brian Carlstrom · 10 years ago
  39. 210caab resolved conflicts for merge of 88aba541 to lmp-mr1-dev-plus-aosp by Dan Albert · 10 years ago
  40. c07fa3f Fix alignment of buffer used for dm_ioctl. by Dan Albert · 10 years ago
  41. 6c78e7d resolved conflicts for merge of 4be36106 to lmp-mr1-dev-plus-aosp by Tim Murray · 10 years ago
  42. 8439dc9 Make vold compile with -Werror -Wall. by Tim Murray · 10 years ago
  43. 6322302 am acfdc30e: Merge "Fix error in clocks leading to devices staying unlocked" into lmp-mr1-dev by Paul Lawrence · 10 years ago
  44. 82b451d am d44a8f59: Merge "Fix encrypt-and-wipe" into lmp-mr1-dev by Paul Lawrence · 10 years ago
  45. acfdc30 Merge "Fix error in clocks leading to devices staying unlocked" into lmp-mr1-dev by Paul Lawrence · 10 years ago
  46. ef2b5be Fix error in clocks leading to devices staying unlocked by Paul Lawrence · 10 years ago
  47. b1eb7a0 Fix encrypt-and-wipe by Paul Lawrence · 10 years ago
  48. c9c5171 am bb7d9afe: fall back to dm-crypt if device already encrypted by Iliyan Malchev · 10 years ago
  49. b7d3511 resolved conflicts for merge of 87701e27 to lmp-mr1-dev-plus-aosp by Iliyan Malchev · 10 years ago
  50. bb7d9af fall back to dm-crypt if device already encrypted by Iliyan Malchev · 10 years ago
  51. 87701e2 Adding support of dm-req-crypt by Ajay Dudani · 10 years ago
  52. b4be741 Modify vold to check for hardware keymaster. automerge: 7c49ab0 by Shawn Willden · 10 years ago
  53. 7c49ab0 Modify vold to check for hardware keymaster. by Shawn Willden · 10 years ago
  54. 84f2515 Merge "Make persistent field in cryptofs support longer values." into lmp-mr1-dev by Rubin Xu · 10 years ago
  55. 85c01f9 Make persistent field in cryptofs support longer values. by Rubin Xu · 10 years ago
  56. 9b5a381 cryptfs: [HACK] reboot if the crypto block dev failed to open automerge: 512f0d5 by JP Abgrall · 10 years ago
  57. 4c9b4d8 am 7776871d: cryptfs: extra debugging around crypto blockdev dm-... errors. by JP Abgrall · 10 years ago
  58. 512f0d5 cryptfs: [HACK] reboot if the crypto block dev failed to open by JP Abgrall · 10 years ago
  59. ca42022 am 7fc1de8a: cryptfs: [HACK] reboot if the crypto block dev failed to open by JP Abgrall · 10 years ago
  60. 0327917 am 3334c6a1: cryptfs: extra debugging around crypto blockdev dm-... errors. by JP Abgrall · 10 years ago
  61. 7fc1de8 cryptfs: [HACK] reboot if the crypto block dev failed to open by JP Abgrall · 10 years ago
  62. 3334c6a cryptfs: extra debugging around crypto blockdev dm-... errors. by JP Abgrall · 10 years ago
  63. 7776871 cryptfs: extra debugging around crypto blockdev dm-... errors. by JP Abgrall · 10 years ago
  64. 2e83bfa am fc615041: Remove possibility of zero chars from passwords by Paul Lawrence · 10 years ago
  65. fd2180a am fc615041: Remove possibility of zero chars from passwords by Paul Lawrence · 10 years ago
  66. fc61504 Remove possibility of zero chars from passwords by Paul Lawrence · 10 years ago
  67. 4465744 am 7639a6ab: Merge "Reset failed decryption count on successful decryptions" into lmp-dev by Paul Lawrence · 10 years ago
  68. 6bcac81 am 7639a6ab: Merge "Reset failed decryption count on successful decryptions" into lmp-dev by Paul Lawrence · 10 years ago
  69. 7639a6a Merge "Reset failed decryption count on successful decryptions" into lmp-dev by Paul Lawrence · 10 years ago
  70. 72b8b82 Reset failed decryption count on successful decryptions by Paul Lawrence · 10 years ago
  71. 72498ed am 6e8440fd: cryptfs: kill processes with open files on tmpfs /data by Greg Hackmann · 10 years ago
  72. 17fb62c am 9c58a871: Use monotonic clock for cryptfs progress by Paul Lawrence · 10 years ago
  73. b69a5e4 am 6e8440fd: cryptfs: kill processes with open files on tmpfs /data by Greg Hackmann · 10 years ago
  74. 6e8440f cryptfs: kill processes with open files on tmpfs /data by Greg Hackmann · 10 years ago
  75. f2eabef am 9c58a871: Use monotonic clock for cryptfs progress by Paul Lawrence · 10 years ago
  76. 9c58a87 Use monotonic clock for cryptfs progress by Paul Lawrence · 10 years ago
  77. fd8d08c am 3574b085: Merge "cryptfs: log umount() failure reason" into lmp-dev by Greg Hackmann · 10 years ago
  78. 7103f41 am 46a3a79a: Merge "print information about opened files when failed unmount" into lmp-dev by Greg Hackmann · 10 years ago
  79. 7145264 am dd1a8040: Include reason when wiping data. by Jeff Sharkey · 10 years ago
  80. e46f712 am 3574b085: Merge "cryptfs: log umount() failure reason" into lmp-dev by Greg Hackmann · 10 years ago
  81. e2a470f am 46a3a79a: Merge "print information about opened files when failed unmount" into lmp-dev by Greg Hackmann · 10 years ago
  82. 640aa86 am dd1a8040: Include reason when wiping data. by Jeff Sharkey · 10 years ago
  83. 3574b08 Merge "cryptfs: log umount() failure reason" into lmp-dev by Greg Hackmann · 10 years ago
  84. 46a3a79 Merge "print information about opened files when failed unmount" into lmp-dev by Greg Hackmann · 10 years ago
  85. 955653e cryptfs: log umount() failure reason by Greg Hackmann · 10 years ago
  86. 3f14fe4 print information about opened files when failed unmount by jessica_yu · 10 years ago
  87. dd1a804 Include reason when wiping data. by Jeff Sharkey · 10 years ago
  88. c48387c am 3846be17: Reduce cryptfs logspam by Paul Lawrence · 10 years ago
  89. 7df812d am 3846be17: Reduce cryptfs logspam by Paul Lawrence · 10 years ago
  90. 3846be1 Reduce cryptfs logspam by Paul Lawrence · 10 years ago
  91. 2f61b41 am 6efa9351: Merge "Don\'t use deprecated OpenSSL functions." by Alex Klyubin · 10 years ago
  92. b707d72 am 6efa9351: Merge "Don\'t use deprecated OpenSSL functions." by Alex Klyubin · 10 years ago
  93. 8e3f451 HACK: Retry/reboot when mount reports busy. by Paul Lawrence · 10 years ago
  94. e17a9c4 Change cryptfs keymaster padding to ensure the high bit is never 1, by Shawn Willden · 10 years ago
  95. b2f682b Fix Shamus bricked by encryption upgrade by Paul Lawrence · 10 years ago
  96. 889c4f1 Don't use deprecated OpenSSL functions. by Adam Langley · 10 years ago
  97. 47ba10d Pad object to proper size before signing. by Shawn Willden · 10 years ago
  98. 74f29f1 Don't test mount when we can use the crypto footer to test the password by Paul Lawrence · 10 years ago
  99. 0078607 Merge "Don't reboot after default encrypting" into lmp-dev by Paul Lawrence · 10 years ago
  100. 7157750 Show correct remaining time by Paul Lawrence · 10 years ago