Commit 8382ec5d authored by Richard Levitte's avatar Richard Levitte
Browse files

Reindent for readability.

parent 0998cfaa

crypto/x509v3/v3_akey.c

+104 −86
Original line number Diff line number Diff line
@@ -68,8 +68,10 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, 
static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,

			X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values);



X509V3_EXT_METHOD v3_akey_id = {

NID_authority_key_identifier, X509V3_EXT_MULTILINE, ASN1_ITEM_ref(AUTHORITY_KEYID),

X509V3_EXT_METHOD v3_akey_id =

	{

	NID_authority_key_identifier,

	X509V3_EXT_MULTILINE, ASN1_ITEM_ref(AUTHORITY_KEYID),

	0,0,0,0,

	0,0,

	(X509V3_EXT_I2V)i2v_AUTHORITY_KEYID,
@@ -120,43 +122,58 @@ ASN1_INTEGER *serial = NULL; 
	X509_EXTENSION *ext;

	X509 *cert;

	AUTHORITY_KEYID *akeyid;

for(i = 0; i < sk_CONF_VALUE_num(values); i++) {



	for(i = 0; i < sk_CONF_VALUE_num(values); i++)

		{

		cnf = sk_CONF_VALUE_value(values, i);

	if(!strcmp(cnf->name, "keyid")) {

		if(!strcmp(cnf->name, "keyid"))

			{

			keyid = 1;

		if(cnf->value && !strcmp(cnf->value, "always")) keyid = 2;

	} else if(!strcmp(cnf->name, "issuer")) {

			if(cnf->value && !strcmp(cnf->value, "always"))

				keyid = 2;

			}

		else if(!strcmp(cnf->name, "issuer"))

			{

			issuer = 1;

		if(cnf->value && !strcmp(cnf->value, "always")) issuer = 2;

	} else {

			if(cnf->value && !strcmp(cnf->value, "always"))

				issuer = 2;

			}

		else

			{

			X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_UNKNOWN_OPTION);

			ERR_add_error_data(2, "name=", cnf->name);

			return NULL;

			}

		}



if(!ctx || !ctx->issuer_cert) {

	if(ctx && (ctx->flags==CTX_TEST)) return AUTHORITY_KEYID_new();

	if(!ctx || !ctx->issuer_cert)

		{

		if(ctx && (ctx->flags==CTX_TEST))

			return AUTHORITY_KEYID_new();

		X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_NO_ISSUER_CERTIFICATE);

		return NULL;

		}



	cert = ctx->issuer_cert;



if(keyid) {

	if(keyid)

		{

		i = X509_get_ext_by_NID(cert, NID_subject_key_identifier, -1);

		if((i >= 0)  && (ext = X509_get_ext(cert, i)))

			ikeyid = X509V3_EXT_d2i(ext);

	if(keyid==2 && !ikeyid) {

		if(keyid==2 && !ikeyid)

			{

			X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_UNABLE_TO_GET_ISSUER_KEYID);

			return NULL;

			}

		}



if((issuer && !ikeyid) || (issuer == 2)) {

	if((issuer && !ikeyid) || (issuer == 2))

		{

		isname = X509_NAME_dup(X509_get_issuer_name(cert));

		serial = M_ASN1_INTEGER_dup(X509_get_serialNumber(cert));

	if(!isname || !serial) {

		if(!isname || !serial)

			{

			X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS);

			goto err;

			}
@@ -164,9 +181,12 @@ if((issuer && !ikeyid) || (issuer == 2)) { 


	if(!(akeyid = AUTHORITY_KEYID_new())) goto err;



if(isname) {

	if(!(gens = sk_GENERAL_NAME_new_null()) || !(gen = GENERAL_NAME_new())

		|| !sk_GENERAL_NAME_push(gens, gen)) {

	if(isname)

		{

		if(!(gens = sk_GENERAL_NAME_new_null())

			|| !(gen = GENERAL_NAME_new())

			|| !sk_GENERAL_NAME_push(gens, gen))

			{

			X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,ERR_R_MALLOC_FAILURE);

			goto err;

			}
@@ -185,6 +205,4 @@ X509_NAME_free(isname); 
	M_ASN1_INTEGER_free(serial);

	M_ASN1_OCTET_STRING_free(ikeyid);

	return NULL;



	}