[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  6f4d71ff9d5ac80c5ae2a309a487ccbdb360108b (commit)
      from  169692d736d5a7e2cdeeebeab3cd64a608c33f6b (commit)


- Log -----------------------------------------------------------------
commit 6f4d71ff9d5ac80c5ae2a309a487ccbdb360108b
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat May 2 13:21:34 2015 +0100

    make X509_VERIFY_PARAM opaque
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/x509/x509_lcl.h     | 18 ++++++++++++++++++
 include/openssl/x509_vfy.h | 19 +------------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/crypto/x509/x509_lcl.h b/crypto/x509/x509_lcl.h
index 427d8ca..eb5ae43 100644
--- a/crypto/x509/x509_lcl.h
+++ b/crypto/x509/x509_lcl.h
@@ -57,6 +57,24 @@
  *
  */
 
+/*
+ * This structure holds all parameters associated with a verify operation by
+ * including an X509_VERIFY_PARAM structure in related structures the
+ * parameters used can be customized
+ */
+
+struct X509_VERIFY_PARAM_st {
+    char *name;
+    time_t check_time;          /* Time to use */
+    unsigned long inh_flags;    /* Inheritance flags */
+    unsigned long flags;        /* Various verify flags */
+    int purpose;                /* purpose to check untrusted certificates */
+    int trust;                  /* trust setting to check */
+    int depth;                  /* Verify depth */
+    STACK_OF(ASN1_OBJECT) *policies; /* Permissible policies */
+    X509_VERIFY_PARAM_ID *id;   /* opaque ID data */
+};
+
 /* internal only structure to hold additional X509_VERIFY_PARAM data */
 
 struct X509_VERIFY_PARAM_ID_st {
diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h
index e41b5e2..0be9b5a 100644
--- a/include/openssl/x509_vfy.h
+++ b/include/openssl/x509_vfy.h
@@ -145,24 +145,7 @@ typedef struct x509_lookup_method_st {
 } X509_LOOKUP_METHOD;
 
 typedef struct X509_VERIFY_PARAM_ID_st X509_VERIFY_PARAM_ID;
-
-/*
- * This structure hold all parameters associated with a verify operation by
- * including an X509_VERIFY_PARAM structure in related structures the
- * parameters used can be customized
- */
-
-typedef struct X509_VERIFY_PARAM_st {
-    char *name;
-    time_t check_time;          /* Time to use */
-    unsigned long inh_flags;    /* Inheritance flags */
-    unsigned long flags;        /* Various verify flags */
-    int purpose;                /* purpose to check untrusted certificates */
-    int trust;                  /* trust setting to check */
-    int depth;                  /* Verify depth */
-    STACK_OF(ASN1_OBJECT) *policies; /* Permissible policies */
-    X509_VERIFY_PARAM_ID *id;   /* opaque ID data */
-} X509_VERIFY_PARAM;
+typedef struct X509_VERIFY_PARAM_st X509_VERIFY_PARAM;
 
 DECLARE_STACK_OF(X509_VERIFY_PARAM)