Commit 3d3fd6be authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

More updatdes from stable branch.

parent 7486fb65

crypto/bn/bn_gf2m.c

+5 −1
Original line number Diff line number Diff line
@@ -384,7 +384,11 @@ int BN_GF2m_mod_arr(BIGNUM *r, const BIGNUM *a, const unsigned int p[]) 
		if (zz == 0) break;

		d1 = BN_BITS2 - d0;

		

		if (d0) z[dN] = (z[dN] << d1) >> d1; /* clear up the top d1 bits */

		/* clear up the top d1 bits */

		if (d0)

			z[dN] = (z[dN] << d1) >> d1;

		else

			z[dN] = 0;

		z[0] ^= zz; /* reduction t^0 component */



		for (k = 1; p[k] != 0; k++)

crypto/engine/eng_cnf.c

+9 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf) 
	CONF_VALUE *ecmd;

	char *ctrlname, *ctrlvalue;

	ENGINE *e = NULL;

        int soft = 0;



	name = skip_dot(name);

#ifdef ENGINE_CONF_DEBUG

	fprintf(stderr, "Configuring engine %s\n", name);
@@ -125,6 +127,8 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf) 
		/* Override engine name to use */

		if (!strcmp(ctrlname, "engine_id"))

			name = ctrlvalue;

                else if (!strcmp(ctrlname, "soft_load"))

                        soft = 1;

		/* Load a dynamic ENGINE */

		else if (!strcmp(ctrlname, "dynamic_path"))

			{
@@ -147,6 +151,11 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf) 
			if (!e)

				{

				e = ENGINE_by_id(name);

                                if (!e && soft)

                                        {

                                        ERR_clear_error();

                                        return 1;

                                        }

				if (!e)

					return 0;

				}

crypto/engine/eng_padlock.c

+2 −2
Original line number Diff line number Diff line
@@ -234,8 +234,8 @@ padlock_bind_fn(ENGINE *e, const char *id) 
	return 1;

}



IMPLEMENT_DYNAMIC_CHECK_FN()

IMPLEMENT_DYNAMIC_BIND_FN(padlock_bind_fn)

IMPLEMENT_DYNAMIC_CHECK_FN ();

IMPLEMENT_DYNAMIC_BIND_FN (padlock_bind_fn);

#endif /* DYNAMIC_ENGINE */



/* ===== Here comes the "real" engine ===== */