Merge change I70f91838

* changes:
  keystore: Add paddings before checksumming.