diff options
| author |   William Ahern <william@25thandclement.com>
| 2016-11-23 18:11:37 -0800 |
|---|---|---|
| committer | William Ahern <william@25thandclement.com>
| 2016-11-23 18:11:37 -0800 |
| commit | a45ea1e4ffd195c45cde3f79df576460272b66fa (patch) | |
| tree | e6329fa1b5f3e72809b1faf61834079692483e4a | |
| parent | 7eab0a7ba9b8c1a1e48e03ceb913f2c9c9cefe6d (diff) | |
| download | luaossl-a45ea1e4ffd195c45cde3f79df576460272b66fa.tar.gz luaossl-a45ea1e4ffd195c45cde3f79df576460272b66fa.tar.bz2 luaossl-a45ea1e4ffd195c45cde3f79df576460272b66fa.zip | |
restore alphabetical ordering of definitions
| -rw-r--r-- | src/openssl.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/openssl.c b/src/openssl.c index ee2cd68..c33d934 100644 --- a/src/openssl.c +++ b/src/openssl.c @@ -281,14 +281,14 @@ #define HAVE_X509_STORE_REFERENCES (!OPENSSL_PREREQ(1,1,0)) #endif -#ifndef HAVE_X509_UP_REF -#define HAVE_X509_UP_REF OPENSSL_PREREQ(1,1,0) -#endif - #ifndef HAVE_X509_STORE_UP_REF #define HAVE_X509_STORE_UP_REF OPENSSL_PREREQ(1,1,0) #endif +#ifndef HAVE_X509_UP_REF +#define HAVE_X509_UP_REF OPENSSL_PREREQ(1,1,0) +#endif + #ifndef HMAC_INIT_EX_INT #define HMAC_INIT_EX_INT OPENSSL_PREREQ(1,0,0) #endif @@ -1629,28 +1629,28 @@ static void compat_init_X509_STORE_onfree(void *store, void *data NOTUSED, CRYPT compat.tmp.store = NULL; } /* compat_init_X509_STORE_onfree() */ -#if !HAVE_X509_UP_REF -#define X509_up_ref(...) compat_X509_up_ref(__VA_ARGS__) +#if !HAVE_X509_STORE_UP_REF +#define X509_STORE_up_ref(...) compat_X509_STORE_up_ref(__VA_ARGS__) -static int compat_X509_up_ref(X509 *crt) { +static int compat_X509_STORE_up_ref(X509_STORE *crt) { /* our caller should already have had a proper reference */ - if (CRYPTO_add(&crt->references, 1, CRYPTO_LOCK_X509) < 2) + if (CRYPTO_add(&crt->references, 1, CRYPTO_LOCK_X509_STORE) < 2) return 0; /* fail */ return 1; -} /* compat_X509_up_ref() */ +} /* compat_X509_STORE_up_ref() */ #endif -#if !HAVE_X509_STORE_UP_REF -#define X509_STORE_up_ref(...) compat_X509_STORE_up_ref(__VA_ARGS__) +#if !HAVE_X509_UP_REF +#define X509_up_ref(...) compat_X509_up_ref(__VA_ARGS__) -static int compat_X509_STORE_up_ref(X509_STORE *crt) { +static int compat_X509_up_ref(X509 *crt) { /* our caller should already have had a proper reference */ - if (CRYPTO_add(&crt->references, 1, CRYPTO_LOCK_X509_STORE) < 2) + if (CRYPTO_add(&crt->references, 1, CRYPTO_LOCK_X509) < 2) return 0; /* fail */ return 1; -} /* compat_X509_STORE_up_ref() */ +} /* compat_X509_up_ref() */ #endif static int compat_init(void) { |