commit dec9301650af995066846d4c12c470f9762325ec
author David Benjamin <davidben@google.com> Tue Aug 16 01:45:33 2016 -0400
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Tue Aug 16 19:38:02 2016 +0000
tree 9c508bfd5df8e69c45691701f899af2ddc072817
parent 8e12d1b18a8d4f67c63b5dc9438c842f3a49fab8

Remove STACK_OF(OPENSSL_BLOCK).

This is unused.

Change-Id: I31bbfb88aa9b718083ecce6d1a834f27683cf002
Reviewed-on: https://boringssl-review.googlesource.com/10363
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Commit-Queue: David Benjamin <davidben@google.com>
Commit-Queue: Adam Langley <agl@google.com>
Reviewed-by: Adam Langley <agl@google.com>

include/openssl/stack.h

diff --git a/include/openssl/stack.h b/include/openssl/stack.h
index 6f53b0a..c6e0de3 100644
--- a/include/openssl/stack.h
+++ b/include/openssl/stack.h
@@ -180,14 +180,12 @@
 typedef char *OPENSSL_STRING;
 
 DEFINE_SPECIAL_STACK_OF(OPENSSL_STRING, char)
-DEFINE_SPECIAL_STACK_OF(OPENSSL_BLOCK, uint8_t)
 
 /* The make_macros.sh script in this directory parses the following lines and
  * generates the stack_macros.h file that contains macros for the following
  * types of stacks:
  *
- * SPECIAL_STACK_OF:OPENSSL_STRING
- * SPECIAL_STACK_OF:OPENSSL_BLOCK */
+ * SPECIAL_STACK_OF:OPENSSL_STRING */
 
 #define IN_STACK_H
 #include <openssl/stack_macros.h>

include/openssl/stack_macros.h

diff --git a/include/openssl/stack_macros.h b/include/openssl/stack_macros.h
index 2a60b8f..d5f47f7 100644
--- a/include/openssl/stack_macros.h
+++ b/include/openssl/stack_macros.h
@@ -3900,87 +3900,3 @@
       CHECKED_CAST(void *(*)(void *), OPENSSL_STRING (*)(OPENSSL_STRING), \
                    copy_func),                                            \
       CHECKED_CAST(void (*)(void *), void (*)(OPENSSL_STRING), free_func)))
-
-/* OPENSSL_BLOCK */
-#define sk_OPENSSL_BLOCK_new(comp)                                             \
-  ((STACK_OF(OPENSSL_BLOCK) *)sk_new(CHECKED_CAST(                             \
-      stack_cmp_func, int (*)(const OPENSSL_BLOCK *a, const OPENSSL_BLOCK *b), \
-      comp)))
-
-#define sk_OPENSSL_BLOCK_new_null() ((STACK_OF(OPENSSL_BLOCK) *)sk_new_null())
-
-#define sk_OPENSSL_BLOCK_num(sk) \
-  sk_num(CHECKED_CAST(const _STACK *, const STACK_OF(OPENSSL_BLOCK) *, sk))
-
-#define sk_OPENSSL_BLOCK_zero(sk) \
-  sk_zero(CHECKED_CAST(_STACK *, STACK_OF(OPENSSL_BLOCK) *, sk));
-
-#define sk_OPENSSL_BLOCK_value(sk, i) \
-  ((OPENSSL_BLOCK)sk_value(           \
-      CHECKED_CAST(const _STACK *, const STACK_OF(OPENSSL_BLOCK) *, sk), (i)))
-
-#define sk_OPENSSL_BLOCK_set(sk, i, p)                            \
-  ((OPENSSL_BLOCK)sk_set(                                         \
-      CHECKED_CAST(_STACK *, STACK_OF(OPENSSL_BLOCK) *, sk), (i), \
-      CHECKED_CAST(void *, OPENSSL_BLOCK, p)))
-
-#define sk_OPENSSL_BLOCK_free(sk) \
-  sk_free(CHECKED_CAST(_STACK *, STACK_OF(OPENSSL_BLOCK) *, sk))
-
-#define sk_OPENSSL_BLOCK_pop_free(sk, free_func)             \
-  sk_pop_free(                                               \
-      CHECKED_CAST(_STACK *, STACK_OF(OPENSSL_BLOCK) *, sk), \
-      CHECKED_CAST(void (*)(void *), void (*)(OPENSSL_BLOCK), free_func))
-
-#define sk_OPENSSL_BLOCK_insert(sk, p, where)                      \
-  sk_insert(CHECKED_CAST(_STACK *, STACK_OF(OPENSSL_BLOCK) *, sk), \
-            CHECKED_CAST(void *, OPENSSL_BLOCK, p), (where))
-
-#define sk_OPENSSL_BLOCK_delete(sk, where) \
-  ((OPENSSL_BLOCK)sk_delete(               \
-      CHECKED_CAST(_STACK *, STACK_OF(OPENSSL_BLOCK) *, sk), (where)))
-
-#define sk_OPENSSL_BLOCK_delete_ptr(sk, p)                   \
-  ((OPENSSL_BLOCK)sk_delete_ptr(                             \
-      CHECKED_CAST(_STACK *, STACK_OF(OPENSSL_BLOCK) *, sk), \
-      CHECKED_CAST(void *, OPENSSL_BLOCK, p)))
-
-#define sk_OPENSSL_BLOCK_find(sk, out_index, p)                               \
-  sk_find(CHECKED_CAST(_STACK *, STACK_OF(OPENSSL_BLOCK) *, sk), (out_index), \
-          CHECKED_CAST(void *, OPENSSL_BLOCK, p))
-
-#define sk_OPENSSL_BLOCK_shift(sk) \
-  ((OPENSSL_BLOCK)sk_shift(        \
-      CHECKED_CAST(_STACK *, STACK_OF(OPENSSL_BLOCK) *, sk)))
-
-#define sk_OPENSSL_BLOCK_push(sk, p)                             \
-  sk_push(CHECKED_CAST(_STACK *, STACK_OF(OPENSSL_BLOCK) *, sk), \
-          CHECKED_CAST(void *, OPENSSL_BLOCK, p))
-
-#define sk_OPENSSL_BLOCK_pop(sk) \
-  ((OPENSSL_BLOCK)sk_pop(CHECKED_CAST(_STACK *, STACK_OF(OPENSSL_BLOCK) *, sk)))
-
-#define sk_OPENSSL_BLOCK_dup(sk)      \
-  ((STACK_OF(OPENSSL_BLOCK) *)sk_dup( \
-      CHECKED_CAST(const _STACK *, const STACK_OF(OPENSSL_BLOCK) *, sk)))
-
-#define sk_OPENSSL_BLOCK_sort(sk) \
-  sk_sort(CHECKED_CAST(_STACK *, STACK_OF(OPENSSL_BLOCK) *, sk))
-
-#define sk_OPENSSL_BLOCK_is_sorted(sk) \
-  sk_is_sorted(                        \
-      CHECKED_CAST(const _STACK *, const STACK_OF(OPENSSL_BLOCK) *, sk))
-
-#define sk_OPENSSL_BLOCK_set_cmp_func(sk, comp)                                \
-  ((int (*)(const OPENSSL_BLOCK **a, const OPENSSL_BLOCK **b))sk_set_cmp_func( \
-      CHECKED_CAST(_STACK *, STACK_OF(OPENSSL_BLOCK) *, sk),                   \
-      CHECKED_CAST(stack_cmp_func,                                             \
-                   int (*)(const OPENSSL_BLOCK **a, const OPENSSL_BLOCK **b),  \
-                   comp)))
-
-#define sk_OPENSSL_BLOCK_deep_copy(sk, copy_func, free_func)             \
-  ((STACK_OF(OPENSSL_BLOCK) *)sk_deep_copy(                              \
-      CHECKED_CAST(const _STACK *, const STACK_OF(OPENSSL_BLOCK) *, sk), \
-      CHECKED_CAST(void *(*)(void *), OPENSSL_BLOCK (*)(OPENSSL_BLOCK),  \
-                   copy_func),                                           \
-      CHECKED_CAST(void (*)(void *), void (*)(OPENSSL_BLOCK), free_func)))