Update from HEAD.

[oweals/openssl.git] / crypto / x509v3 / pcy_node.c

diff --git a/crypto/x509v3/pcy_node.c b/crypto/x509v3/pcy_node.c
index 3d6bd34cc5d75787f8e50aea2530cc4324a93003..6587cb05abad6ec3c487e92d1b58c29168783ec9 100644 (file)
--- a/crypto/x509v3/pcy_node.c
+++ b/crypto/x509v3/pcy_node.c
@@ -1,5 +1,5 @@
 /* pcy_node.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2004.
  */
 /* ====================================================================
@@ -56,16 +56,15 @@
  *
  */
 
-#include <memory.h>
 #include <openssl/asn1.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
 #include "pcy_int.h"
 
-static int node_cmp(void *pa, void *pb)
+static int node_cmp(const X509_POLICY_NODE * const *a,
+                       const X509_POLICY_NODE * const *b)
        {
-       X509_POLICY_NODE **a = pa, **b = pb;
        return OBJ_cmp((*a)->data->valid_policy, (*b)->data->valid_policy);
        }
 
@@ -99,7 +98,7 @@ X509_POLICY_NODE *level_find_node(const X509_POLICY_LEVEL *level,
        }
 
 X509_POLICY_NODE *level_add_node(X509_POLICY_LEVEL *level,
-                       const X509_POLICY_DATA *data,
+                       X509_POLICY_DATA *data,
                        X509_POLICY_NODE *parent,
                        X509_POLICY_TREE *tree)
        {