1 files changed, 18 insertions, 10 deletions

diff --git a/src/lib/libcrypto/x509/x509_vpm.c b/src/lib/libcrypto/x509/x509_vpm.c
index 2b06718aec..dfd89d89fa 100644
--- a/src/lib/libcrypto/x509/x509_vpm.c
+++ b/src/lib/libcrypto/x509/x509_vpm.c
@@ -74,6 +74,7 @@ static void x509_verify_param_zero(X509_VERIFY_PARAM *param)
         param->name = NULL;
         param->purpose = 0;
         param->trust = 0;
+        /*param->inh_flags = X509_VP_FLAG_DEFAULT;*/
         param->inh_flags = 0;
         param->flags = 0;
         param->depth = -1;
@@ -198,8 +199,12 @@ int X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *dest,
 int X509_VERIFY_PARAM_set1(X509_VERIFY_PARAM *to,
                                                 const X509_VERIFY_PARAM *from)
         {
+        unsigned long save_flags = to->inh_flags;
+        int ret;
         to->inh_flags |= X509_VP_FLAG_DEFAULT;
-        return X509_VERIFY_PARAM_inherit(to, from);
+        ret = X509_VERIFY_PARAM_inherit(to, from);
+        to->inh_flags = save_flags;
+        return ret;
         }
 
 int X509_VERIFY_PARAM_set1_name(X509_VERIFY_PARAM *param, const char *name)
@@ -324,7 +329,7 @@ static const X509_VERIFY_PARAM default_table[] = {
         NULL            /* policies */
         },
         {
-        "pkcs7",                        /* S/MIME signing parameters */
+        "pkcs7",                        /* S/MIME sign parameters */
         0,                              /* Check time */
         0,                              /* internal flags */
         0,                              /* flags */
@@ -334,7 +339,7 @@ static const X509_VERIFY_PARAM default_table[] = {
         NULL                            /* policies */
         },
         {
-        "smime_sign",                   /* S/MIME signing parameters */
+        "smime_sign",                   /* S/MIME sign parameters */
         0,                              /* Check time */
         0,                              /* internal flags */
         0,                              /* flags */
@@ -366,12 +371,17 @@ static const X509_VERIFY_PARAM default_table[] = {
 
 static STACK_OF(X509_VERIFY_PARAM) *param_table = NULL;
 
-static int table_cmp(const void *pa, const void *pb)
+static int table_cmp(const X509_VERIFY_PARAM *a, const X509_VERIFY_PARAM *b)
+
         {
-        const X509_VERIFY_PARAM *a = pa, *b = pb;
         return strcmp(a->name, b->name);
         }
 
+DECLARE_OBJ_BSEARCH_CMP_FN(X509_VERIFY_PARAM, X509_VERIFY_PARAM,
+                           table);
+IMPLEMENT_OBJ_BSEARCH_CMP_FN(X509_VERIFY_PARAM, X509_VERIFY_PARAM,
+                             table);
+
 static int param_cmp(const X509_VERIFY_PARAM * const *a,
                         const X509_VERIFY_PARAM * const *b)
         {
@@ -407,6 +417,7 @@ const X509_VERIFY_PARAM *X509_VERIFY_PARAM_lookup(const char *name)
         {
         int idx;
         X509_VERIFY_PARAM pm;
+
         pm.name = (char *)name;
         if (param_table)
                 {
@@ -414,11 +425,8 @@ const X509_VERIFY_PARAM *X509_VERIFY_PARAM_lookup(const char *name)
                 if (idx != -1)
                         return sk_X509_VERIFY_PARAM_value(param_table, idx);
                 }
-        return (const X509_VERIFY_PARAM *) OBJ_bsearch((char *)&pm,
-                                (char *)&default_table,
-                                sizeof(default_table)/sizeof(X509_VERIFY_PARAM),
-                                sizeof(X509_VERIFY_PARAM),
-                                table_cmp);
+        return OBJ_bsearch_table(&pm, default_table,
+                           sizeof(default_table)/sizeof(X509_VERIFY_PARAM));
         }
 
 void X509_VERIFY_PARAM_table_cleanup(void)