Suyu/mbedtls
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/mbedtls.git synced 2026-01-07 23:18:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adapt x509write_csr prototypes for PK

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2013-09-11 22:48:40 +02:00 • committed by Paul Bakker
parent 8053da4057
commit ee73179b2f
5 changed files with 98 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

25
library/x509write.c
View file

@ -156,16 +156,9 @@ void x509write_csr_set_md_alg( x509write_csr *ctx, md_type_t md_alg )
ctx->md_alg = md_alg;
}
// TODO: take a pk_context
// TODO: return int
void x509write_csr_set_rsa_key( x509write_csr *ctx, rsa_context *rsa )
void x509write_csr_set_key( x509write_csr *ctx, pk_context *key )
{
// temporary
ctx->key = polarssl_malloc( sizeof( pk_context ) );
// TODO: check errors
pk_init_ctx( ctx->key, pk_info_from_type( POLARSSL_PK_RSA ) );
rsa_copy( pk_rsa( *ctx->key ), rsa );
ctx->key = key;
}
int x509write_csr_set_subject_name( x509write_csr *ctx, char *subject_name )
@ -698,7 +691,9 @@ static int x509_write_extensions( unsigned char **p, unsigned char *start,
return( len );
}
int x509write_csr_der( x509write_csr *ctx, unsigned char *buf, size_t size )
int x509write_csr_der( x509write_csr *ctx, unsigned char *buf, size_t size,
int (*f_rng)(void *, unsigned char *, size_t),
void *p_rng )
{
int ret;
const char *sig_oid;
@ -761,7 +756,7 @@ int x509write_csr_der( x509write_csr *ctx, unsigned char *buf, size_t size )
md( md_info_from_type( ctx->md_alg ), c, len, hash );
if( ( ret = pk_sign( ctx->key, ctx->md_alg, hash, 0, sig, &sig_len,
NULL, NULL ) ) != 0 ||
f_rng, p_rng ) ) != 0 ||
( ret = oid_get_oid_by_sig_alg( pk_get_type( ctx->key ), ctx->md_alg,
&sig_oid, &sig_oid_len ) ) != 0 )
{
@ -1006,13 +1001,15 @@ int x509write_key_pem( rsa_context *rsa, unsigned char *buf, size_t size )
return( 0 );
}
int x509write_csr_pem( x509write_csr *ctx, unsigned char *buf, size_t size )
int x509write_csr_pem( x509write_csr *ctx, unsigned char *buf, size_t size,
int (*f_rng)(void *, unsigned char *, size_t),
void *p_rng )
{
int ret;
unsigned char output_buf[4096];
if( ( ret = x509write_csr_der( ctx, output_buf,
sizeof(output_buf) ) ) < 0 )
if( ( ret = x509write_csr_der( ctx, output_buf, sizeof(output_buf),
f_rng, p_rng ) ) < 0 )
{
return( ret );
}