Move these to macros, the exact type of these functions changes by deifne
Merge pull request #139 from alex/pkcs12-fix

Move these to macros, the exact type of these functions changes by deifn...