wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RT2308: Add extern "C" { ... } wrapper

Browse source 
Add the wrapper to all public header files (Configure
generates one).  Don't bother for those that are just
lists of #define's that do renaming.

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Rich Salz 2014-08-27 15:28:08 -04:00
parent 7b3e11c544
commit 17e80c6bd0
7 changed files with 47 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Configure
View file

@ -1887,6 +1887,9 @@ open(OUT,'>crypto/opensslconf.h.new') || die "unable to create crypto/opensslcon
print OUT "/* opensslconf.h */\n"; print OUT "/* opensslconf.h */\n";
print OUT "/* WARNING: Generated automatically from opensslconf.h.in by Configure. */\n\n"; print OUT "/* WARNING: Generated automatically from opensslconf.h.in by Configure. */\n\n";
print OUT "#ifdef __cplusplus\n";
print OUT "extern \"C\" {\n";
print OUT "#endif\n";
print OUT "/* OpenSSL was configured with the following options: */\n"; print OUT "/* OpenSSL was configured with the following options: */\n";
my $openssl_algorithm_defines_trans = $openssl_algorithm_defines; my $openssl_algorithm_defines_trans = $openssl_algorithm_defines;
$openssl_experimental_defines =~ s/^\s*#\s*define\s+OPENSSL_NO_(.*)/#ifndef OPENSSL_EXPERIMENTAL_$1\n# ifndef OPENSSL_NO_$1\n# define OPENSSL_NO_$1\n# endif\n#endif/mg; $openssl_experimental_defines =~ s/^\s*#\s*define\s+OPENSSL_NO_(.*)/#ifndef OPENSSL_EXPERIMENTAL_$1\n# ifndef OPENSSL_NO_$1\n# define OPENSSL_NO_$1\n# endif\n#endif/mg;
@ -1991,6 +1994,9 @@ while (<IN>)
{ print OUT $_; } { print OUT $_; }
} }
close(IN); close(IN);
print OUT "#ifdef __cplusplus\n";
print OUT "}\n";
print OUT "#endif\n";
close(OUT); close(OUT);
rename("crypto/opensslconf.h","crypto/opensslconf.h.bak") || die "unable to rename crypto/opensslconf.h\n" if -e "crypto/opensslconf.h"; rename("crypto/opensslconf.h","crypto/opensslconf.h.bak") || die "unable to rename crypto/opensslconf.h\n" if -e "crypto/opensslconf.h";
rename("crypto/opensslconf.h.new","crypto/opensslconf.h") || die "unable to rename crypto/opensslconf.h.new\n"; rename("crypto/opensslconf.h.new","crypto/opensslconf.h") || die "unable to rename crypto/opensslconf.h.new\n";

7
crypto/ebcdic.h
View file

@ -5,6 +5,10 @@
#include <sys/types.h> #include <sys/types.h>
#ifdef __cplusplus
extern "C" {
#endif
/* Avoid name clashes with other applications */ /* Avoid name clashes with other applications */
#define os_toascii _openssl_os_toascii #define os_toascii _openssl_os_toascii
#define os_toebcdic _openssl_os_toebcdic #define os_toebcdic _openssl_os_toebcdic
@ -16,4 +20,7 @@ extern const unsigned char os_toebcdic[256];
void *ebcdic2ascii(void *dest, const void *srce, size_t count); void *ebcdic2ascii(void *dest, const void *srce, size_t count);
void *ascii2ebcdic(void *dest, const void *srce, size_t count); void *ascii2ebcdic(void *dest, const void *srce, size_t count);
#ifdef __cplusplus
}
#endif
#endif #endif

6
crypto/modes/modes.h
View file

@ -7,6 +7,9 @@
#include <stddef.h> #include <stddef.h>
#ifdef __cplusplus
extern "C" {
#endif
typedef void (*block128_f)(const unsigned char in[16], typedef void (*block128_f)(const unsigned char in[16],
unsigned char out[16], unsigned char out[16],
const void *key); const void *key);
@ -147,3 +150,6 @@ size_t CRYPTO_128_wrap_pad(void *key, const unsigned char *icv,
size_t CRYPTO_128_unwrap_pad(void *key, const unsigned char *icv, size_t CRYPTO_128_unwrap_pad(void *key, const unsigned char *icv,
unsigned char *out, unsigned char *out,
const unsigned char *in, size_t inlen, block128_f block); const unsigned char *in, size_t inlen, block128_f block);
#ifdef __cplusplus
}
#endif

7
crypto/opensslv.h
View file

@ -1,6 +1,10 @@
#ifndef HEADER_OPENSSLV_H #ifndef HEADER_OPENSSLV_H
#define HEADER_OPENSSLV_H #define HEADER_OPENSSLV_H
#ifdef __cplusplus
extern "C" {
#endif
/* Numeric release version identifier: /* Numeric release version identifier:
* MNNFFPPS: major minor fix patch status * MNNFFPPS: major minor fix patch status
* The status nibble has one of the values 0 for development, 1 to e for betas * The status nibble has one of the values 0 for development, 1 to e for betas
@ -86,4 +90,7 @@
#define SHLIB_VERSION_NUMBER "1.1.0" #define SHLIB_VERSION_NUMBER "1.1.0"
#ifdef __cplusplus
}
#endif
#endif /* HEADER_OPENSSLV_H */ #endif /* HEADER_OPENSSLV_H */

7
crypto/ossl_typ.h
View file

@ -55,6 +55,10 @@
#ifndef HEADER_OPENSSL_TYPES_H #ifndef HEADER_OPENSSL_TYPES_H
#define HEADER_OPENSSL_TYPES_H #define HEADER_OPENSSL_TYPES_H
#ifdef __cplusplus
extern "C" {
#endif
#include <openssl/e_os2.h> #include <openssl/e_os2.h>
#ifdef NO_ASN1_TYPEDEFS #ifdef NO_ASN1_TYPEDEFS
@ -202,4 +206,7 @@ typedef struct ocsp_req_ctx_st OCSP_REQ_CTX;
typedef struct ocsp_response_st OCSP_RESPONSE; typedef struct ocsp_response_st OCSP_RESPONSE;
typedef struct ocsp_responder_id_st OCSP_RESPID; typedef struct ocsp_responder_id_st OCSP_RESPID;
#ifdef __cplusplus
}
#endif
#endif /* def HEADER_OPENSSL_TYPES_H */ #endif /* def HEADER_OPENSSL_TYPES_H */

6
crypto/pqueue/pqueue.h
View file

@ -64,6 +64,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef __cplusplus
extern "C" {
#endif
typedef struct _pqueue *pqueue; typedef struct _pqueue *pqueue;
typedef struct _pitem typedef struct _pitem
@ -91,4 +94,7 @@ pitem *pqueue_next(piterator *iter);
void pqueue_print(pqueue pq); void pqueue_print(pqueue pq);
int pqueue_size(pqueue pq); int pqueue_size(pqueue pq);
#ifdef __cplusplus
}
#endif
#endif /* ! HEADER_PQUEUE_H */ #endif /* ! HEADER_PQUEUE_H */

8
crypto/stack/safestack.h
View file

@ -57,6 +57,10 @@
#include <openssl/stack.h> #include <openssl/stack.h>
#ifdef __cplusplus
extern "C" {
#endif
#ifndef CHECKED_PTR_OF #ifndef CHECKED_PTR_OF
#define CHECKED_PTR_OF(type, p) \ #define CHECKED_PTR_OF(type, p) \
((void*) (1 ? p : (type*)0)) ((void*) (1 ? p : (type*)0))
@ -2798,4 +2802,8 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
#define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh) #define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh)
/* End of util/mkstack.pl block, you may now edit :-) */ /* End of util/mkstack.pl block, you may now edit :-) */
#ifdef __cplusplus
}
#endif
#endif /* !defined HEADER_SAFESTACK_H */ #endif /* !defined HEADER_SAFESTACK_H */