diff options
author | delphij <delphij@FreeBSD.org> | 2014-10-21 19:00:32 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2014-10-21 19:00:32 +0000 |
commit | c8355117f700e2cffc517edc3f7521665c326fca (patch) | |
tree | f68eb5a329ab50a208c89c53df494041b1c620db /crypto/openssl/Configure | |
parent | a9539c532afcf2cba8c34cf3b9261be4fdeb9cd4 (diff) | |
download | FreeBSD-src-c8355117f700e2cffc517edc3f7521665c326fca.zip FreeBSD-src-c8355117f700e2cffc517edc3f7521665c326fca.tar.gz |
MFS r273149 (jkim): MFC: r273144, r273146
Merge OpenSSL 1.0.1j.
This is part of an upcoming FreeBSD security advisory.
Approved by: re (so@ blanket)
Diffstat (limited to 'crypto/openssl/Configure')
-rwxr-xr-x | crypto/openssl/Configure | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crypto/openssl/Configure b/crypto/openssl/Configure index 36844b7..6f0da76 100755 --- a/crypto/openssl/Configure +++ b/crypto/openssl/Configure @@ -1767,6 +1767,9 @@ open(OUT,'>crypto/opensslconf.h.new') || die "unable to create crypto/opensslcon print OUT "/* opensslconf.h */\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"; 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; @@ -1871,6 +1874,9 @@ while (<IN>) { print OUT $_; } } close(IN); +print OUT "#ifdef __cplusplus\n"; +print OUT "}\n"; +print OUT "#endif\n"; 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.new","crypto/opensslconf.h") || die "unable to rename crypto/opensslconf.h.new\n"; |