[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  8d1d0f4d9e20f825abbaf22f107815668e1d6b6b (commit)
      from  fffc2faeb2b5cad4516cc624352d445284aa7522 (commit)


- Log -----------------------------------------------------------------
commit 8d1d0f4d9e20f825abbaf22f107815668e1d6b6b
Author: Rich Salz <rsalz at akamai.com>
Date:   Tue Sep 1 22:44:10 2015 -0400

    Move OPENSSL_ITEM to store.h
    
    The only place that uses it.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 include/openssl/crypto.h | 9 ---------
 include/openssl/store.h  | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index 1d1c2b3..f1ff0e0 100644
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -158,15 +158,6 @@ extern "C" {
 # define SSLEAY_PLATFORM         4
 # define SSLEAY_DIR              5
 
-/* A generic structure to pass assorted data in a expandable way */
-typedef struct openssl_item_st {
-    int code;
-    void *value;                /* Not used for flag attributes */
-    size_t value_size;          /* Max size of value for output, length for
-                                 * input */
-    size_t *value_length;       /* Returned length of value for output */
-} OPENSSL_ITEM;
-
 /*
  * When changing the CRYPTO_LOCK_* list, be sure to maintin the text lock
  * names in cryptlib.c
diff --git a/include/openssl/store.h b/include/openssl/store.h
index b732eef..4f88f99 100644
--- a/include/openssl/store.h
+++ b/include/openssl/store.h
@@ -248,6 +248,15 @@ DECLARE_STACK_OF(STORE_OBJECT)
 STORE_OBJECT *STORE_OBJECT_new(void);
 void STORE_OBJECT_free(STORE_OBJECT *data);
 
+/* A generic structure to pass assorted data in a expandable way */
+typedef struct openssl_item_st {
+    int code;
+    void *value;                /* Not used for flag attributes */
+    size_t value_size;          /* Max size of value for output, length for
+                                 * input */
+    size_t *value_length;       /* Returned length of value for output */
+} OPENSSL_ITEM;
+
 /*
  * The following functions handle the storage. They return 0, a negative
  * number or NULL on error, anything else on success.