From 45d8574b93e9f1e14c62b765220b370f7c37eaa3 Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Wed, 29 Jun 2005 10:25:06 +0000 Subject: [PATCH] Fix warnings. --- crypto/objects/obj_dat.h | 4 ++-- engines/e_4758cca.c | 2 ++ engines/e_chil.c | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 8ca04dd711..c2a707a984 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -2740,8 +2740,8 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[648]),/* "Microsoft Smartcardlogin" */ &(nid_objs[136]),/* "Microsoft Trust List Signing" */ &(nid_objs[649]),/* "Microsoft Universal Principal Name" */ -&(nid_objs[404]),/* "NULL" */ &(nid_objs[393]),/* "NULL" */ +&(nid_objs[404]),/* "NULL" */ &(nid_objs[72]),/* "Netscape Base Url" */ &(nid_objs[76]),/* "Netscape CA Policy Url" */ &(nid_objs[74]),/* "Netscape CA Revocation Url" */ @@ -3450,8 +3450,8 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[ 0]),/* OBJ_undef 0 */ &(nid_objs[393]),/* OBJ_joint_iso_ccitt OBJ_joint_iso_itu_t */ -&(nid_objs[645]),/* OBJ_itu_t 0 */ &(nid_objs[404]),/* OBJ_ccitt OBJ_itu_t */ +&(nid_objs[645]),/* OBJ_itu_t 0 */ &(nid_objs[434]),/* OBJ_data 0 9 */ &(nid_objs[181]),/* OBJ_iso 1 */ &(nid_objs[182]),/* OBJ_member_body 1 2 */ diff --git a/engines/e_4758cca.c b/engines/e_4758cca.c index e7f308e314..7d850a854b 100644 --- a/engines/e_4758cca.c +++ b/engines/e_4758cca.c @@ -202,8 +202,10 @@ static RAND_METHOD ibm_4758_cca_rand = static const char *engine_4758_cca_id = "4758cca"; static const char *engine_4758_cca_name = "IBM 4758 CCA hardware engine support"; +#ifndef OPENSSL_NO_DYNAMIC_ENGINE /* Compatibility hack, the dynamic library uses this form in the path */ static const char *engine_4758_cca_id_alt = "4758_cca"; +#endif /* engine implementation */ /*-----------------------*/ diff --git a/engines/e_chil.c b/engines/e_chil.c index b5d0a62e7a..4c22bc9cd1 100644 --- a/engines/e_chil.c +++ b/engines/e_chil.c @@ -224,8 +224,10 @@ static RAND_METHOD hwcrhk_rand = /* Constants used when creating the ENGINE */ static const char *engine_hwcrhk_id = "chil"; static const char *engine_hwcrhk_name = "CHIL hardware engine support"; +#ifndef OPENSSL_NO_DYNAMIC_ENGINE /* Compatibility hack, the dynamic library uses this form in the path */ static const char *engine_hwcrhk_id_alt = "ncipher"; +#endif /* Internal stuff for HWCryptoHook */ -- 2.25.1