mirror of
				https://github.com/cuberite/polarssl.git
				synced 2025-10-30 19:20:40 -04:00 
			
		
		
		
	Adapt x509write_crt.c to coding style
Avoid lines longer than 80 characters and fix indentation.
This commit is contained in:
		
							parent
							
								
									75d9a333ce
								
							
						
					
					
						commit
						6ad3fd105c
					
				| @ -64,39 +64,44 @@ void mbedtls_x509write_crt_free( mbedtls_x509write_cert *ctx ) | ||||
|     mbedtls_platform_zeroize( ctx, sizeof( mbedtls_x509write_cert ) ); | ||||
| } | ||||
| 
 | ||||
| void mbedtls_x509write_crt_set_version( mbedtls_x509write_cert *ctx, int version ) | ||||
| void mbedtls_x509write_crt_set_version( mbedtls_x509write_cert *ctx, | ||||
|                                         int version ) | ||||
| { | ||||
|     ctx->version = version; | ||||
| } | ||||
| 
 | ||||
| void mbedtls_x509write_crt_set_md_alg( mbedtls_x509write_cert *ctx, mbedtls_md_type_t md_alg ) | ||||
| void mbedtls_x509write_crt_set_md_alg( mbedtls_x509write_cert *ctx, | ||||
|                                        mbedtls_md_type_t md_alg ) | ||||
| { | ||||
|     ctx->md_alg = md_alg; | ||||
| } | ||||
| 
 | ||||
| void mbedtls_x509write_crt_set_subject_key( mbedtls_x509write_cert *ctx, mbedtls_pk_context *key ) | ||||
| void mbedtls_x509write_crt_set_subject_key( mbedtls_x509write_cert *ctx, | ||||
|                                             mbedtls_pk_context *key ) | ||||
| { | ||||
|     ctx->subject_key = key; | ||||
| } | ||||
| 
 | ||||
| void mbedtls_x509write_crt_set_issuer_key( mbedtls_x509write_cert *ctx, mbedtls_pk_context *key ) | ||||
| void mbedtls_x509write_crt_set_issuer_key( mbedtls_x509write_cert *ctx, | ||||
|                                            mbedtls_pk_context *key ) | ||||
| { | ||||
|     ctx->issuer_key = key; | ||||
| } | ||||
| 
 | ||||
| int mbedtls_x509write_crt_set_subject_name( mbedtls_x509write_cert *ctx, | ||||
|                                     const char *subject_name ) | ||||
|                                             const char *subject_name ) | ||||
| { | ||||
|     return mbedtls_x509_string_to_names( &ctx->subject, subject_name ); | ||||
| } | ||||
| 
 | ||||
| int mbedtls_x509write_crt_set_issuer_name( mbedtls_x509write_cert *ctx, | ||||
|                                    const char *issuer_name ) | ||||
|                                            const char *issuer_name ) | ||||
| { | ||||
|     return mbedtls_x509_string_to_names( &ctx->issuer, issuer_name ); | ||||
| } | ||||
| 
 | ||||
| int mbedtls_x509write_crt_set_serial( mbedtls_x509write_cert *ctx, const mbedtls_mpi *serial ) | ||||
| int mbedtls_x509write_crt_set_serial( mbedtls_x509write_cert *ctx, | ||||
|                                       const mbedtls_mpi *serial ) | ||||
| { | ||||
|     int ret; | ||||
| 
 | ||||
| @ -106,8 +111,9 @@ int mbedtls_x509write_crt_set_serial( mbedtls_x509write_cert *ctx, const mbedtls | ||||
|     return( 0 ); | ||||
| } | ||||
| 
 | ||||
| int mbedtls_x509write_crt_set_validity( mbedtls_x509write_cert *ctx, const char *not_before, | ||||
|                                 const char *not_after ) | ||||
| int mbedtls_x509write_crt_set_validity( mbedtls_x509write_cert *ctx, | ||||
|                                         const char *not_before, | ||||
|                                         const char *not_after ) | ||||
| { | ||||
|     if( strlen( not_before ) != MBEDTLS_X509_RFC5280_UTC_TIME_LEN - 1 || | ||||
|         strlen( not_after )  != MBEDTLS_X509_RFC5280_UTC_TIME_LEN - 1 ) | ||||
| @ -127,12 +133,12 @@ int mbedtls_x509write_crt_set_extension( mbedtls_x509write_cert *ctx, | ||||
|                                  int critical, | ||||
|                                  const unsigned char *val, size_t val_len ) | ||||
| { | ||||
|     return mbedtls_x509_set_extension( &ctx->extensions, oid, oid_len, | ||||
|                                critical, val, val_len ); | ||||
|     return( mbedtls_x509_set_extension( &ctx->extensions, oid, oid_len, | ||||
|                                         critical, val, val_len ) ); | ||||
| } | ||||
| 
 | ||||
| int mbedtls_x509write_crt_set_basic_constraints( mbedtls_x509write_cert *ctx, | ||||
|                                          int is_ca, int max_pathlen ) | ||||
|                                                  int is_ca, int max_pathlen ) | ||||
| { | ||||
|     int ret; | ||||
|     unsigned char buf[9]; | ||||
| @ -148,18 +154,21 @@ int mbedtls_x509write_crt_set_basic_constraints( mbedtls_x509write_cert *ctx, | ||||
|     { | ||||
|         if( max_pathlen >= 0 ) | ||||
|         { | ||||
|             MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_int( &c, buf, max_pathlen ) ); | ||||
|             MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_int( &c, buf, | ||||
|                                                                max_pathlen ) ); | ||||
|         } | ||||
|         MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_bool( &c, buf, 1 ) ); | ||||
|     } | ||||
| 
 | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, buf, len ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, buf, MBEDTLS_ASN1_CONSTRUCTED | | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, buf, | ||||
|                                                 MBEDTLS_ASN1_CONSTRUCTED | | ||||
|                                                 MBEDTLS_ASN1_SEQUENCE ) ); | ||||
| 
 | ||||
|     return mbedtls_x509write_crt_set_extension( ctx, MBEDTLS_OID_BASIC_CONSTRAINTS, | ||||
|                                         MBEDTLS_OID_SIZE( MBEDTLS_OID_BASIC_CONSTRAINTS ), | ||||
|                                         0, buf + sizeof(buf) - len, len ); | ||||
|     return( | ||||
|         mbedtls_x509write_crt_set_extension( ctx, MBEDTLS_OID_BASIC_CONSTRAINTS, | ||||
|                              MBEDTLS_OID_SIZE( MBEDTLS_OID_BASIC_CONSTRAINTS ), | ||||
|                              0, buf + sizeof(buf) - len, len ) ); | ||||
| } | ||||
| 
 | ||||
| #if defined(MBEDTLS_SHA1_C) | ||||
| @ -171,7 +180,8 @@ int mbedtls_x509write_crt_set_subject_key_identifier( mbedtls_x509write_cert *ct | ||||
|     size_t len = 0; | ||||
| 
 | ||||
|     memset( buf, 0, sizeof(buf) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_pk_write_pubkey( &c, buf, ctx->subject_key ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, | ||||
|                 mbedtls_pk_write_pubkey( &c, buf, ctx->subject_key ) ); | ||||
| 
 | ||||
|     ret = mbedtls_sha1_ret( buf + sizeof( buf ) - len, len, | ||||
|                             buf + sizeof( buf ) - 20 ); | ||||
| @ -181,11 +191,13 @@ int mbedtls_x509write_crt_set_subject_key_identifier( mbedtls_x509write_cert *ct | ||||
|     len = 20; | ||||
| 
 | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, buf, len ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, buf, MBEDTLS_ASN1_OCTET_STRING ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, | ||||
|             mbedtls_asn1_write_tag( &c, buf, MBEDTLS_ASN1_OCTET_STRING ) ); | ||||
| 
 | ||||
|     return mbedtls_x509write_crt_set_extension( ctx, MBEDTLS_OID_SUBJECT_KEY_IDENTIFIER, | ||||
|                                         MBEDTLS_OID_SIZE( MBEDTLS_OID_SUBJECT_KEY_IDENTIFIER ), | ||||
|                                         0, buf + sizeof(buf) - len, len ); | ||||
|     return mbedtls_x509write_crt_set_extension( ctx, | ||||
|                  MBEDTLS_OID_SUBJECT_KEY_IDENTIFIER, | ||||
|                  MBEDTLS_OID_SIZE( MBEDTLS_OID_SUBJECT_KEY_IDENTIFIER ), | ||||
|                  0, buf + sizeof(buf) - len, len ); | ||||
| } | ||||
| 
 | ||||
| int mbedtls_x509write_crt_set_authority_key_identifier( mbedtls_x509write_cert *ctx ) | ||||
| @ -196,7 +208,8 @@ int mbedtls_x509write_crt_set_authority_key_identifier( mbedtls_x509write_cert * | ||||
|     size_t len = 0; | ||||
| 
 | ||||
|     memset( buf, 0, sizeof(buf) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_pk_write_pubkey( &c, buf, ctx->issuer_key ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, | ||||
|                           mbedtls_pk_write_pubkey( &c, buf, ctx->issuer_key ) ); | ||||
| 
 | ||||
|     ret = mbedtls_sha1_ret( buf + sizeof( buf ) - len, len, | ||||
|                             buf + sizeof( buf ) - 20 ); | ||||
| @ -206,15 +219,19 @@ int mbedtls_x509write_crt_set_authority_key_identifier( mbedtls_x509write_cert * | ||||
|     len = 20; | ||||
| 
 | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, buf, len ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, buf, MBEDTLS_ASN1_CONTEXT_SPECIFIC | 0 ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, | ||||
|         mbedtls_asn1_write_tag( &c, buf, MBEDTLS_ASN1_CONTEXT_SPECIFIC | 0 ) ); | ||||
| 
 | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, buf, len ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, buf, MBEDTLS_ASN1_CONSTRUCTED | | ||||
|                                                 MBEDTLS_ASN1_SEQUENCE ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, | ||||
|                           mbedtls_asn1_write_tag( &c, buf, | ||||
|                                                   MBEDTLS_ASN1_CONSTRUCTED | | ||||
|                                                   MBEDTLS_ASN1_SEQUENCE ) ); | ||||
| 
 | ||||
|     return mbedtls_x509write_crt_set_extension( ctx, MBEDTLS_OID_AUTHORITY_KEY_IDENTIFIER, | ||||
|                                    MBEDTLS_OID_SIZE( MBEDTLS_OID_AUTHORITY_KEY_IDENTIFIER ), | ||||
|                                    0, buf + sizeof( buf ) - len, len ); | ||||
|     return mbedtls_x509write_crt_set_extension( | ||||
|         ctx, MBEDTLS_OID_AUTHORITY_KEY_IDENTIFIER, | ||||
|         MBEDTLS_OID_SIZE( MBEDTLS_OID_AUTHORITY_KEY_IDENTIFIER ), | ||||
|         0, buf + sizeof( buf ) - len, len ); | ||||
| } | ||||
| #endif /* MBEDTLS_SHA1_C */ | ||||
| 
 | ||||
| @ -249,8 +266,8 @@ int mbedtls_x509write_crt_set_key_usage( mbedtls_x509write_cert *ctx, | ||||
|         return( MBEDTLS_ERR_X509_INVALID_FORMAT ); | ||||
| 
 | ||||
|     ret = mbedtls_x509write_crt_set_extension( ctx, MBEDTLS_OID_KEY_USAGE, | ||||
|                                        MBEDTLS_OID_SIZE( MBEDTLS_OID_KEY_USAGE ), | ||||
|                                        1, c, (size_t)ret ); | ||||
|                                    MBEDTLS_OID_SIZE( MBEDTLS_OID_KEY_USAGE ), | ||||
|                                    1, c, (size_t)ret ); | ||||
|     if( ret != 0 ) | ||||
|         return( ret ); | ||||
| 
 | ||||
| @ -271,8 +288,8 @@ int mbedtls_x509write_crt_set_ns_cert_type( mbedtls_x509write_cert *ctx, | ||||
|         return( ret ); | ||||
| 
 | ||||
|     ret = mbedtls_x509write_crt_set_extension( ctx, MBEDTLS_OID_NS_CERT_TYPE, | ||||
|                                        MBEDTLS_OID_SIZE( MBEDTLS_OID_NS_CERT_TYPE ), | ||||
|                                        0, c, (size_t)ret ); | ||||
|                                    MBEDTLS_OID_SIZE( MBEDTLS_OID_NS_CERT_TYPE ), | ||||
|                                    0, c, (size_t)ret ); | ||||
|     if( ret != 0 ) | ||||
|         return( ret ); | ||||
| 
 | ||||
| @ -294,7 +311,8 @@ static int x509_write_time( unsigned char **p, unsigned char *start, | ||||
|                                              (const unsigned char *) t + 2, | ||||
|                                              size - 2 ) ); | ||||
|         MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) ); | ||||
|         MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_UTC_TIME ) ); | ||||
|         MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, | ||||
|                                              MBEDTLS_ASN1_UTC_TIME ) ); | ||||
|     } | ||||
|     else | ||||
|     { | ||||
| @ -302,15 +320,17 @@ static int x509_write_time( unsigned char **p, unsigned char *start, | ||||
|                                                   (const unsigned char *) t, | ||||
|                                                   size ) ); | ||||
|         MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) ); | ||||
|         MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_GENERALIZED_TIME ) ); | ||||
|         MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, | ||||
|                                              MBEDTLS_ASN1_GENERALIZED_TIME ) ); | ||||
|     } | ||||
| 
 | ||||
|     return( (int) len ); | ||||
| } | ||||
| 
 | ||||
| int mbedtls_x509write_crt_der( mbedtls_x509write_cert *ctx, unsigned char *buf, size_t size, | ||||
|                        int (*f_rng)(void *, unsigned char *, size_t), | ||||
|                        void *p_rng ) | ||||
| int mbedtls_x509write_crt_der( mbedtls_x509write_cert *ctx, | ||||
|                                unsigned char *buf, size_t size, | ||||
|                                int (*f_rng)(void *, unsigned char *, size_t), | ||||
|                                void *p_rng ) | ||||
| { | ||||
|     int ret; | ||||
|     const char *sig_oid; | ||||
| @ -352,27 +372,36 @@ int mbedtls_x509write_crt_der( mbedtls_x509write_cert *ctx, unsigned char *buf, | ||||
|     /* Only for v3 */ | ||||
|     if( ctx->version == MBEDTLS_X509_CRT_VERSION_3 ) | ||||
|     { | ||||
|         MBEDTLS_ASN1_CHK_ADD( len, mbedtls_x509_write_extensions( &c, tmp_buf, ctx->extensions ) ); | ||||
|         MBEDTLS_ASN1_CHK_ADD( len, | ||||
|                               mbedtls_x509_write_extensions( &c, | ||||
|                                                   tmp_buf, ctx->extensions ) ); | ||||
|         MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, tmp_buf, len ) ); | ||||
|         MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, tmp_buf, MBEDTLS_ASN1_CONSTRUCTED | | ||||
|                                                            MBEDTLS_ASN1_SEQUENCE ) ); | ||||
|         MBEDTLS_ASN1_CHK_ADD( len, | ||||
|                               mbedtls_asn1_write_tag( &c, tmp_buf, | ||||
|                                                       MBEDTLS_ASN1_CONSTRUCTED | | ||||
|                                                       MBEDTLS_ASN1_SEQUENCE ) ); | ||||
|         MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, tmp_buf, len ) ); | ||||
|         MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, tmp_buf, MBEDTLS_ASN1_CONTEXT_SPECIFIC | | ||||
|                                                            MBEDTLS_ASN1_CONSTRUCTED | 3 ) ); | ||||
|         MBEDTLS_ASN1_CHK_ADD( len, | ||||
|                               mbedtls_asn1_write_tag( &c, tmp_buf, | ||||
|                                                MBEDTLS_ASN1_CONTEXT_SPECIFIC | | ||||
|                                                MBEDTLS_ASN1_CONSTRUCTED | 3 ) ); | ||||
|     } | ||||
| 
 | ||||
|     /*
 | ||||
|      *  SubjectPublicKeyInfo | ||||
|      */ | ||||
|     MBEDTLS_ASN1_CHK_ADD( pub_len, mbedtls_pk_write_pubkey_der( ctx->subject_key, | ||||
|                                                 tmp_buf, c - tmp_buf ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( pub_len, | ||||
|                           mbedtls_pk_write_pubkey_der( ctx->subject_key, | ||||
|                                                        tmp_buf, c - tmp_buf ) ); | ||||
|     c -= pub_len; | ||||
|     len += pub_len; | ||||
| 
 | ||||
|     /*
 | ||||
|      *  Subject  ::=  Name | ||||
|      */ | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_x509_write_names( &c, tmp_buf, ctx->subject ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, | ||||
|                           mbedtls_x509_write_names( &c, tmp_buf, | ||||
|                                                     ctx->subject ) ); | ||||
| 
 | ||||
|     /*
 | ||||
|      *  Validity ::= SEQUENCE { | ||||
| @ -381,32 +410,41 @@ int mbedtls_x509write_crt_der( mbedtls_x509write_cert *ctx, unsigned char *buf, | ||||
|      */ | ||||
|     sub_len = 0; | ||||
| 
 | ||||
|     MBEDTLS_ASN1_CHK_ADD( sub_len, x509_write_time( &c, tmp_buf, ctx->not_after, | ||||
|                                             MBEDTLS_X509_RFC5280_UTC_TIME_LEN ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( sub_len, | ||||
|                           x509_write_time( &c, tmp_buf, ctx->not_after, | ||||
|                                         MBEDTLS_X509_RFC5280_UTC_TIME_LEN ) ); | ||||
| 
 | ||||
|     MBEDTLS_ASN1_CHK_ADD( sub_len, x509_write_time( &c, tmp_buf, ctx->not_before, | ||||
|                                             MBEDTLS_X509_RFC5280_UTC_TIME_LEN ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( sub_len, | ||||
|                           x509_write_time( &c, tmp_buf, ctx->not_before, | ||||
|                                         MBEDTLS_X509_RFC5280_UTC_TIME_LEN ) ); | ||||
| 
 | ||||
|     len += sub_len; | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, tmp_buf, sub_len ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, tmp_buf, MBEDTLS_ASN1_CONSTRUCTED | | ||||
|                                                     MBEDTLS_ASN1_SEQUENCE ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, | ||||
|                           mbedtls_asn1_write_tag( &c, tmp_buf, | ||||
|                                                   MBEDTLS_ASN1_CONSTRUCTED | | ||||
|                                                   MBEDTLS_ASN1_SEQUENCE ) ); | ||||
| 
 | ||||
|     /*
 | ||||
|      *  Issuer  ::=  Name | ||||
|      */ | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_x509_write_names( &c, tmp_buf, ctx->issuer ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_x509_write_names( &c, | ||||
|                                                          tmp_buf, | ||||
|                                                          ctx->issuer ) ); | ||||
| 
 | ||||
|     /*
 | ||||
|      *  Signature   ::=  AlgorithmIdentifier | ||||
|      */ | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_algorithm_identifier( &c, tmp_buf, | ||||
|                        sig_oid, strlen( sig_oid ), 0 ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, | ||||
|                           mbedtls_asn1_write_algorithm_identifier( &c, tmp_buf, | ||||
|                                               sig_oid, strlen( sig_oid ), 0 ) ); | ||||
| 
 | ||||
|     /*
 | ||||
|      *  Serial   ::=  INTEGER | ||||
|      */ | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_mpi( &c, tmp_buf, &ctx->serial ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_mpi( &c, | ||||
|                                                        tmp_buf, | ||||
|                                                        &ctx->serial ) ); | ||||
| 
 | ||||
|     /*
 | ||||
|      *  Version  ::=  INTEGER  {  v1(0), v2(1), v3(2)  } | ||||
| @ -416,16 +454,22 @@ int mbedtls_x509write_crt_der( mbedtls_x509write_cert *ctx, unsigned char *buf, | ||||
|     if( ctx->version != MBEDTLS_X509_CRT_VERSION_1 ) | ||||
|     { | ||||
|         sub_len = 0; | ||||
|         MBEDTLS_ASN1_CHK_ADD( sub_len, mbedtls_asn1_write_int( &c, tmp_buf, ctx->version ) ); | ||||
|         MBEDTLS_ASN1_CHK_ADD( sub_len, | ||||
|                               mbedtls_asn1_write_int( &c, tmp_buf, | ||||
|                                                       ctx->version ) ); | ||||
|         len += sub_len; | ||||
|         MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, tmp_buf, sub_len ) ); | ||||
|         MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, tmp_buf, MBEDTLS_ASN1_CONTEXT_SPECIFIC | | ||||
|                                                            MBEDTLS_ASN1_CONSTRUCTED | 0 ) ); | ||||
|         MBEDTLS_ASN1_CHK_ADD( len, | ||||
|                               mbedtls_asn1_write_len( &c, tmp_buf, sub_len ) ); | ||||
|         MBEDTLS_ASN1_CHK_ADD( len, | ||||
|                               mbedtls_asn1_write_tag( &c, tmp_buf, | ||||
|                                                MBEDTLS_ASN1_CONTEXT_SPECIFIC | | ||||
|                                                MBEDTLS_ASN1_CONSTRUCTED | 0 ) ); | ||||
|     } | ||||
| 
 | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, tmp_buf, len ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, tmp_buf, MBEDTLS_ASN1_CONSTRUCTED | | ||||
|                                                        MBEDTLS_ASN1_SEQUENCE ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, | ||||
|                 mbedtls_asn1_write_tag( &c, tmp_buf, MBEDTLS_ASN1_CONSTRUCTED | | ||||
|                                                      MBEDTLS_ASN1_SEQUENCE ) ); | ||||
| 
 | ||||
|     /*
 | ||||
|      * Make signature | ||||
| @ -436,8 +480,9 @@ int mbedtls_x509write_crt_der( mbedtls_x509write_cert *ctx, unsigned char *buf, | ||||
|         return( ret ); | ||||
|     } | ||||
| 
 | ||||
|     if( ( ret = mbedtls_pk_sign( ctx->issuer_key, ctx->md_alg, hash, 0, sig, &sig_len, | ||||
|                          f_rng, p_rng ) ) != 0 ) | ||||
|     if( ( ret = mbedtls_pk_sign( ctx->issuer_key, ctx->md_alg, | ||||
|                                  hash, 0, sig, &sig_len, | ||||
|                                  f_rng, p_rng ) ) != 0 ) | ||||
|     { | ||||
|         return( ret ); | ||||
|     } | ||||
| @ -457,7 +502,8 @@ int mbedtls_x509write_crt_der( mbedtls_x509write_cert *ctx, unsigned char *buf, | ||||
| 
 | ||||
|     len += sig_and_oid_len; | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c2, buf, len ) ); | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c2, buf, MBEDTLS_ASN1_CONSTRUCTED | | ||||
|     MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c2, buf, | ||||
|                                                  MBEDTLS_ASN1_CONSTRUCTED | | ||||
|                                                  MBEDTLS_ASN1_SEQUENCE ) ); | ||||
| 
 | ||||
|     return( (int) len ); | ||||
| @ -467,9 +513,10 @@ int mbedtls_x509write_crt_der( mbedtls_x509write_cert *ctx, unsigned char *buf, | ||||
| #define PEM_END_CRT             "-----END CERTIFICATE-----\n" | ||||
| 
 | ||||
| #if defined(MBEDTLS_PEM_WRITE_C) | ||||
| int mbedtls_x509write_crt_pem( mbedtls_x509write_cert *crt, unsigned char *buf, size_t size, | ||||
|                        int (*f_rng)(void *, unsigned char *, size_t), | ||||
|                        void *p_rng ) | ||||
| int mbedtls_x509write_crt_pem( mbedtls_x509write_cert *crt, | ||||
|                                unsigned char *buf, size_t size, | ||||
|                                int (*f_rng)(void *, unsigned char *, size_t), | ||||
|                                void *p_rng ) | ||||
| { | ||||
|     int ret; | ||||
|     unsigned char output_buf[4096]; | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Hanno Becker
						Hanno Becker