diff options
author | jsing <> | 2015-02-22 15:19:56 +0000 |
---|---|---|
committer | jsing <> | 2015-02-22 15:19:56 +0000 |
commit | 3f90621762c98f948fa98621db214a2faeca0885 (patch) | |
tree | 403c64a37360372771e028a50a58b35bd1f45c10 | |
parent | 95effbae9971947851677805d2c07692ec1e9d81 (diff) | |
download | openbsd-3f90621762c98f948fa98621db214a2faeca0885.tar.gz openbsd-3f90621762c98f948fa98621db214a2faeca0885.tar.bz2 openbsd-3f90621762c98f948fa98621db214a2faeca0885.zip |
Remove IMPLEMENT_STACK_OF noops.
-rw-r--r-- | src/lib/libcrypto/asn1/asn_mime.c | 3 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/asn1/asn_mime.c | 3 | ||||
-rw-r--r-- | src/lib/libssl/src/ssl/ssl_lib.c | 3 | ||||
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/src/lib/libcrypto/asn1/asn_mime.c b/src/lib/libcrypto/asn1/asn_mime.c index 4759965489..1d82f1a76f 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.25 2015/02/10 11:22:21 jsing Exp $ */ | 1 | /* $OpenBSD: asn_mime.c,v 1.26 2015/02/22 15:19:56 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 | */ |
@@ -87,7 +87,6 @@ typedef struct { | |||
87 | } MIME_HEADER; | 87 | } MIME_HEADER; |
88 | 88 | ||
89 | DECLARE_STACK_OF(MIME_HEADER) | 89 | DECLARE_STACK_OF(MIME_HEADER) |
90 | IMPLEMENT_STACK_OF(MIME_HEADER) | ||
91 | 90 | ||
92 | static int asn1_output_data(BIO *out, BIO *data, ASN1_VALUE *val, int flags, | 91 | static int asn1_output_data(BIO *out, BIO *data, ASN1_VALUE *val, int flags, |
93 | const ASN1_ITEM *it); | 92 | const ASN1_ITEM *it); |
diff --git a/src/lib/libssl/src/crypto/asn1/asn_mime.c b/src/lib/libssl/src/crypto/asn1/asn_mime.c index 4759965489..1d82f1a76f 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.25 2015/02/10 11:22:21 jsing Exp $ */ | 1 | /* $OpenBSD: asn_mime.c,v 1.26 2015/02/22 15:19:56 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 | */ |
@@ -87,7 +87,6 @@ typedef struct { | |||
87 | } MIME_HEADER; | 87 | } MIME_HEADER; |
88 | 88 | ||
89 | DECLARE_STACK_OF(MIME_HEADER) | 89 | DECLARE_STACK_OF(MIME_HEADER) |
90 | IMPLEMENT_STACK_OF(MIME_HEADER) | ||
91 | 90 | ||
92 | static int asn1_output_data(BIO *out, BIO *data, ASN1_VALUE *val, int flags, | 91 | static int asn1_output_data(BIO *out, BIO *data, ASN1_VALUE *val, int flags, |
93 | const ASN1_ITEM *it); | 92 | const ASN1_ITEM *it); |
diff --git a/src/lib/libssl/src/ssl/ssl_lib.c b/src/lib/libssl/src/ssl/ssl_lib.c index 34f8308920..32feaa57e9 100644 --- a/src/lib/libssl/src/ssl/ssl_lib.c +++ b/src/lib/libssl/src/ssl/ssl_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_lib.c,v 1.98 2015/02/11 03:19:37 doug Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.99 2015/02/22 15:19:56 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 | * |
@@ -3068,5 +3068,4 @@ SSL_cache_hit(SSL *s) | |||
3068 | return (s->hit); | 3068 | return (s->hit); |
3069 | } | 3069 | } |
3070 | 3070 | ||
3071 | IMPLEMENT_STACK_OF(SSL_CIPHER) | ||
3072 | IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER, ssl_cipher_id); | 3071 | IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER, ssl_cipher_id); |
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 34f8308920..32feaa57e9 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_lib.c,v 1.98 2015/02/11 03:19:37 doug Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.99 2015/02/22 15:19:56 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 | * |
@@ -3068,5 +3068,4 @@ SSL_cache_hit(SSL *s) | |||
3068 | return (s->hit); | 3068 | return (s->hit); |
3069 | } | 3069 | } |
3070 | 3070 | ||
3071 | IMPLEMENT_STACK_OF(SSL_CIPHER) | ||
3072 | IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER, ssl_cipher_id); | 3071 | IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER, ssl_cipher_id); |