TeaSpeak/tomcrypt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rsa_import_pkcs8 - passwd is now "const void *"

Browse Source
This commit is contained in:
Karel Miko 2017-04-04 09:14:57 +02:00 committed by Steffen Jaeckel
parent d96f4bdcff
commit 52a496e9e1
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/headers/tomcrypt_pk.h
View File

@ -109,7 +109,7 @@ int rsa_import(const unsigned char *in, unsigned long inlen, rsa_key *key);
int rsa_import_x509(const unsigned char *in, unsigned long inlen, rsa_key *key); int rsa_import_x509(const unsigned char *in, unsigned long inlen, rsa_key *key);
int rsa_import_pkcs8(const unsigned char *in, unsigned long inlen, int rsa_import_pkcs8(const unsigned char *in, unsigned long inlen,
const unsigned char *passwd, unsigned long passwdlen, rsa_key *key); const void *passwd, unsigned long passwdlen, rsa_key *key);
int rsa_import_radix(int radix, char *N, char *e, char *d, char *p, char *q, char *dP, char *dQ, char *qP, rsa_key *key); int rsa_import_radix(int radix, char *N, char *e, char *d, char *p, char *q, char *dP, char *dQ, char *qP, rsa_key *key);
#endif #endif

10
src/pk/rsa/rsa_import_pkcs8.c
View File

@ -42,13 +42,15 @@
/** /**
Import an RSAPublicKey or RSAPrivateKey in PKCS#8 format Import an RSAPublicKey or RSAPrivateKey in PKCS#8 format
@param in The packet to import from @param in The packet to import from
@param inlen It's length (octets) @param inlen It's length (octets)
@param key [out] Destination for newly imported key @param passwd The password for decrypting privkey (NOT SUPPORTED YET)
@param passwdlen Password's length (octets)
@param key [out] Destination for newly imported key
@return CRYPT_OK if successful, upon error allocated memory is freed @return CRYPT_OK if successful, upon error allocated memory is freed
*/ */
int rsa_import_pkcs8(const unsigned char *in, unsigned long inlen, int rsa_import_pkcs8(const unsigned char *in, unsigned long inlen,
const unsigned char *passwd, unsigned long passwdlen, const void *passwd, unsigned long passwdlen,
rsa_key *key) rsa_key *key)
{ {
int err; int err;