mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

There are two actual uses of e_os2.h in libssl - an OPENSSL_GLOBAL (an

Browse Source 
empty define) and an OPENSSL_EXTERN (which is defined as, well... extern).
The use of OPENSSL_EXTERN is already inconsistent since the lines above
and below just use plain old "extern". Expand the two uses of these macros
and stop including e_os2.h in libssl.

ok miod@
This commit is contained in:
jsing 2014-05-22 17:43:52 +00:00
parent 46859c4ae3
commit 68b99d3222
8 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libssl/s3_lib.c
View File

@ -166,7 +166,7 @@ const char ssl3_version_str[]="SSLv3" OPENSSL_VERSION_PTEXT;
#define SSL3_NUM_CIPHERS (sizeof(ssl3_ciphers) / sizeof(SSL_CIPHER))
/* list of available SSLv3 ciphers (sorted by id) */
OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
SSL_CIPHER ssl3_ciphers[] = {
/* The RSA ciphers */
/* Cipher 01 */

2
lib/libssl/src/ssl/s3_lib.c
View File

@ -166,7 +166,7 @@ const char ssl3_version_str[]="SSLv3" OPENSSL_VERSION_PTEXT;
#define SSL3_NUM_CIPHERS (sizeof(ssl3_ciphers) / sizeof(SSL_CIPHER))
/* list of available SSLv3 ciphers (sorted by id) */
OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
SSL_CIPHER ssl3_ciphers[] = {
/* The RSA ciphers */
/* Cipher 01 */

2
lib/libssl/src/ssl/ssl.h
View File

@ -143,8 +143,6 @@
#ifndef HEADER_SSL_H
#define HEADER_SSL_H
#include <openssl/e_os2.h>
#ifndef OPENSSL_NO_COMP
#include <openssl/comp.h>
#endif

1
lib/libssl/src/ssl/ssl_cert.c
View File

@ -121,7 +121,6 @@
#include <dirent.h>
#include <openssl/opensslconf.h>
#include <openssl/e_os2.h>
#include <openssl/objects.h>
#include <openssl/bio.h>
#include <openssl/pem.h>

4
lib/libssl/src/ssl/ssl_locl.h
View File

@ -152,7 +152,6 @@
#include <unistd.h>
#include <openssl/opensslconf.h>
#include <openssl/e_os2.h>
#include <openssl/buffer.h>
#ifndef OPENSSL_NO_COMP
#include <openssl/comp.h>
@ -566,8 +565,7 @@ typedef struct ssl3_comp_st {
#endif
extern SSL3_ENC_METHOD ssl3_undef_enc_method;
OPENSSL_EXTERN SSL_CIPHER ssl3_ciphers[];
extern SSL_CIPHER ssl3_ciphers[];
SSL_METHOD *ssl_bad_method(int ver);

2
lib/libssl/ssl.h
View File

@ -143,8 +143,6 @@
#ifndef HEADER_SSL_H
#define HEADER_SSL_H
#include <openssl/e_os2.h>
#ifndef OPENSSL_NO_COMP
#include <openssl/comp.h>
#endif

1
lib/libssl/ssl_cert.c
View File

@ -121,7 +121,6 @@
#include <dirent.h>
#include <openssl/opensslconf.h>
#include <openssl/e_os2.h>
#include <openssl/objects.h>
#include <openssl/bio.h>
#include <openssl/pem.h>

4
lib/libssl/ssl_locl.h
View File

@ -152,7 +152,6 @@
#include <unistd.h>
#include <openssl/opensslconf.h>
#include <openssl/e_os2.h>
#include <openssl/buffer.h>
#ifndef OPENSSL_NO_COMP
#include <openssl/comp.h>
@ -566,8 +565,7 @@ typedef struct ssl3_comp_st {
#endif
extern SSL3_ENC_METHOD ssl3_undef_enc_method;
OPENSSL_EXTERN SSL_CIPHER ssl3_ciphers[];
extern SSL_CIPHER ssl3_ciphers[];
SSL_METHOD *ssl_bad_method(int ver);