AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switched order of storing x509_req_names to match inputed order

Browse Source
This commit is contained in:
Paul Bakker 2013-08-25 10:33:27 +02:00
parent 8eabfc1461
commit 2130796658
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/x509write.c
View File

@ -76,7 +76,7 @@ int x509cert_req_set_subject_name( x509_cert_req *ctx, char *subject_name )
char *end = s + strlen( s );
char *oid = NULL;
int in_tag = 1;
x509_req_name *cur = ctx->subject;
x509_req_name *cur;
while( ctx->subject )
{
@ -121,15 +121,7 @@ int x509cert_req_set_subject_name( x509_cert_req *ctx, char *subject_name )
goto exit;
}
if( cur == NULL )
{
ctx->subject = cur = polarssl_malloc( sizeof(x509_req_name) );
}
else
{
cur->next = polarssl_malloc( sizeof(x509_req_name) );
cur = cur->next;
}
cur = polarssl_malloc( sizeof(x509_req_name) );
if( cur == NULL )
{
@ -139,6 +131,9 @@ int x509cert_req_set_subject_name( x509_cert_req *ctx, char *subject_name )
memset( cur, 0, sizeof(x509_req_name) );
cur->next = ctx->subject;
ctx->subject = cur;
strncpy( cur->oid, oid, strlen( oid ) );
strncpy( cur->name, s, c - s );

2
tests/suites/test_suite_x509write.function
View File

@ -23,7 +23,7 @@ void x509_cert_req_check( char *key_file, int md_type,
int ret;
size_t olen = 2000;
FILE *f;
char *subject_name = "CN=PolarSSL Server 1,O=PolarSSL,C=NL";
char *subject_name = "C=NL,O=PolarSSL,CN=PolarSSL Server 1";
memset( &rsa, 0, sizeof(rsa_context) );
ret = x509parse_keyfile_rsa( &rsa, key_file, NULL );