summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2015-02-10 11:22:22 +0000
committerjsing <>2015-02-10 11:22:22 +0000
commit2469f93300b26559ef047be50758bab7378dc2f1 (patch)
treec02735ca2fc8cdea318f668cd6add971e7322283 /src
parent8e3767cefee0b61a7599b3ce219675e54c312702 (diff)
downloadopenbsd-2469f93300b26559ef047be50758bab7378dc2f1.tar.gz
openbsd-2469f93300b26559ef047be50758bab7378dc2f1.tar.bz2
openbsd-2469f93300b26559ef047be50758bab7378dc2f1.zip
Remove more IMPLEMENT_STACK_OF noops that have been hiding for the last
15 years.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/asn1/a_strnid.c5
-rw-r--r--src/lib/libcrypto/asn1/asn_mime.c3
-rw-r--r--src/lib/libcrypto/asn1/x_info.c4
-rw-r--r--src/lib/libcrypto/bio/bio_lib.c4
-rw-r--r--src/lib/libcrypto/conf/conf_api.c4
-rw-r--r--src/lib/libcrypto/ex_data.c4
-rw-r--r--src/lib/libcrypto/objects/o_names.c3
-rw-r--r--src/lib/libcrypto/ui/ui_lib.c4
-rw-r--r--src/lib/libcrypto/x509/x509_lu.c5
-rw-r--r--src/lib/libcrypto/x509/x509_trs.c4
-rw-r--r--src/lib/libcrypto/x509v3/v3_cpols.c5
-rw-r--r--src/lib/libcrypto/x509v3/v3_lib.c4
-rw-r--r--src/lib/libcrypto/x509v3/v3_purp.c4
-rw-r--r--src/lib/libssl/src/crypto/asn1/a_strnid.c5
-rw-r--r--src/lib/libssl/src/crypto/asn1/asn_mime.c3
-rw-r--r--src/lib/libssl/src/crypto/asn1/x_info.c4
-rw-r--r--src/lib/libssl/src/crypto/bio/bio_lib.c4
-rw-r--r--src/lib/libssl/src/crypto/conf/conf_api.c4
-rw-r--r--src/lib/libssl/src/crypto/ex_data.c4
-rw-r--r--src/lib/libssl/src/crypto/objects/o_names.c3
-rw-r--r--src/lib/libssl/src/crypto/ui/ui_lib.c4
-rw-r--r--src/lib/libssl/src/crypto/x509/x509_lu.c5
-rw-r--r--src/lib/libssl/src/crypto/x509/x509_trs.c4
-rw-r--r--src/lib/libssl/src/crypto/x509v3/v3_cpols.c5
-rw-r--r--src/lib/libssl/src/crypto/x509v3/v3_lib.c4
-rw-r--r--src/lib/libssl/src/crypto/x509v3/v3_purp.c4
26 files changed, 28 insertions, 78 deletions
diff --git a/src/lib/libcrypto/asn1/a_strnid.c b/src/lib/libcrypto/asn1/a_strnid.c
index 4da45c537e..0744ffb228 100644
--- a/src/lib/libcrypto/asn1/a_strnid.c
+++ b/src/lib/libcrypto/asn1/a_strnid.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: a_strnid.c,v 1.18 2014/10/28 05:46:55 miod Exp $ */ 1/* $OpenBSD: a_strnid.c,v 1.19 2015/02/10 11:22:21 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -290,6 +290,3 @@ st_free(ASN1_STRING_TABLE *tbl)
290 if (tbl->flags & STABLE_FLAGS_MALLOC) 290 if (tbl->flags & STABLE_FLAGS_MALLOC)
291 free(tbl); 291 free(tbl);
292} 292}
293
294
295IMPLEMENT_STACK_OF(ASN1_STRING_TABLE)
diff --git a/src/lib/libcrypto/asn1/asn_mime.c b/src/lib/libcrypto/asn1/asn_mime.c
index 461ee16a4b..4759965489 100644
--- a/src/lib/libcrypto/asn1/asn_mime.c
+++ b/src/lib/libcrypto/asn1/asn_mime.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn_mime.c,v 1.24 2015/02/08 22:17:49 miod Exp $ */ 1/* $OpenBSD: asn_mime.c,v 1.25 2015/02/10 11:22:21 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -79,7 +79,6 @@ typedef struct {
79} MIME_PARAM; 79} MIME_PARAM;
80 80
81DECLARE_STACK_OF(MIME_PARAM) 81DECLARE_STACK_OF(MIME_PARAM)
82IMPLEMENT_STACK_OF(MIME_PARAM)
83 82
84typedef struct { 83typedef struct {
85 char *name; /* Name of line e.g. "content-type" */ 84 char *name; /* Name of line e.g. "content-type" */
diff --git a/src/lib/libcrypto/asn1/x_info.c b/src/lib/libcrypto/asn1/x_info.c
index 6c055fd441..466deaf6ce 100644
--- a/src/lib/libcrypto/asn1/x_info.c
+++ b/src/lib/libcrypto/asn1/x_info.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x_info.c,v 1.14 2014/07/11 08:44:47 jsing Exp $ */ 1/* $OpenBSD: x_info.c,v 1.15 2015/02/10 11:22:21 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -106,5 +106,3 @@ X509_INFO_free(X509_INFO *x)
106 free(x->enc_data); 106 free(x->enc_data);
107 free(x); 107 free(x);
108} 108}
109
110IMPLEMENT_STACK_OF(X509_INFO)
diff --git a/src/lib/libcrypto/bio/bio_lib.c b/src/lib/libcrypto/bio/bio_lib.c
index 477208ed1f..0be56aacde 100644
--- a/src/lib/libcrypto/bio/bio_lib.c
+++ b/src/lib/libcrypto/bio/bio_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bio_lib.c,v 1.21 2014/07/25 06:05:32 doug Exp $ */ 1/* $OpenBSD: bio_lib.c,v 1.22 2015/02/10 11:22:21 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -622,5 +622,3 @@ BIO_number_written(BIO *bio)
622 return bio->num_write; 622 return bio->num_write;
623 return 0; 623 return 0;
624} 624}
625
626IMPLEMENT_STACK_OF(BIO)
diff --git a/src/lib/libcrypto/conf/conf_api.c b/src/lib/libcrypto/conf/conf_api.c
index 2f68de8e3f..efa4be9f6b 100644
--- a/src/lib/libcrypto/conf/conf_api.c
+++ b/src/lib/libcrypto/conf/conf_api.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: conf_api.c,v 1.13 2015/02/10 09:50:12 miod Exp $ */ 1/* $OpenBSD: conf_api.c,v 1.14 2015/02/10 11:22:21 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -289,5 +289,3 @@ err:
289 } 289 }
290 return (v); 290 return (v);
291} 291}
292
293IMPLEMENT_STACK_OF(CONF_VALUE)
diff --git a/src/lib/libcrypto/ex_data.c b/src/lib/libcrypto/ex_data.c
index 7ac5a692c7..231e5df8a3 100644
--- a/src/lib/libcrypto/ex_data.c
+++ b/src/lib/libcrypto/ex_data.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ex_data.c,v 1.17 2014/07/11 08:44:47 jsing Exp $ */ 1/* $OpenBSD: ex_data.c,v 1.18 2015/02/10 11:22:21 jsing Exp $ */
2 2
3/* 3/*
4 * Overhaul notes; 4 * Overhaul notes;
@@ -636,5 +636,3 @@ CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx)
636 else 636 else
637 return (sk_void_value(ad->sk, idx)); 637 return (sk_void_value(ad->sk, idx));
638} 638}
639
640IMPLEMENT_STACK_OF(CRYPTO_EX_DATA_FUNCS)
diff --git a/src/lib/libcrypto/objects/o_names.c b/src/lib/libcrypto/objects/o_names.c
index 9fa5824890..e77e4a1093 100644
--- a/src/lib/libcrypto/objects/o_names.c
+++ b/src/lib/libcrypto/objects/o_names.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: o_names.c,v 1.19 2014/10/28 05:46:56 miod Exp $ */ 1/* $OpenBSD: o_names.c,v 1.20 2015/02/10 11:22:21 jsing Exp $ */
2#include <stdio.h> 2#include <stdio.h>
3#include <stdlib.h> 3#include <stdlib.h>
4#include <string.h> 4#include <string.h>
@@ -24,7 +24,6 @@ typedef struct name_funcs_st {
24} NAME_FUNCS; 24} NAME_FUNCS;
25 25
26DECLARE_STACK_OF(NAME_FUNCS) 26DECLARE_STACK_OF(NAME_FUNCS)
27IMPLEMENT_STACK_OF(NAME_FUNCS)
28 27
29static STACK_OF(NAME_FUNCS) *name_funcs_stack; 28static STACK_OF(NAME_FUNCS) *name_funcs_stack;
30 29
diff --git a/src/lib/libcrypto/ui/ui_lib.c b/src/lib/libcrypto/ui/ui_lib.c
index 2c53f534e7..1c7f81d1f1 100644
--- a/src/lib/libcrypto/ui/ui_lib.c
+++ b/src/lib/libcrypto/ui/ui_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ui_lib.c,v 1.29 2014/10/03 06:02:38 doug Exp $ */ 1/* $OpenBSD: ui_lib.c,v 1.30 2015/02/10 11:22:21 jsing Exp $ */
2/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL 2/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
3 * project 2001. 3 * project 2001.
4 */ 4 */
@@ -66,7 +66,7 @@
66 66
67#include "ui_locl.h" 67#include "ui_locl.h"
68 68
69IMPLEMENT_STACK_OF(UI_STRING_ST) static const UI_METHOD *default_UI_meth = NULL; 69static const UI_METHOD *default_UI_meth = NULL;
70 70
71UI * 71UI *
72UI_new(void) 72UI_new(void)
diff --git a/src/lib/libcrypto/x509/x509_lu.c b/src/lib/libcrypto/x509/x509_lu.c
index 39c82a71f1..e8151b774a 100644
--- a/src/lib/libcrypto/x509/x509_lu.c
+++ b/src/lib/libcrypto/x509/x509_lu.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_lu.c,v 1.18 2014/09/26 19:32:15 miod Exp $ */ 1/* $OpenBSD: x509_lu.c,v 1.19 2015/02/10 11:22:21 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -733,6 +733,3 @@ X509_STORE_set_verify_cb(X509_STORE *ctx,
733{ 733{
734 ctx->verify_cb = verify_cb; 734 ctx->verify_cb = verify_cb;
735} 735}
736
737IMPLEMENT_STACK_OF(X509_LOOKUP)
738IMPLEMENT_STACK_OF(X509_OBJECT)
diff --git a/src/lib/libcrypto/x509/x509_trs.c b/src/lib/libcrypto/x509/x509_trs.c
index 4fa9f81ee7..42fb97f571 100644
--- a/src/lib/libcrypto/x509/x509_trs.c
+++ b/src/lib/libcrypto/x509/x509_trs.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_trs.c,v 1.19 2014/12/06 19:26:37 doug Exp $ */ 1/* $OpenBSD: x509_trs.c,v 1.20 2015/02/10 11:22:21 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -90,8 +90,6 @@ static X509_TRUST trstandard[] = {
90 90
91#define X509_TRUST_COUNT (sizeof(trstandard)/sizeof(X509_TRUST)) 91#define X509_TRUST_COUNT (sizeof(trstandard)/sizeof(X509_TRUST))
92 92
93IMPLEMENT_STACK_OF(X509_TRUST)
94
95static STACK_OF(X509_TRUST) *trtable = NULL; 93static STACK_OF(X509_TRUST) *trtable = NULL;
96 94
97static int 95static int
diff --git a/src/lib/libcrypto/x509v3/v3_cpols.c b/src/lib/libcrypto/x509v3/v3_cpols.c
index 6ceb93d372..f024039fdd 100644
--- a/src/lib/libcrypto/x509v3/v3_cpols.c
+++ b/src/lib/libcrypto/x509v3/v3_cpols.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_cpols.c,v 1.17 2015/02/09 16:03:11 jsing Exp $ */ 1/* $OpenBSD: v3_cpols.c,v 1.18 2015/02/10 11:22:22 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -612,6 +612,3 @@ X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent)
612 else 612 else
613 BIO_printf(out, "%*sNo Qualifiers\n", indent + 2, ""); 613 BIO_printf(out, "%*sNo Qualifiers\n", indent + 2, "");
614} 614}
615
616IMPLEMENT_STACK_OF(X509_POLICY_NODE)
617IMPLEMENT_STACK_OF(X509_POLICY_DATA)
diff --git a/src/lib/libcrypto/x509v3/v3_lib.c b/src/lib/libcrypto/x509v3/v3_lib.c
index 8870177f51..7731c7c544 100644
--- a/src/lib/libcrypto/x509v3/v3_lib.c
+++ b/src/lib/libcrypto/x509v3/v3_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_lib.c,v 1.13 2014/07/11 08:44:49 jsing Exp $ */ 1/* $OpenBSD: v3_lib.c,v 1.14 2015/02/10 11:22:22 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -343,5 +343,3 @@ err:
343 X509V3err(X509V3_F_X509V3_ADD1_I2D, errcode); 343 X509V3err(X509V3_F_X509V3_ADD1_I2D, errcode);
344 return 0; 344 return 0;
345} 345}
346
347IMPLEMENT_STACK_OF(X509V3_EXT_METHOD)
diff --git a/src/lib/libcrypto/x509v3/v3_purp.c b/src/lib/libcrypto/x509v3/v3_purp.c
index b020f87a0f..d1e888482e 100644
--- a/src/lib/libcrypto/x509v3/v3_purp.c
+++ b/src/lib/libcrypto/x509v3/v3_purp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_purp.c,v 1.24 2014/12/06 19:26:37 doug Exp $ */ 1/* $OpenBSD: v3_purp.c,v 1.25 2015/02/10 11:22:22 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2001. 3 * project 2001.
4 */ 4 */
@@ -103,8 +103,6 @@ static X509_PURPOSE xstandard[] = {
103 103
104#define X509_PURPOSE_COUNT (sizeof(xstandard)/sizeof(X509_PURPOSE)) 104#define X509_PURPOSE_COUNT (sizeof(xstandard)/sizeof(X509_PURPOSE))
105 105
106IMPLEMENT_STACK_OF(X509_PURPOSE)
107
108static STACK_OF(X509_PURPOSE) *xptable = NULL; 106static STACK_OF(X509_PURPOSE) *xptable = NULL;
109 107
110static int 108static int
diff --git a/src/lib/libssl/src/crypto/asn1/a_strnid.c b/src/lib/libssl/src/crypto/asn1/a_strnid.c
index 4da45c537e..0744ffb228 100644
--- a/src/lib/libssl/src/crypto/asn1/a_strnid.c
+++ b/src/lib/libssl/src/crypto/asn1/a_strnid.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: a_strnid.c,v 1.18 2014/10/28 05:46:55 miod Exp $ */ 1/* $OpenBSD: a_strnid.c,v 1.19 2015/02/10 11:22:21 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -290,6 +290,3 @@ st_free(ASN1_STRING_TABLE *tbl)
290 if (tbl->flags & STABLE_FLAGS_MALLOC) 290 if (tbl->flags & STABLE_FLAGS_MALLOC)
291 free(tbl); 291 free(tbl);
292} 292}
293
294
295IMPLEMENT_STACK_OF(ASN1_STRING_TABLE)
diff --git a/src/lib/libssl/src/crypto/asn1/asn_mime.c b/src/lib/libssl/src/crypto/asn1/asn_mime.c
index 461ee16a4b..4759965489 100644
--- a/src/lib/libssl/src/crypto/asn1/asn_mime.c
+++ b/src/lib/libssl/src/crypto/asn1/asn_mime.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn_mime.c,v 1.24 2015/02/08 22:17:49 miod Exp $ */ 1/* $OpenBSD: asn_mime.c,v 1.25 2015/02/10 11:22:21 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -79,7 +79,6 @@ typedef struct {
79} MIME_PARAM; 79} MIME_PARAM;
80 80
81DECLARE_STACK_OF(MIME_PARAM) 81DECLARE_STACK_OF(MIME_PARAM)
82IMPLEMENT_STACK_OF(MIME_PARAM)
83 82
84typedef struct { 83typedef struct {
85 char *name; /* Name of line e.g. "content-type" */ 84 char *name; /* Name of line e.g. "content-type" */
diff --git a/src/lib/libssl/src/crypto/asn1/x_info.c b/src/lib/libssl/src/crypto/asn1/x_info.c
index 6c055fd441..466deaf6ce 100644
--- a/src/lib/libssl/src/crypto/asn1/x_info.c
+++ b/src/lib/libssl/src/crypto/asn1/x_info.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x_info.c,v 1.14 2014/07/11 08:44:47 jsing Exp $ */ 1/* $OpenBSD: x_info.c,v 1.15 2015/02/10 11:22:21 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -106,5 +106,3 @@ X509_INFO_free(X509_INFO *x)
106 free(x->enc_data); 106 free(x->enc_data);
107 free(x); 107 free(x);
108} 108}
109
110IMPLEMENT_STACK_OF(X509_INFO)
diff --git a/src/lib/libssl/src/crypto/bio/bio_lib.c b/src/lib/libssl/src/crypto/bio/bio_lib.c
index 477208ed1f..0be56aacde 100644
--- a/src/lib/libssl/src/crypto/bio/bio_lib.c
+++ b/src/lib/libssl/src/crypto/bio/bio_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bio_lib.c,v 1.21 2014/07/25 06:05:32 doug Exp $ */ 1/* $OpenBSD: bio_lib.c,v 1.22 2015/02/10 11:22:21 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -622,5 +622,3 @@ BIO_number_written(BIO *bio)
622 return bio->num_write; 622 return bio->num_write;
623 return 0; 623 return 0;
624} 624}
625
626IMPLEMENT_STACK_OF(BIO)
diff --git a/src/lib/libssl/src/crypto/conf/conf_api.c b/src/lib/libssl/src/crypto/conf/conf_api.c
index 2f68de8e3f..efa4be9f6b 100644
--- a/src/lib/libssl/src/crypto/conf/conf_api.c
+++ b/src/lib/libssl/src/crypto/conf/conf_api.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: conf_api.c,v 1.13 2015/02/10 09:50:12 miod Exp $ */ 1/* $OpenBSD: conf_api.c,v 1.14 2015/02/10 11:22:21 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -289,5 +289,3 @@ err:
289 } 289 }
290 return (v); 290 return (v);
291} 291}
292
293IMPLEMENT_STACK_OF(CONF_VALUE)
diff --git a/src/lib/libssl/src/crypto/ex_data.c b/src/lib/libssl/src/crypto/ex_data.c
index 7ac5a692c7..231e5df8a3 100644
--- a/src/lib/libssl/src/crypto/ex_data.c
+++ b/src/lib/libssl/src/crypto/ex_data.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ex_data.c,v 1.17 2014/07/11 08:44:47 jsing Exp $ */ 1/* $OpenBSD: ex_data.c,v 1.18 2015/02/10 11:22:21 jsing Exp $ */
2 2
3/* 3/*
4 * Overhaul notes; 4 * Overhaul notes;
@@ -636,5 +636,3 @@ CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx)
636 else 636 else
637 return (sk_void_value(ad->sk, idx)); 637 return (sk_void_value(ad->sk, idx));
638} 638}
639
640IMPLEMENT_STACK_OF(CRYPTO_EX_DATA_FUNCS)
diff --git a/src/lib/libssl/src/crypto/objects/o_names.c b/src/lib/libssl/src/crypto/objects/o_names.c
index 9fa5824890..e77e4a1093 100644
--- a/src/lib/libssl/src/crypto/objects/o_names.c
+++ b/src/lib/libssl/src/crypto/objects/o_names.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: o_names.c,v 1.19 2014/10/28 05:46:56 miod Exp $ */ 1/* $OpenBSD: o_names.c,v 1.20 2015/02/10 11:22:21 jsing Exp $ */
2#include <stdio.h> 2#include <stdio.h>
3#include <stdlib.h> 3#include <stdlib.h>
4#include <string.h> 4#include <string.h>
@@ -24,7 +24,6 @@ typedef struct name_funcs_st {
24} NAME_FUNCS; 24} NAME_FUNCS;
25 25
26DECLARE_STACK_OF(NAME_FUNCS) 26DECLARE_STACK_OF(NAME_FUNCS)
27IMPLEMENT_STACK_OF(NAME_FUNCS)
28 27
29static STACK_OF(NAME_FUNCS) *name_funcs_stack; 28static STACK_OF(NAME_FUNCS) *name_funcs_stack;
30 29
diff --git a/src/lib/libssl/src/crypto/ui/ui_lib.c b/src/lib/libssl/src/crypto/ui/ui_lib.c
index 2c53f534e7..1c7f81d1f1 100644
--- a/src/lib/libssl/src/crypto/ui/ui_lib.c
+++ b/src/lib/libssl/src/crypto/ui/ui_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ui_lib.c,v 1.29 2014/10/03 06:02:38 doug Exp $ */ 1/* $OpenBSD: ui_lib.c,v 1.30 2015/02/10 11:22:21 jsing Exp $ */
2/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL 2/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
3 * project 2001. 3 * project 2001.
4 */ 4 */
@@ -66,7 +66,7 @@
66 66
67#include "ui_locl.h" 67#include "ui_locl.h"
68 68
69IMPLEMENT_STACK_OF(UI_STRING_ST) static const UI_METHOD *default_UI_meth = NULL; 69static const UI_METHOD *default_UI_meth = NULL;
70 70
71UI * 71UI *
72UI_new(void) 72UI_new(void)
diff --git a/src/lib/libssl/src/crypto/x509/x509_lu.c b/src/lib/libssl/src/crypto/x509/x509_lu.c
index 39c82a71f1..e8151b774a 100644
--- a/src/lib/libssl/src/crypto/x509/x509_lu.c
+++ b/src/lib/libssl/src/crypto/x509/x509_lu.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_lu.c,v 1.18 2014/09/26 19:32:15 miod Exp $ */ 1/* $OpenBSD: x509_lu.c,v 1.19 2015/02/10 11:22:21 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -733,6 +733,3 @@ X509_STORE_set_verify_cb(X509_STORE *ctx,
733{ 733{
734 ctx->verify_cb = verify_cb; 734 ctx->verify_cb = verify_cb;
735} 735}
736
737IMPLEMENT_STACK_OF(X509_LOOKUP)
738IMPLEMENT_STACK_OF(X509_OBJECT)
diff --git a/src/lib/libssl/src/crypto/x509/x509_trs.c b/src/lib/libssl/src/crypto/x509/x509_trs.c
index 4fa9f81ee7..42fb97f571 100644
--- a/src/lib/libssl/src/crypto/x509/x509_trs.c
+++ b/src/lib/libssl/src/crypto/x509/x509_trs.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_trs.c,v 1.19 2014/12/06 19:26:37 doug Exp $ */ 1/* $OpenBSD: x509_trs.c,v 1.20 2015/02/10 11:22:21 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -90,8 +90,6 @@ static X509_TRUST trstandard[] = {
90 90
91#define X509_TRUST_COUNT (sizeof(trstandard)/sizeof(X509_TRUST)) 91#define X509_TRUST_COUNT (sizeof(trstandard)/sizeof(X509_TRUST))
92 92
93IMPLEMENT_STACK_OF(X509_TRUST)
94
95static STACK_OF(X509_TRUST) *trtable = NULL; 93static STACK_OF(X509_TRUST) *trtable = NULL;
96 94
97static int 95static int
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_cpols.c b/src/lib/libssl/src/crypto/x509v3/v3_cpols.c
index 6ceb93d372..f024039fdd 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_cpols.c
+++ b/src/lib/libssl/src/crypto/x509v3/v3_cpols.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_cpols.c,v 1.17 2015/02/09 16:03:11 jsing Exp $ */ 1/* $OpenBSD: v3_cpols.c,v 1.18 2015/02/10 11:22:22 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -612,6 +612,3 @@ X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent)
612 else 612 else
613 BIO_printf(out, "%*sNo Qualifiers\n", indent + 2, ""); 613 BIO_printf(out, "%*sNo Qualifiers\n", indent + 2, "");
614} 614}
615
616IMPLEMENT_STACK_OF(X509_POLICY_NODE)
617IMPLEMENT_STACK_OF(X509_POLICY_DATA)
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_lib.c b/src/lib/libssl/src/crypto/x509v3/v3_lib.c
index 8870177f51..7731c7c544 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_lib.c
+++ b/src/lib/libssl/src/crypto/x509v3/v3_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_lib.c,v 1.13 2014/07/11 08:44:49 jsing Exp $ */ 1/* $OpenBSD: v3_lib.c,v 1.14 2015/02/10 11:22:22 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -343,5 +343,3 @@ err:
343 X509V3err(X509V3_F_X509V3_ADD1_I2D, errcode); 343 X509V3err(X509V3_F_X509V3_ADD1_I2D, errcode);
344 return 0; 344 return 0;
345} 345}
346
347IMPLEMENT_STACK_OF(X509V3_EXT_METHOD)
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_purp.c b/src/lib/libssl/src/crypto/x509v3/v3_purp.c
index b020f87a0f..d1e888482e 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_purp.c
+++ b/src/lib/libssl/src/crypto/x509v3/v3_purp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_purp.c,v 1.24 2014/12/06 19:26:37 doug Exp $ */ 1/* $OpenBSD: v3_purp.c,v 1.25 2015/02/10 11:22:22 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2001. 3 * project 2001.
4 */ 4 */
@@ -103,8 +103,6 @@ static X509_PURPOSE xstandard[] = {
103 103
104#define X509_PURPOSE_COUNT (sizeof(xstandard)/sizeof(X509_PURPOSE)) 104#define X509_PURPOSE_COUNT (sizeof(xstandard)/sizeof(X509_PURPOSE))
105 105
106IMPLEMENT_STACK_OF(X509_PURPOSE)
107
108static STACK_OF(X509_PURPOSE) *xptable = NULL; 106static STACK_OF(X509_PURPOSE) *xptable = NULL;
109 107
110static int 108static int