another rename

6 files changed, 14 insertions, 14 deletions

diff --git a/NEWS b/NEWS
index e12d9cc7d6..033970bda8 100644
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@ tokens that do not store the public key).
 ** API and ABI modifications:
 gnutls_pkcs11_privkey_generate2: Added
 gnutls_x509_crt_get_policy: Added
-gnutls_x509_crt_policy_release: Added
+gnutls_x509_policy_release: Added
 
 
 * Version 3.1.4 (released 2012-11-10)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index fe69edfc4f..f5d26d24c1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1989,8 +1989,6 @@ FUNCS += functions/gnutls_x509_crt_list_import_pkcs11
 FUNCS += functions/gnutls_x509_crt_list_import_pkcs11.short
 FUNCS += functions/gnutls_x509_crt_list_verify
 FUNCS += functions/gnutls_x509_crt_list_verify.short
-FUNCS += functions/gnutls_x509_crt_policy_release
-FUNCS += functions/gnutls_x509_crt_policy_release.short
 FUNCS += functions/gnutls_x509_crt_print
 FUNCS += functions/gnutls_x509_crt_print.short
 FUNCS += functions/gnutls_x509_crt_privkey_sign
@@ -2073,6 +2071,8 @@ FUNCS += functions/gnutls_x509_dn_oid_known
 FUNCS += functions/gnutls_x509_dn_oid_known.short
 FUNCS += functions/gnutls_x509_dn_oid_name
 FUNCS += functions/gnutls_x509_dn_oid_name.short
+FUNCS += functions/gnutls_x509_policy_release
+FUNCS += functions/gnutls_x509_policy_release.short
 FUNCS += functions/gnutls_x509_privkey_cpy
 FUNCS += functions/gnutls_x509_privkey_cpy.short
 FUNCS += functions/gnutls_x509_privkey_deinit
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 944ad15df5..f336d1d06d 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -804,7 +804,6 @@ APIMANS += gnutls_x509_crt_list_import.3
 APIMANS += gnutls_x509_crt_list_import2.3
 APIMANS += gnutls_x509_crt_list_import_pkcs11.3
 APIMANS += gnutls_x509_crt_list_verify.3
-APIMANS += gnutls_x509_crt_policy_release.3
 APIMANS += gnutls_x509_crt_print.3
 APIMANS += gnutls_x509_crt_privkey_sign.3
 APIMANS += gnutls_x509_crt_set_activation_time.3
@@ -846,6 +845,7 @@ APIMANS += gnutls_x509_dn_import.3
 APIMANS += gnutls_x509_dn_init.3
 APIMANS += gnutls_x509_dn_oid_known.3
 APIMANS += gnutls_x509_dn_oid_name.3
+APIMANS += gnutls_x509_policy_release.3
 APIMANS += gnutls_x509_privkey_cpy.3
 APIMANS += gnutls_x509_privkey_deinit.3
 APIMANS += gnutls_x509_privkey_export.3
diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index 5fccefc3dc..e95cbbc758 100644
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -351,7 +351,7 @@ extern "C"
     GNUTLS_X509_QUALIFIER_NOTICE
   } gnutls_x509_qualifier_t;
 
-  struct gnutls_x509_crt_policy_st 
+  struct gnutls_x509_policy_st 
     {
       char* policy_oid;
       unsigned int qualifiers;
@@ -359,9 +359,9 @@ extern "C"
       char *qualifier_data[GNUTLS_MAX_QUALIFIERS];
     };
 
-  void gnutls_x509_crt_policy_release(struct gnutls_x509_crt_policy_st* policy);
+  void gnutls_x509_policy_release(struct gnutls_x509_policy_st* policy);
   int gnutls_x509_crt_get_policy (gnutls_x509_crt_t crt, int indx, 
-                                  struct gnutls_x509_crt_policy_st* policy,
+                                  struct gnutls_x509_policy_st* policy,
                                   unsigned int * critical);
   int gnutls_x509_dn_oid_known (const char *oid);
 
diff --git a/lib/x509/output.c b/lib/x509/output.c
index a398c3e775..b9d9d66cb1 100644
--- a/lib/x509/output.c
+++ b/lib/x509/output.c
@@ -960,7 +960,7 @@ print_extensions (gnutls_buffer_st * str, const char *prefix, int type,
         }
       else if (strcmp (oid, "2.5.29.32") == 0)
         {
-          struct gnutls_x509_crt_policy_st policy;
+          struct gnutls_x509_policy_st policy;
           const char* name;
           int x;
 
@@ -988,7 +988,7 @@ print_extensions (gnutls_buffer_st * str, const char *prefix, int type,
                   addf (str, "%s\t\t\t\t%s: %s\n", prefix, name, policy.qualifier_data[j]);
                 }
           
-              gnutls_x509_crt_policy_release (&policy);
+              gnutls_x509_policy_release (&policy);
             }
         }
       else if (strcmp (oid, "2.5.29.35") == 0)
diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index 6dd37df0a3..8519500d55 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -1760,14 +1760,14 @@ gnutls_x509_crt_get_proxy (gnutls_x509_crt_t cert,
 }
 
 /**
- * gnutls_x509_crt_policy_release:
+ * gnutls_x509_policy_release:
  * @policy: a certificate policy
  *
  * This function will deinitialize all memory associated with the provided
  * @policy. The policy is allocated using gnutls_x509_crt_get_policy().
  *
  **/
-void gnutls_x509_crt_policy_release(struct gnutls_x509_crt_policy_st* policy)
+void gnutls_x509_policy_release(struct gnutls_x509_policy_st* policy)
 {
 unsigned i;
 
@@ -1866,14 +1866,14 @@ cleanup:
  * specified by the given index. 
  *
  * The policy returned by this function must be deinitialized by using
- * gnutls_x509_crt_policy_release().
+ * gnutls_x509_policy_release().
  *
  * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, %GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE
  * if the extension is not present, otherwise a negative error value.
  **/
 int
 gnutls_x509_crt_get_policy (gnutls_x509_crt_t crt, int indx, 
-                            struct gnutls_x509_crt_policy_st* policy, 
+                            struct gnutls_x509_policy_st* policy, 
                             unsigned int *critical)
 {
   ASN1_TYPE c2 = ASN1_TYPE_EMPTY;
@@ -2009,7 +2009,7 @@ gnutls_x509_crt_get_policy (gnutls_x509_crt_t crt, int indx,
   goto cleanup;
   
 full_cleanup:
-  gnutls_x509_crt_policy_release(policy);
+  gnutls_x509_policy_release(policy);
 
 cleanup:
   _gnutls_free_datum (&tmpd);