diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-10-29 13:07:41 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-10-29 13:07:41 +0000 |
| commit | 5aa82550bedf8b6627fd291e6360743b50d69090 (patch) | |
| tree | c1bf291c929c40fb31749e97c6d09603f38c7695 | |
| parent | Backout chacha. (diff) | |
| download | wireguard-openbsd-5aa82550bedf8b6627fd291e6360743b50d69090.tar.xz wireguard-openbsd-5aa82550bedf8b6627fd291e6360743b50d69090.zip | |
remove tests for LD_HINTS_VERSION_1; ok kettenis
| -rw-r--r-- | libexec/ld.so/ldconfig/sod.c | 7 | ||||
| -rw-r--r-- | libexec/ld.so/sod.c | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/libexec/ld.so/ldconfig/sod.c b/libexec/ld.so/ldconfig/sod.c index 0295b3763a5..fff181d6c8f 100644 --- a/libexec/ld.so/ldconfig/sod.c +++ b/libexec/ld.so/ldconfig/sod.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sod.c,v 1.6 2014/11/19 13:35:37 krw Exp $ */ +/* $OpenBSD: sod.c,v 1.7 2015/10/29 13:07:41 deraadt Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg @@ -172,8 +172,7 @@ _dl_maphints(void) if (HH_BADMAG(*hheader) || hheader->hh_ehints > hsize) goto bad_hints; - if (hheader->hh_version != LD_HINTS_VERSION_1 && - hheader->hh_version != LD_HINTS_VERSION_2) + if (hheader->hh_version != LD_HINTS_VERSION_2) goto bad_hints; hbuckets = (struct hints_bucket *)(addr + hheader->hh_hashtab); @@ -267,8 +266,6 @@ _dl_hinthash(char *cp, int vmajor, int vminor) k = (((k << 1) + (k >> 14)) ^ (*cp++)) & 0x3fff; k = (((k << 1) + (k >> 14)) ^ (vmajor*257)) & 0x3fff; - if (hheader->hh_version == LD_HINTS_VERSION_1) - k = (((k << 1) + (k >> 14)) ^ (vminor*167)) & 0x3fff; return k; } diff --git a/libexec/ld.so/sod.c b/libexec/ld.so/sod.c index bc62f327743..5d1e7d8a22b 100644 --- a/libexec/ld.so/sod.c +++ b/libexec/ld.so/sod.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sod.c,v 1.32 2014/11/18 20:51:00 krw Exp $ */ +/* $OpenBSD: sod.c,v 1.33 2015/10/29 13:07:41 deraadt Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg @@ -180,8 +180,7 @@ _dl_maphints(void) if (HH_BADMAG(*hheader) || hheader->hh_ehints > hsize) goto bad_hints; - if (hheader->hh_version != LD_HINTS_VERSION_1 && - hheader->hh_version != LD_HINTS_VERSION_2) + if (hheader->hh_version != LD_HINTS_VERSION_2) goto bad_hints; hbuckets = (struct hints_bucket *)(addr + hheader->hh_hashtab); @@ -275,8 +274,6 @@ _dl_hinthash(char *cp, int vmajor, int vminor) k = (((k << 1) + (k >> 14)) ^ (*cp++)) & 0x3fff; k = (((k << 1) + (k >> 14)) ^ (vmajor*257)) & 0x3fff; - if (hheader->hh_version == LD_HINTS_VERSION_1) - k = (((k << 1) + (k >> 14)) ^ (vminor*167)) & 0x3fff; return k; } |