mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-08-07 06:42:56 +03:00
Merged refactored x509write module into development
This commit is contained in:
@@ -1,27 +1,27 @@
|
||||
Certificate Request check Server1 SHA1
|
||||
depends_on:POLARSSL_SHA1_C
|
||||
x509_cert_req_check:"data_files/server1.key":POLARSSL_MD_SHA1:"data_files/server1.req.sha1"
|
||||
x509_csr_check:"data_files/server1.key":POLARSSL_MD_SHA1:"data_files/server1.req.sha1"
|
||||
|
||||
Certificate Request check Server1 SHA224
|
||||
depends_on:POLARSSL_SHA256_C
|
||||
x509_cert_req_check:"data_files/server1.key":POLARSSL_MD_SHA224:"data_files/server1.req.sha224"
|
||||
x509_csr_check:"data_files/server1.key":POLARSSL_MD_SHA224:"data_files/server1.req.sha224"
|
||||
|
||||
Certificate Request check Server1 SHA256
|
||||
depends_on:POLARSSL_SHA256_C
|
||||
x509_cert_req_check:"data_files/server1.key":POLARSSL_MD_SHA256:"data_files/server1.req.sha256"
|
||||
x509_csr_check:"data_files/server1.key":POLARSSL_MD_SHA256:"data_files/server1.req.sha256"
|
||||
|
||||
Certificate Request check Server1 SHA384
|
||||
depends_on:POLARSSL_SHA512_C
|
||||
x509_cert_req_check:"data_files/server1.key":POLARSSL_MD_SHA384:"data_files/server1.req.sha384"
|
||||
x509_csr_check:"data_files/server1.key":POLARSSL_MD_SHA384:"data_files/server1.req.sha384"
|
||||
|
||||
Certificate Request check Server1 SHA512
|
||||
depends_on:POLARSSL_SHA512_C
|
||||
x509_cert_req_check:"data_files/server1.key":POLARSSL_MD_SHA512:"data_files/server1.req.sha512"
|
||||
x509_csr_check:"data_files/server1.key":POLARSSL_MD_SHA512:"data_files/server1.req.sha512"
|
||||
|
||||
Certificate Request check Server1 MD4
|
||||
depends_on:POLARSSL_MD4_C
|
||||
x509_cert_req_check:"data_files/server1.key":POLARSSL_MD_MD4:"data_files/server1.req.md4"
|
||||
x509_csr_check:"data_files/server1.key":POLARSSL_MD_MD4:"data_files/server1.req.md4"
|
||||
|
||||
Certificate Request check Server1 MD5
|
||||
depends_on:POLARSSL_MD5_C
|
||||
x509_cert_req_check:"data_files/server1.key":POLARSSL_MD_MD5:"data_files/server1.req.md5"
|
||||
x509_csr_check:"data_files/server1.key":POLARSSL_MD_MD5:"data_files/server1.req.md5"
|
||||
|
@@ -11,36 +11,19 @@
|
||||
*/
|
||||
|
||||
/* BEGIN_CASE */
|
||||
void x509_cert_req_check( char *key_file, int md_type,
|
||||
void x509_csr_check( char *key_file, int md_type,
|
||||
char *cert_req_check_file )
|
||||
{
|
||||
rsa_context rsa;
|
||||
pem_context pem;
|
||||
x509_req_name req_name, *cur;
|
||||
x509_csr req;
|
||||
unsigned char *c;
|
||||
unsigned char buf[4000];
|
||||
unsigned char check_buf[4000];
|
||||
int ret;
|
||||
size_t olen = 2000;
|
||||
FILE *f;
|
||||
|
||||
cur = &req_name;
|
||||
|
||||
memset( cur, 0, sizeof(x509_req_name) );
|
||||
strcpy( cur->oid, OID_AT_CN );
|
||||
strcpy( cur->name, "PolarSSL Server 1" );
|
||||
cur->next = malloc( sizeof(x509_req_name) );
|
||||
cur = cur->next;
|
||||
|
||||
memset( cur, 0, sizeof(x509_req_name) );
|
||||
strcpy( cur->oid, OID_AT_ORGANIZATION );
|
||||
strcpy( cur->name, "PolarSSL" );
|
||||
cur->next = malloc( sizeof(x509_req_name) );
|
||||
cur = cur->next;
|
||||
|
||||
memset( cur, 0, sizeof(x509_req_name) );
|
||||
strcpy( cur->oid, OID_AT_COUNTRY );
|
||||
strcpy( cur->name, "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 );
|
||||
@@ -48,7 +31,12 @@ void x509_cert_req_check( char *key_file, int md_type,
|
||||
if( ret != 0 )
|
||||
return;
|
||||
|
||||
ret = x509_write_cert_req( buf, 4000, &rsa, &req_name, md_type );
|
||||
x509write_csr_init( &req );
|
||||
x509write_csr_set_md_alg( &req, md_type );
|
||||
x509write_csr_set_rsa_key( &req, &rsa );
|
||||
TEST_ASSERT( x509write_csr_set_subject_name( &req, subject_name ) == 0 );
|
||||
|
||||
ret = x509write_csr_der( &req, buf, 4000 );
|
||||
TEST_ASSERT( ret >= 0 );
|
||||
|
||||
c = buf + 3999 - ret;
|
||||
@@ -64,12 +52,7 @@ void x509_cert_req_check( char *key_file, int md_type,
|
||||
TEST_ASSERT( memcmp( c, pem.buf, pem.buflen ) == 0 );
|
||||
TEST_ASSERT( pem.buflen == (size_t) ret );
|
||||
|
||||
while( ( cur = req_name.next ) != NULL )
|
||||
{
|
||||
req_name.next = cur->next;
|
||||
free( cur );
|
||||
}
|
||||
|
||||
x509write_csr_free( &req );
|
||||
rsa_free( &rsa );
|
||||
pem_free( &pem );
|
||||
}
|
||||
|
Reference in New Issue
Block a user