Skip to content

Commit e37fc57

Browse files
committed
tsan: remove usage of libcrypt and libncurses headers
llvm/llvm-project#153351 Closes ziglang#24736.
1 parent e25168d commit e37fc57

File tree

2 files changed

+0
-38
lines changed

2 files changed

+0
-38
lines changed

lib/libtsan/sanitizer_common/sanitizer_platform_limits_freebsd.cpp

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,8 @@
7070
#include <semaphore.h>
7171
#include <signal.h>
7272
#include <stddef.h>
73-
#include <md5.h>
74-
#include <sha224.h>
75-
#include <sha256.h>
76-
#include <sha384.h>
77-
#include <sha512.h>
7873
#include <stdio.h>
7974
#include <stringlist.h>
80-
#include <term.h>
8175
#include <termios.h>
8276
#include <time.h>
8377
#include <ttyent.h>
@@ -378,22 +372,6 @@ const int si_SEGV_MAPERR = SEGV_MAPERR;
378372
const int si_SEGV_ACCERR = SEGV_ACCERR;
379373
const int unvis_valid = UNVIS_VALID;
380374
const int unvis_validpush = UNVIS_VALIDPUSH;
381-
382-
const unsigned MD5_CTX_sz = sizeof(MD5_CTX);
383-
const unsigned MD5_return_length = MD5_DIGEST_STRING_LENGTH;
384-
385-
#define SHA2_CONST(LEN) \
386-
const unsigned SHA##LEN##_CTX_sz = sizeof(SHA##LEN##_CTX); \
387-
const unsigned SHA##LEN##_return_length = SHA##LEN##_DIGEST_STRING_LENGTH; \
388-
const unsigned SHA##LEN##_block_length = SHA##LEN##_BLOCK_LENGTH; \
389-
const unsigned SHA##LEN##_digest_length = SHA##LEN##_DIGEST_LENGTH
390-
391-
SHA2_CONST(224);
392-
SHA2_CONST(256);
393-
SHA2_CONST(384);
394-
SHA2_CONST(512);
395-
396-
#undef SHA2_CONST
397375
} // namespace __sanitizer
398376

399377
using namespace __sanitizer;

lib/libtsan/sanitizer_common/sanitizer_platform_limits_freebsd.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -708,22 +708,6 @@ extern unsigned IOCTL_KDSKBMODE;
708708
extern const int si_SEGV_MAPERR;
709709
extern const int si_SEGV_ACCERR;
710710

711-
extern const unsigned MD5_CTX_sz;
712-
extern const unsigned MD5_return_length;
713-
714-
#define SHA2_EXTERN(LEN) \
715-
extern const unsigned SHA##LEN##_CTX_sz; \
716-
extern const unsigned SHA##LEN##_return_length; \
717-
extern const unsigned SHA##LEN##_block_length; \
718-
extern const unsigned SHA##LEN##_digest_length
719-
720-
SHA2_EXTERN(224);
721-
SHA2_EXTERN(256);
722-
SHA2_EXTERN(384);
723-
SHA2_EXTERN(512);
724-
725-
#undef SHA2_EXTERN
726-
727711
struct __sanitizer_cap_rights {
728712
u64 cr_rights[2];
729713
};

0 commit comments

Comments
 (0)