diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-05-02 12:16:01 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-05-02 12:16:01 +0000 |
| commit | 82271cee5b6369c263213845f8a81be40d5d5585 (patch) | |
| tree | 43a5b74770b864de29034a7954b98703b103b920 /crypto/x509 | |
| parent | 22a415478fa196d08a33a3be3f2e20a49b2ef43a (diff) | |
| download | openssl-82271cee5b6369c263213845f8a81be40d5d5585.zip openssl-82271cee5b6369c263213845f8a81be40d5d5585.tar.gz openssl-82271cee5b6369c263213845f8a81be40d5d5585.tar.bz2 | |
In Message-ID: <003201bfb332$14a07520$0801a8c0@janm.transactionsite.com>,
"Jan Mikkelsen" <janm@transactionsite.com> correctly states that the
OpenSSL header files have #include's and extern "C"'s in an incorrect
order. Thusly fixed.
Diffstat (limited to 'crypto/x509')
| -rw-r--r-- | crypto/x509/x509.h | 16 | ||||
| -rw-r--r-- | crypto/x509/x509_vfy.h | 6 |
2 files changed, 15 insertions, 7 deletions
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h index 0192272..57f9bab 100644 --- a/crypto/x509/x509.h +++ b/crypto/x509/x509.h @@ -59,10 +59,6 @@ #ifndef HEADER_X509_H #define HEADER_X509_H -#ifdef __cplusplus -extern "C" { -#endif - #ifdef VMS #undef X509_REVOKED_get_ext_by_critical #define X509_REVOKED_get_ext_by_critical X509_REVOKED_get_ext_by_critic @@ -87,6 +83,10 @@ extern "C" { #include <openssl/evp.h> +#ifdef __cplusplus +extern "C" { +#endif + #ifdef WIN32 /* Under Win32 this is defined in wincrypt.h */ #undef X509_NAME @@ -445,9 +445,17 @@ typedef struct pkcs8_priv_key_info_st STACK_OF(X509_ATTRIBUTE) *attributes; } PKCS8_PRIV_KEY_INFO; +#ifdef __cplusplus +} +#endif + #include <openssl/x509_vfy.h> #include <openssl/pkcs7.h> +#ifdef __cplusplus +extern "C" { +#endif + #ifdef SSLEAY_MACROS #define X509_verify(a,r) ASN1_verify((int (*)())i2d_X509_CINF,a->sig_alg,\ a->signature,(char *)a->cert_info,r) diff --git a/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h index 4637aec..9173943 100644 --- a/crypto/x509/x509_vfy.h +++ b/crypto/x509/x509_vfy.h @@ -65,13 +65,13 @@ #ifndef HEADER_X509_VFY_H #define HEADER_X509_VFY_H +#include <openssl/bio.h> +#include <openssl/crypto.h> + #ifdef __cplusplus extern "C" { #endif -#include <openssl/bio.h> -#include <openssl/crypto.h> - /* Outer object */ typedef struct x509_hash_dir_st { |