The initial return of type tuple [KeyData, unwrapped_key] is replaced by
returning just the KeyData object. The unwrapped key will be set as
attribute 'private_data' of the KeyData object.
Please review the attached patch with the above mentioned changes.
--Abhishek