Commit 4329db37 authored by Geoff Thorpe's avatar Geoff Thorpe
Browse files

The ampersand is not required in these constructs, and was giving AIX 

warnings.

Reported by: Bernhard Simon.
parent 6f7ac8e1

crypto/engine/tb_cipher.c

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ int ENGINE_register_ciphers(ENGINE *e) 
		int num_nids = e->ciphers(e, NULL, &nids, 0);

		if(num_nids > 0)

			return engine_table_register(&cipher_table,

					&engine_unregister_all_ciphers, e, nids,

					engine_unregister_all_ciphers, e, nids,

					num_nids, 0);

		}

	return 1;
@@ -103,7 +103,7 @@ int ENGINE_set_default_ciphers(ENGINE *e) 
		int num_nids = e->ciphers(e, NULL, &nids, 0);

		if(num_nids > 0)

			return engine_table_register(&cipher_table,

					&engine_unregister_all_ciphers, e, nids,

					engine_unregister_all_ciphers, e, nids,

					num_nids, 1);

		}

	return 1;

crypto/engine/tb_dh.c

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ int ENGINE_register_DH(ENGINE *e) 
	{

	if(e->dh_meth)

		return engine_table_register(&dh_table,

				&engine_unregister_all_DH, e, &dummy_nid, 1, 0);

				engine_unregister_all_DH, e, &dummy_nid, 1, 0);

	return 1;

	}
@@ -94,7 +94,7 @@ int ENGINE_set_default_DH(ENGINE *e) 
	{

	if(e->dh_meth)

		return engine_table_register(&dh_table,

				&engine_unregister_all_DH, e, &dummy_nid, 1, 1);

				engine_unregister_all_DH, e, &dummy_nid, 1, 1);

	return 1;

	}

crypto/engine/tb_digest.c

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ int ENGINE_register_digests(ENGINE *e) 
		int num_nids = e->digests(e, NULL, &nids, 0);

		if(num_nids > 0)

			return engine_table_register(&digest_table,

					&engine_unregister_all_digests, e, nids,

					engine_unregister_all_digests, e, nids,

					num_nids, 0);

		}

	return 1;
@@ -103,7 +103,7 @@ int ENGINE_set_default_digests(ENGINE *e) 
		int num_nids = e->digests(e, NULL, &nids, 0);

		if(num_nids > 0)

			return engine_table_register(&digest_table,

					&engine_unregister_all_digests, e, nids,

					engine_unregister_all_digests, e, nids,

					num_nids, 1);

		}

	return 1;

crypto/engine/tb_dsa.c

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ int ENGINE_register_DSA(ENGINE *e) 
	{

	if(e->dsa_meth)

		return engine_table_register(&dsa_table,

				&engine_unregister_all_DSA, e, &dummy_nid, 1, 0);

				engine_unregister_all_DSA, e, &dummy_nid, 1, 0);

	return 1;

	}
@@ -94,7 +94,7 @@ int ENGINE_set_default_DSA(ENGINE *e) 
	{

	if(e->dsa_meth)

		return engine_table_register(&dsa_table,

				&engine_unregister_all_DSA, e, &dummy_nid, 1, 0);

				engine_unregister_all_DSA, e, &dummy_nid, 1, 0);

	return 1;

	}

crypto/engine/tb_ecdh.c

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ int ENGINE_register_ECDH(ENGINE *e) 
	{

	if(e->ecdh_meth)

		return engine_table_register(&ecdh_table,

				&engine_unregister_all_ECDH, e, &dummy_nid, 1, 0);

				engine_unregister_all_ECDH, e, &dummy_nid, 1, 0);

	return 1;

	}
@@ -109,7 +109,7 @@ int ENGINE_set_default_ECDH(ENGINE *e) 
	{

	if(e->ecdh_meth)

		return engine_table_register(&ecdh_table,

				&engine_unregister_all_ECDH, e, &dummy_nid, 1, 0);

				engine_unregister_all_ECDH, e, &dummy_nid, 1, 0);

	return 1;

	}