From: Rob Percival <robpercival@google.com>
Date: Wed, 19 Oct 2016 14:42:05 +0000 (+0100)
Subject: Move SCT_LIST_free definition into a more logical place
X-Git-Tag: OpenSSL_1_1_1-pre1~3028
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e1940e9f7a73bf3a560fbe3550a9b69a612118ec;p=oweals%2Fopenssl.git

Move SCT_LIST_free definition into a more logical place

This reflects its position in include/openssl/ct.h.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1548)
---

diff --git a/crypto/ct/ct_oct.c b/crypto/ct/ct_oct.c
index cacc3bd2b4..d3edd39f5d 100644
--- a/crypto/ct/ct_oct.c
+++ b/crypto/ct/ct_oct.c
@@ -254,11 +254,6 @@ err:
     return -1;
 }
 
-void SCT_LIST_free(STACK_OF(SCT) *a)
-{
-    sk_SCT_pop_free(a, SCT_free);
-}
-
 STACK_OF(SCT) *o2i_SCT_LIST(STACK_OF(SCT) **a, const unsigned char **pp,
                             size_t len)
 {
diff --git a/crypto/ct/ct_sct.c b/crypto/ct/ct_sct.c
index 1b13d9e6cb..1dc16857ba 100644
--- a/crypto/ct/ct_sct.c
+++ b/crypto/ct/ct_sct.c
@@ -45,6 +45,11 @@ void SCT_free(SCT *sct)
     OPENSSL_free(sct);
 }
 
+void SCT_LIST_free(STACK_OF(SCT) *a)
+{
+    sk_SCT_pop_free(a, SCT_free);
+}
+
 int SCT_set_version(SCT *sct, sct_version_t version)
 {
     if (version != SCT_VERSION_V1) {