Update for R16 crypto changes.
Merge pull request #57 from project-fifo/r16

Update for R16 crypto changes.