Commit 739e0e93 authored by Bodo Möller's avatar Bodo Möller
Browse files

Fix X509_STORE locking

parent 6ae9770d

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ 


 Changes between 0.9.8l and 0.9.8m [xx XXX xxxx]



  *) Fix X509_STORE locking: Every 'objs' access requires a lock (to

     accommodate for stack sorting, always a write lock!).

     [Bodo Moeller]



  *) On some versions of WIN32 Heap32Next is very slow. This can cause

     excessive delays in the RAND_poll(): over a minute. As a workaround

     include a time check in the inner Heap32Next loop too.

crypto/x509/by_dir.c

+2 −3
Original line number Diff line number Diff line
@@ -360,11 +360,11 @@ static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name, 


		/* we have added it to the cache so now pull

		 * it out again */

		CRYPTO_r_lock(CRYPTO_LOCK_X509_STORE);

		CRYPTO_w_lock(CRYPTO_LOCK_X509_STORE);

		j = sk_X509_OBJECT_find(xl->store_ctx->objs,&stmp);

		if(j != -1) tmp=sk_X509_OBJECT_value(xl->store_ctx->objs,j);

		else tmp = NULL;

		CRYPTO_r_unlock(CRYPTO_LOCK_X509_STORE);

		CRYPTO_w_unlock(CRYPTO_LOCK_X509_STORE);



		if (tmp != NULL)

			{
@@ -383,4 +383,3 @@ finish: 
	if (b != NULL) BUF_MEM_free(b);

	return(ok);

	}

crypto/x509/x509_lu.c

+32 −26
Original line number Diff line number Diff line
@@ -292,7 +292,9 @@ int X509_STORE_get_by_subject(X509_STORE_CTX *vs, int type, X509_NAME *name, 
	X509_OBJECT stmp,*tmp;

	int i,j;



	CRYPTO_w_lock(CRYPTO_LOCK_X509_STORE);

	tmp=X509_OBJECT_retrieve_by_subject(ctx->objs,type,name);

	CRYPTO_w_unlock(CRYPTO_LOCK_X509_STORE);



	if (tmp == NULL)

		{
@@ -346,7 +348,6 @@ int X509_STORE_add_cert(X509_STORE *ctx, X509 *x) 


	X509_OBJECT_up_ref_count(obj);





	if (X509_OBJECT_retrieve_match(ctx->objs, obj))

		{

		X509_OBJECT_free_contents(obj);
@@ -489,13 +490,11 @@ X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h, X509_OBJECT *x 
 *  0 certificate not found.

 * -1 some other error.

 */





int X509_STORE_CTX_get1_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x)

	{

	X509_NAME *xn;

	X509_OBJECT obj, *pobj;

	int i, ok, idx;

	int i, ok, idx, ret;

	xn=X509_get_issuer_name(x);

	ok=X509_STORE_get_by_subject(ctx,X509_LU_X509,xn,&obj);

	if (ok != X509_LU_X509)
@@ -521,26 +520,33 @@ int X509_STORE_CTX_get1_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x) 
		return 1;

		}

	X509_OBJECT_free_contents(&obj);

	/* Else find index of first matching cert */

	idx = X509_OBJECT_idx_by_subject(ctx->ctx->objs, X509_LU_X509, xn);

	/* This shouldn't normally happen since we already have one match */

	if (idx == -1) return 0;



	/* Look through all matching certificates for a suitable issuer */

	/* Else find index of first cert accepted by 'check_issued' */

	ret = 0;

	CRYPTO_w_lock(CRYPTO_LOCK_X509_STORE);

	idx = X509_OBJECT_idx_by_subject(ctx->ctx->objs, X509_LU_X509, xn);

	if (idx != -1) /* should be true as we've had at least one match */

		{

		/* Look through all matching certs for suitable issuer */

		for (i = idx; i < sk_X509_OBJECT_num(ctx->ctx->objs); i++)

			{

			pobj = sk_X509_OBJECT_value(ctx->ctx->objs, i);

		/* See if we've ran out of matches */

		if (pobj->type != X509_LU_X509) return 0;

		if (X509_NAME_cmp(xn, X509_get_subject_name(pobj->data.x509))) return 0;

			/* See if we've run past the matches */

			if (pobj->type != X509_LU_X509)

				break;

			if (X509_NAME_cmp(xn, X509_get_subject_name(pobj->data.x509)))

				break;

			if (ctx->check_issued(ctx, x, pobj->data.x509))

				{

				*issuer = pobj->data.x509;

				X509_OBJECT_up_ref_count(pobj);

			return 1;

				ret = 1;

				break;

				}

			}

	return 0;

		}

	CRYPTO_w_unlock(CRYPTO_LOCK_X509_STORE);

	return ret;

	}



int X509_STORE_set_flags(X509_STORE *ctx, unsigned long flags)