replace rsa_import_radix() by rsa_set_{key,factors,crt_params}()
This commit is contained in:
Steffen Jaeckel
parent
05e9f0ee79
commit
6b798ca6a6
@ -126,7 +126,18 @@ 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 void *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_set_key(const unsigned char *N, unsigned long Nlen,
|
||||||
|
const unsigned char *e, unsigned long elen,
|
||||||
|
const unsigned char *d, unsigned long dlen, /* is NULL for public keys */
|
||||||
|
rsa_key *key);
|
||||||
|
int rsa_set_factors(const unsigned char *p, unsigned long plen,
|
||||||
|
const unsigned char *q, unsigned long qlen,
|
||||||
|
rsa_key *key);
|
||||||
|
int rsa_set_crt_params(const unsigned char *dP, unsigned long dPlen,
|
||||||
|
const unsigned char *dQ, unsigned long dQlen,
|
||||||
|
const unsigned char *qP, unsigned long qPlen,
|
||||||
|
rsa_key *key);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* ---- Katja ---- */
|
/* ---- Katja ---- */
|
||||||
|
|||||||
@ -1,66 +0,0 @@
|
|||||||
/* LibTomCrypt, modular cryptographic library -- Tom St Denis
|
|
||||||
*
|
|
||||||
* LibTomCrypt is a library that provides various cryptographic
|
|
||||||
* algorithms in a highly modular and flexible manner.
|
|
||||||
*
|
|
||||||
* The library is free for all purposes without any express
|
|
||||||
* guarantee it works.
|
|
||||||
*/
|
|
||||||
#include "tomcrypt.h"
|
|
||||||
|
|
||||||
/**
|
|
||||||
Import RSA public or private key from raw numbers
|
|
||||||
@param radix the radix the numbers are represented in (2-64, 16 = hexadecimal)
|
|
||||||
@param N RSA's N in radix representation
|
|
||||||
@param e RSA's e in radix representation
|
|
||||||
@param d RSA's d in radix representation (only private key, NULL for public key)
|
|
||||||
@param p RSA's p in radix representation (only private key, NULL for public key)
|
|
||||||
@param q RSA's q in radix representation (only private key, NULL for public key)
|
|
||||||
@param dP RSA's dP in radix representation (only private key, NULL for public key)
|
|
||||||
@param dQ RSA's dQ in radix representation (only private key, NULL for public key)
|
|
||||||
@param qP RSA's qP in radix representation (only private key, NULL for public key)
|
|
||||||
@param key [out] the destination for the imported key
|
|
||||||
@return CRYPT_OK if successful, upon error allocated memory is freed
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef LTC_MRSA
|
|
||||||
|
|
||||||
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 err;
|
|
||||||
|
|
||||||
LTC_ARGCHK(key != NULL);
|
|
||||||
LTC_ARGCHK(N != NULL);
|
|
||||||
LTC_ARGCHK(e != NULL);
|
|
||||||
LTC_ARGCHK(ltc_mp.name != NULL);
|
|
||||||
|
|
||||||
err = mp_init_multi(&key->e, &key->d, &key->N, &key->dQ, &key->dP, &key->qP, &key->p, &key->q, NULL);
|
|
||||||
if (err != CRYPT_OK) return err;
|
|
||||||
|
|
||||||
if ((err = mp_read_radix(key->N , N , radix)) != CRYPT_OK) { goto LBL_ERR; }
|
|
||||||
if ((err = mp_read_radix(key->e , e , radix)) != CRYPT_OK) { goto LBL_ERR; }
|
|
||||||
if (d && p && q && dP && dQ && qP && strlen(d)>0 && strlen(p)>0 &&
|
|
||||||
strlen(q)>0 && strlen(dP)>0 && strlen(dQ)>0 && strlen(qP)>0) {
|
|
||||||
if ((err = mp_read_radix(key->d , d , radix)) != CRYPT_OK) { goto LBL_ERR; }
|
|
||||||
if ((err = mp_read_radix(key->p , p , radix)) != CRYPT_OK) { goto LBL_ERR; }
|
|
||||||
if ((err = mp_read_radix(key->q , q , radix)) != CRYPT_OK) { goto LBL_ERR; }
|
|
||||||
if ((err = mp_read_radix(key->dP, dP, radix)) != CRYPT_OK) { goto LBL_ERR; }
|
|
||||||
if ((err = mp_read_radix(key->dQ, dQ, radix)) != CRYPT_OK) { goto LBL_ERR; }
|
|
||||||
if ((err = mp_read_radix(key->qP, qP, radix)) != CRYPT_OK) { goto LBL_ERR; }
|
|
||||||
key->type = PK_PRIVATE;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
key->type = PK_PUBLIC;
|
|
||||||
}
|
|
||||||
return CRYPT_OK;
|
|
||||||
|
|
||||||
LBL_ERR:
|
|
||||||
mp_clear_multi(key->d, key->e, key->N, key->dQ, key->dP, key->qP, key->p, key->q, NULL);
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* LTC_MRSA */
|
|
||||||
|
|
||||||
/* ref: $Format:%D$ */
|
|
||||||
/* git commit: $Format:%H$ */
|
|
||||||
/* commit time: $Format:%ai$ */
|
|
||||||
134
src/pk/rsa/rsa_set.c
Executable file
134
src/pk/rsa/rsa_set.c
Executable file
@ -0,0 +1,134 @@
|
|||||||
|
/* LibTomCrypt, modular cryptographic library -- Tom St Denis
|
||||||
|
*
|
||||||
|
* LibTomCrypt is a library that provides various cryptographic
|
||||||
|
* algorithms in a highly modular and flexible manner.
|
||||||
|
*
|
||||||
|
* The library is free for all purposes without any express
|
||||||
|
* guarantee it works.
|
||||||
|
*/
|
||||||
|
#include "tomcrypt.h"
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef LTC_MRSA
|
||||||
|
|
||||||
|
/**
|
||||||
|
Import RSA key from raw numbers
|
||||||
|
|
||||||
|
@param N RSA's N
|
||||||
|
@param Nlen RSA's N's length
|
||||||
|
@param e RSA's e
|
||||||
|
@param elen RSA's e's length
|
||||||
|
@param d RSA's d (only private key, NULL for public key)
|
||||||
|
@param dlen RSA's d's length
|
||||||
|
@param key [out] the destination for the imported key
|
||||||
|
@return CRYPT_OK if successful
|
||||||
|
*/
|
||||||
|
int rsa_set_key(const unsigned char *N, unsigned long Nlen,
|
||||||
|
const unsigned char *e, unsigned long elen,
|
||||||
|
const unsigned char *d, unsigned long dlen, /* is NULL for public keys */
|
||||||
|
rsa_key *key)
|
||||||
|
{
|
||||||
|
int err;
|
||||||
|
|
||||||
|
LTC_ARGCHK(key != NULL);
|
||||||
|
LTC_ARGCHK(N != NULL);
|
||||||
|
LTC_ARGCHK(e != NULL);
|
||||||
|
LTC_ARGCHK(ltc_mp.name != NULL);
|
||||||
|
|
||||||
|
err = mp_init_multi(&key->e, &key->d, &key->N, &key->dQ, &key->dP, &key->qP, &key->p, &key->q, NULL);
|
||||||
|
if (err != CRYPT_OK) return err;
|
||||||
|
|
||||||
|
if ((err = mp_read_unsigned_bin(key->N , (unsigned char *)N , Nlen)) != CRYPT_OK) { goto LBL_ERR; }
|
||||||
|
if ((err = mp_read_unsigned_bin(key->e , (unsigned char *)e , elen)) != CRYPT_OK) { goto LBL_ERR; }
|
||||||
|
if (d && dlen) {
|
||||||
|
if ((err = mp_read_unsigned_bin(key->d , (unsigned char *)d , dlen)) != CRYPT_OK) { goto LBL_ERR; }
|
||||||
|
key->type = PK_PRIVATE;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
key->type = PK_PUBLIC;
|
||||||
|
}
|
||||||
|
return CRYPT_OK;
|
||||||
|
|
||||||
|
LBL_ERR:
|
||||||
|
rsa_free(key);
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
Import factors of an RSA key from raw numbers
|
||||||
|
|
||||||
|
Only for private keys.
|
||||||
|
|
||||||
|
@param p RSA's p
|
||||||
|
@param plen RSA's p's length
|
||||||
|
@param q RSA's q
|
||||||
|
@param qlen RSA's q's length
|
||||||
|
@param key [out] the destination for the imported key
|
||||||
|
@return CRYPT_OK if successful
|
||||||
|
*/
|
||||||
|
int rsa_set_factors(const unsigned char *p, unsigned long plen,
|
||||||
|
const unsigned char *q, unsigned long qlen,
|
||||||
|
rsa_key *key)
|
||||||
|
{
|
||||||
|
int err;
|
||||||
|
|
||||||
|
LTC_ARGCHK(key != NULL);
|
||||||
|
LTC_ARGCHK(p != NULL);
|
||||||
|
LTC_ARGCHK(q != NULL);
|
||||||
|
LTC_ARGCHK(ltc_mp.name != NULL);
|
||||||
|
|
||||||
|
if (key->type != PK_PRIVATE) return CRYPT_PK_TYPE_MISMATCH;
|
||||||
|
|
||||||
|
if ((err = mp_read_unsigned_bin(key->p , (unsigned char *)p , plen)) != CRYPT_OK) { goto LBL_ERR; }
|
||||||
|
if ((err = mp_read_unsigned_bin(key->q , (unsigned char *)q , qlen)) != CRYPT_OK) { goto LBL_ERR; }
|
||||||
|
return CRYPT_OK;
|
||||||
|
|
||||||
|
LBL_ERR:
|
||||||
|
rsa_free(key);
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
Import CRT parameters of an RSA key from raw numbers
|
||||||
|
|
||||||
|
Only for private keys.
|
||||||
|
|
||||||
|
@param dP RSA's dP
|
||||||
|
@param dPlen RSA's dP's length
|
||||||
|
@param dQ RSA's dQ
|
||||||
|
@param dQlen RSA's dQ's length
|
||||||
|
@param qP RSA's qP
|
||||||
|
@param qPlen RSA's qP's length
|
||||||
|
@param key [out] the destination for the imported key
|
||||||
|
@return CRYPT_OK if successful
|
||||||
|
*/
|
||||||
|
int rsa_set_crt_params(const unsigned char *dP, unsigned long dPlen,
|
||||||
|
const unsigned char *dQ, unsigned long dQlen,
|
||||||
|
const unsigned char *qP, unsigned long qPlen,
|
||||||
|
rsa_key *key)
|
||||||
|
{
|
||||||
|
int err;
|
||||||
|
|
||||||
|
LTC_ARGCHK(key != NULL);
|
||||||
|
LTC_ARGCHK(dP != NULL);
|
||||||
|
LTC_ARGCHK(dQ != NULL);
|
||||||
|
LTC_ARGCHK(qP != NULL);
|
||||||
|
LTC_ARGCHK(ltc_mp.name != NULL);
|
||||||
|
|
||||||
|
if (key->type != PK_PRIVATE) return CRYPT_PK_TYPE_MISMATCH;
|
||||||
|
|
||||||
|
if ((err = mp_read_unsigned_bin(key->dP, (unsigned char *)dP, dPlen)) != CRYPT_OK) { goto LBL_ERR; }
|
||||||
|
if ((err = mp_read_unsigned_bin(key->dQ, (unsigned char *)dQ, dQlen)) != CRYPT_OK) { goto LBL_ERR; }
|
||||||
|
if ((err = mp_read_unsigned_bin(key->qP, (unsigned char *)qP, qPlen)) != CRYPT_OK) { goto LBL_ERR; }
|
||||||
|
return CRYPT_OK;
|
||||||
|
|
||||||
|
LBL_ERR:
|
||||||
|
rsa_free(key);
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* LTC_MRSA */
|
||||||
|
|
||||||
|
/* ref: $Format:%D$ */
|
||||||
|
/* git commit: $Format:%H$ */
|
||||||
|
/* commit time: $Format:%ai$ */
|
||||||
Loading…
x
Reference in New Issue
Block a user