Fix up some issues with _crypto_rfc3961 found in review

Change-Id: I522f8baca15ab5eab87e1ee216d976e395e8012b