diff options
author | jsing <> | 2014-07-10 20:02:58 +0000 |
---|---|---|
committer | jsing <> | 2014-07-10 20:02:58 +0000 |
commit | 6e361a5efba1d72a7ea4416e1d69e02910fa9414 (patch) | |
tree | c1d20c4ad7dbf2e90d96a45f44bf412891cce0f3 | |
parent | 930549a539b1cba2e0741b2da044d35fcf28cacf (diff) | |
download | openbsd-6e361a5efba1d72a7ea4416e1d69e02910fa9414.tar.gz openbsd-6e361a5efba1d72a7ea4416e1d69e02910fa9414.tar.bz2 openbsd-6e361a5efba1d72a7ea4416e1d69e02910fa9414.zip |
Nuke OPENSSL_NONPIC_relocated since nothing uses it.
ok miod@
-rw-r--r-- | src/lib/libcrypto/cryptlib.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/cryptlib.h | 3 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/cryptlib.c | 3 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/cryptlib.h | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/src/lib/libcrypto/cryptlib.c b/src/lib/libcrypto/cryptlib.c index 221a50b70a..86f51917e2 100644 --- a/src/lib/libcrypto/cryptlib.c +++ b/src/lib/libcrypto/cryptlib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cryptlib.c,v 1.28 2014/07/10 13:58:21 jsing Exp $ */ | 1 | /* $OpenBSD: cryptlib.c,v 1.29 2014/07/10 20:02:58 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -680,7 +680,6 @@ OPENSSL_ia32cap_loc(void) | |||
680 | return NULL; | 680 | return NULL; |
681 | } | 681 | } |
682 | #endif | 682 | #endif |
683 | int OPENSSL_NONPIC_relocated = 0; | ||
684 | 683 | ||
685 | #if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ) | 684 | #if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ) |
686 | void | 685 | void |
diff --git a/src/lib/libcrypto/cryptlib.h b/src/lib/libcrypto/cryptlib.h index b45f2c03b4..bd4c4da3aa 100644 --- a/src/lib/libcrypto/cryptlib.h +++ b/src/lib/libcrypto/cryptlib.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cryptlib.h,v 1.20 2014/07/10 13:58:21 jsing Exp $ */ | 1 | /* $OpenBSD: cryptlib.h,v 1.21 2014/07/10 20:02:58 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -84,7 +84,6 @@ void OPENSSL_cpuid_setup(void); | |||
84 | extern unsigned int OPENSSL_ia32cap_P[]; | 84 | extern unsigned int OPENSSL_ia32cap_P[]; |
85 | void OPENSSL_showfatal(const char *fmta,...); | 85 | void OPENSSL_showfatal(const char *fmta,...); |
86 | void *OPENSSL_stderr(void); | 86 | void *OPENSSL_stderr(void); |
87 | extern int OPENSSL_NONPIC_relocated; | ||
88 | 87 | ||
89 | #ifdef __cplusplus | 88 | #ifdef __cplusplus |
90 | } | 89 | } |
diff --git a/src/lib/libssl/src/crypto/cryptlib.c b/src/lib/libssl/src/crypto/cryptlib.c index 221a50b70a..86f51917e2 100644 --- a/src/lib/libssl/src/crypto/cryptlib.c +++ b/src/lib/libssl/src/crypto/cryptlib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cryptlib.c,v 1.28 2014/07/10 13:58:21 jsing Exp $ */ | 1 | /* $OpenBSD: cryptlib.c,v 1.29 2014/07/10 20:02:58 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -680,7 +680,6 @@ OPENSSL_ia32cap_loc(void) | |||
680 | return NULL; | 680 | return NULL; |
681 | } | 681 | } |
682 | #endif | 682 | #endif |
683 | int OPENSSL_NONPIC_relocated = 0; | ||
684 | 683 | ||
685 | #if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ) | 684 | #if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ) |
686 | void | 685 | void |
diff --git a/src/lib/libssl/src/crypto/cryptlib.h b/src/lib/libssl/src/crypto/cryptlib.h index b45f2c03b4..bd4c4da3aa 100644 --- a/src/lib/libssl/src/crypto/cryptlib.h +++ b/src/lib/libssl/src/crypto/cryptlib.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cryptlib.h,v 1.20 2014/07/10 13:58:21 jsing Exp $ */ | 1 | /* $OpenBSD: cryptlib.h,v 1.21 2014/07/10 20:02:58 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -84,7 +84,6 @@ void OPENSSL_cpuid_setup(void); | |||
84 | extern unsigned int OPENSSL_ia32cap_P[]; | 84 | extern unsigned int OPENSSL_ia32cap_P[]; |
85 | void OPENSSL_showfatal(const char *fmta,...); | 85 | void OPENSSL_showfatal(const char *fmta,...); |
86 | void *OPENSSL_stderr(void); | 86 | void *OPENSSL_stderr(void); |
87 | extern int OPENSSL_NONPIC_relocated; | ||
88 | 87 | ||
89 | #ifdef __cplusplus | 88 | #ifdef __cplusplus |
90 | } | 89 | } |