tree 49224ca4bf3eb5d94cab59ba4235cbf318eba166
parent 4cf3bf237a19d9f0351abb97543935c930c6cef3
parent d0315735fdc56aa7e57746c413fe9cb0eeedd352
author Treehugger Robot <treehugger-gerrit@google.com> 1547225949 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1547225949 +0000

Merge changes from topic "keystore-niap"

* changes:
  Increase the master key size to 256 bits
  Use vector to pass around keys
  Use SHA256 for 32 byte keys
  Replace Entropy with RAND_bytes