Delete a lot of #if 0 code in libressl.

There are a few instances where #if 1 is removed but the code remains.

Based on the following OpenSSL commits.  Some of the commits weren't
strictly deletions so they are going to be split up into separate commits.

6f91b017bbb7140f816721141ac156d1b828a6b3
3d47c1d331fdc7574d2275cda1a630ccdb624b08
dfb56425b68314b2b57e17c82c1df42e7a015132
c8fa2356a00cbaada8963f739e5570298311a060
f16a64d11f55c01f56baa62ebf1dec7f8fe718cb
9ccc00ef6ea65567622e40c49aca43f2c6d79cdb
02a938c953b3e1ced71d9a832de1618f907eb96d
75d0ebef2aef7a2c77b27575b8da898e22f3ccd5
d6fbb194095312f4722c81c9362dbd0de66cb656
6f1a93ad111c7dfe36a09a976c4c009079b19ea1
1a5adcfb5edfe23908b350f8757df405b0f5f71f
8de24b792743d11e1d5a0dcd336a49368750c577
a2b18e657ea1a932d125154f4e13ab2258796d90
8e964419603d2478dfb391c66e7ccb2dcc9776b4
32dfde107636ac9bc62a5b3233fe2a54dbc27008

input + ok jsing@, miod@, tedu@

1 files changed, 1 insertions, 50 deletions

diff --git a/src/lib/libcrypto/x509v3/pcy_tree.c b/src/lib/libcrypto/x509v3/pcy_tree.c
index 2c6472a8a1..fa0e161562 100644
--- a/src/lib/libcrypto/x509v3/pcy_tree.c
+++ b/src/lib/libcrypto/x509v3/pcy_tree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcy_tree.c,v 1.12 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: pcy_tree.c,v 1.13 2015/02/07 13:19:15 doug Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2004.
  */
@@ -153,11 +153,6 @@ tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs, unsigned int flags)
         *ptree = NULL;
         n = sk_X509_num(certs);
 
-#if 0
-        /* Disable policy mapping for now... */
-        flags |= X509_V_FLAG_INHIBIT_MAP;
-#endif
-
         if (flags & X509_V_FLAG_EXPLICIT_POLICY)
                 explicit_policy = 0;
         else
@@ -327,19 +322,6 @@ tree_link_nodes(X509_POLICY_LEVEL *curr, const X509_POLICY_CACHE *cache)
 
         for (i = 0; i < sk_X509_POLICY_DATA_num(cache->data); i++) {
                 data = sk_X509_POLICY_DATA_value(cache->data, i);
-                /* If a node is mapped any it doesn't have a corresponding
-                 * CertificatePolicies entry.
-                 * However such an identical node would be created
-                 * if anyPolicy matching is enabled because there would be
-                 * no match with the parent valid_policy_set. So we create
-                 * link because then it will have the mapping flags
-                 * right and we can prune it later.
-                 */
-#if 0
-                if ((data->flags & POLICY_DATA_FLAG_MAPPED_ANY) &&
-                    !(curr->flags & X509_V_FLAG_INHIBIT_ANY))
-                        continue;
-#endif
                 /* Look for matching nodes in previous level */
                 if (!tree_link_matching_nodes(curr, data))
                         return 0;
@@ -416,7 +398,6 @@ tree_link_any(X509_POLICY_LEVEL *curr, const X509_POLICY_CACHE *cache,
     X509_POLICY_TREE *tree)
 {
         int i;
-        /*X509_POLICY_DATA *data;*/
         X509_POLICY_NODE *node;
         X509_POLICY_LEVEL *last = curr - 1;
 
@@ -425,36 +406,6 @@ tree_link_any(X509_POLICY_LEVEL *curr, const X509_POLICY_CACHE *cache,
 
                 if (!tree_link_unmatched(curr, cache, node, tree))
                         return 0;
-
-#if 0
-
-                /* Skip any node with any children: we only want unmathced
-                 * nodes.
-                 *
-                 * Note: need something better for policy mapping
-                 * because each node may have multiple children
-                 */
-                if (node->nchild)
-                        continue;
-
-                /* Create a new node with qualifiers from anyPolicy and
-                 * id from unmatched node.
-                 */
-                data = policy_data_new(NULL, node->data->valid_policy,
-                    node_critical(node));
-
-                if (data == NULL)
-                        return 0;
-                /* Curr may not have anyPolicy */
-                data->qualifier_set = cache->anyPolicy->qualifier_set;
-                data->flags |= POLICY_DATA_FLAG_SHARED_QUALIFIERS;
-                if (!level_add_node(curr, data, node, tree)) {
-                        policy_data_free(data);
-                        return 0;
-                }
-
-#endif
-
         }
         /* Finally add link to anyPolicy */
         if (last->anyPolicy) {