Index: trunk/src/CuTest.c =================================================================== --- trunk/src/CuTest.c (revision 591) +++ (revision ) @@ -1,350 +1,0 @@ -/******************* - -LICENSE - -Copyright (c) 2003 Asim Jalis - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not -claim that you wrote the original software. If you use this software in -a product, an acknowledgment in the product documentation would be -appreciated but is not required. - -2. Altered source versions must be plainly marked as such, and must not -be misrepresented as being the original software. - -3. This notice may not be removed or altered from any source -distribution. - -**********************/ - -#include -#include -#include -#include -#include -#include -#include - -#include "CuTest.h" - -/*-------------------------------------------------------------------------* - * CuStr - *-------------------------------------------------------------------------*/ - -char* CuStrAlloc(int size) -{ - char* newStr = (char*) malloc( sizeof(char) * (size) ); - return newStr; -} - -char* CuStrCopy(const char* old) -{ - int len = strlen(old); - char* newStr = CuStrAlloc(len + 1); - strcpy(newStr, old); - return newStr; -} - -/*-------------------------------------------------------------------------* - * CuString - *-------------------------------------------------------------------------*/ - -void CuStringInit(CuString* str) -{ - str->length = 0; - str->size = STRING_MAX; - str->buffer = (char*) malloc(sizeof(char) * str->size); - if (str->buffer) - str->buffer[0] = '\0'; - else - { - perror("CuStringInit"); - _exit (EXIT_FAILURE); - } -} - -CuString* CuStringNew(void) -{ - CuString* str = (CuString*) malloc(sizeof(CuString)); - str->length = 0; - str->size = STRING_MAX; - str->buffer = (char*) malloc(sizeof(char) * str->size); - if (str->buffer) - str->buffer[0] = '\0'; - else - { - perror("CuStringNew"); - _exit (EXIT_FAILURE); - } - return str; -} - -void CuStringResize(CuString* str, int newSize) -{ - str->buffer = (char*) realloc(str->buffer, sizeof(char) * newSize); - str->size = newSize; -} - -void CuStringAppend(CuString* str, const char* text) -{ - int length; - - if (text == NULL) { - text = "NULL"; - } - - length = strlen(text); - if (str->length + length + 1 >= str->size) - CuStringResize(str, str->length + length + 1 + STRING_INC); - str->length += length; - strcat(str->buffer, text); -} - -void CuStringAppendChar(CuString* str, char ch) -{ - char text[2]; - text[0] = ch; - text[1] = '\0'; - CuStringAppend(str, text); -} - -void CuStringAppendFormat(CuString* str, const char* format, ...) -{ - va_list argp; - char buf[2048]; - va_start(argp, format); - vsnprintf(buf, sizeof(buf), format, argp); - va_end(argp); - CuStringAppend(str, buf); -} - -void CuStringInsert(CuString* str, const char* text, int pos) -{ - int length = strlen(text); - if (pos > str->length) - pos = str->length; - if (str->length + length + 1 >= str->size) - CuStringResize(str, str->length + length + 1 + STRING_INC); - memmove(str->buffer + pos + length, str->buffer + pos, (str->length - pos) + 1); - str->length += length; - memcpy(str->buffer + pos, text, length); -} - -/*-------------------------------------------------------------------------* - * CuTest - *-------------------------------------------------------------------------*/ - -void CuTestInit(CuTest* t, const char* name, TestFunction function) -{ - t->name = CuStrCopy(name); - t->failed = 0; - t->ran = 0; - t->message = NULL; - t->function = function; - t->jumpBuf = NULL; -} - -CuTest* CuTestNew(const char* name, TestFunction function) -{ - CuTest* tc = CU_ALLOC(CuTest); - CuTestInit(tc, name, function); - return tc; -} - -void CuTestRun(CuTest* tc) -{ - jmp_buf buf; - tc->jumpBuf = &buf; - if (setjmp(buf) == 0) - { - tc->ran = 1; - (tc->function)(tc); - } - tc->jumpBuf = 0; -} - -static void CuFailInternal(CuTest* tc, const char* file, int line, CuString* string) -{ - char buf[256]; - - snprintf(buf, sizeof(buf), "%s:%d: ", file, line); - CuStringInsert(string, buf, 0); - - tc->failed = 1; - tc->message = string->buffer; - if (tc->jumpBuf != 0) longjmp(*(tc->jumpBuf), 0); -} - -void CuFail_Line(CuTest* tc, const char* file, int line, const char* message2, const char* message) -{ - CuString string; - - CuStringInit(&string); - if (message2 != NULL) - { - CuStringAppend(&string, message2); - CuStringAppend(&string, ": "); - } - CuStringAppend(&string, message); - CuFailInternal(tc, file, line, &string); -} - -void CuAssert_Line(CuTest* tc, const char* file, int line, const char* message, int condition) -{ - if (condition) return; - CuFail_Line(tc, file, line, NULL, message); -} - -void CuAssertStrEquals_LineMsg(CuTest* tc, const char* file, int line, const char* message, - const char* expected, const char* actual) -{ - CuString string; - if ((expected == NULL && actual == NULL) || - (expected != NULL && actual != NULL && - strcmp(expected, actual) == 0)) - { - return; - } - - CuStringInit(&string); - if (message != NULL) - { - CuStringAppend(&string, message); - CuStringAppend(&string, ": "); - } - CuStringAppend(&string, "expected <"); - CuStringAppend(&string, expected); - CuStringAppend(&string, "> but was <"); - CuStringAppend(&string, actual); - CuStringAppend(&string, ">"); - CuFailInternal(tc, file, line, &string); -} - -void CuAssertIntEquals_LineMsg(CuTest* tc, const char* file, int line, const char* message, - int expected, int actual) -{ - char buf[STRING_MAX]; - if (expected == actual) return; - sprintf(buf, "expected <%d> but was <%d>", expected, actual); - CuFail_Line(tc, file, line, message, buf); -} - -void CuAssertDblEquals_LineMsg(CuTest* tc, const char* file, int line, const char* message, - double expected, double actual, double delta) -{ - char buf[STRING_MAX]; -#define SH_FABS(a) (((a) < 0) ? -(a) : (a)) - if (SH_FABS(expected - actual) <= delta) return; - sprintf(buf, "expected <%lf> but was <%lf>", expected, actual); - CuFail_Line(tc, file, line, message, buf); -} - -void CuAssertPtrEquals_LineMsg(CuTest* tc, const char* file, int line, const char* message, - void* expected, void* actual) -{ - char buf[STRING_MAX]; - if (expected == actual) return; - sprintf(buf, "expected pointer <0x%p> but was <0x%p>", expected, actual); - CuFail_Line(tc, file, line, message, buf); -} - - -/*-------------------------------------------------------------------------* - * CuSuite - *-------------------------------------------------------------------------*/ - -void CuSuiteInit(CuSuite* testSuite) -{ - testSuite->count = 0; - testSuite->failCount = 0; -} - -CuSuite* CuSuiteNew(void) -{ - CuSuite* testSuite = CU_ALLOC(CuSuite); - CuSuiteInit(testSuite); - return testSuite; -} - -void CuSuiteAdd(CuSuite* testSuite, CuTest *testCase) -{ - assert(testSuite->count < MAX_TEST_CASES); - testSuite->list[testSuite->count] = testCase; - testSuite->count++; -} - -void CuSuiteAddSuite(CuSuite* testSuite, CuSuite* testSuite2) -{ - int i; - for (i = 0 ; i < testSuite2->count ; ++i) - { - CuTest* testCase = testSuite2->list[i]; - CuSuiteAdd(testSuite, testCase); - } -} - -void CuSuiteRun(CuSuite* testSuite) -{ - int i; - for (i = 0 ; i < testSuite->count ; ++i) - { - CuTest* testCase = testSuite->list[i]; - CuTestRun(testCase); - if (testCase->failed) { testSuite->failCount += 1; } - } -} - -void CuSuiteSummary(CuSuite* testSuite, CuString* summary) -{ - int i; - for (i = 0 ; i < testSuite->count ; ++i) - { - CuTest* testCase = testSuite->list[i]; - CuStringAppend(summary, testCase->failed ? "F" : "."); - } - CuStringAppend(summary, "\n\n"); -} - -void CuSuiteDetails(CuSuite* testSuite, CuString* details) -{ - int i; - int failCount = 0; - - if (testSuite->failCount == 0) - { - int passCount = testSuite->count - testSuite->failCount; - const char* testWord = passCount == 1 ? "test" : "tests"; - CuStringAppendFormat(details, "OK (%d %s)\n", passCount, testWord); - } - else - { - if (testSuite->failCount == 1) - CuStringAppend(details, "There was 1 failure:\n"); - else - CuStringAppendFormat(details, "There were %d failures:\n", testSuite->failCount); - - for (i = 0 ; i < testSuite->count ; ++i) - { - CuTest* testCase = testSuite->list[i]; - if (testCase->failed) - { - failCount++; - CuStringAppendFormat(details, "%d) %s: %s\n", - failCount, testCase->name, testCase->message); - } - } - CuStringAppend(details, "\n!!!FAILURES!!!\n"); - - CuStringAppendFormat(details, "Runs: %d ", testSuite->count); - CuStringAppendFormat(details, "Passes: %d ", testSuite->count - testSuite->failCount); - CuStringAppendFormat(details, "Fails: %d\n", testSuite->failCount); - } -} Index: trunk/src/bignum.c =================================================================== --- trunk/src/bignum.c (revision 591) +++ trunk/src/bignum.c (revision 1) @@ -64,4 +64,9 @@ #define ulong unsigned long +/* +extern void *malloc(size_t size); +extern void free(); +*/ + char *last_string = NULL; char *big_end_string = NULL; @@ -175,5 +180,5 @@ for (base = 2; base <= 36; base++) { - tmp = ((1U << (DIGIT_BITS - 1)) / base); + tmp = ((1 << (DIGIT_BITS - 1)) / base); maxdigit = tmp * 2; curdigit = 1; @@ -209,7 +214,7 @@ if (!dp) return; - (void) count; free((char *)dp); dp = NULL; + count = 0; } #endif @@ -227,5 +232,5 @@ dgs_alloc += alloclen; #endif - digit_ptr = calloc(alloclen, sizeof(DIGIT)); + digit_ptr = (DIGIT *) malloc(alloclen * sizeof(DIGIT)); if (digit_ptr == NULL) { @@ -425,5 +430,4 @@ { DIGIT *a_ptr, *b_ptr; - int retval = 0; if (a->dgs_used == b->dgs_used) @@ -438,12 +442,10 @@ if (a_ptr < a->dp) { - return retval; + return 0; } else { - if (retval == 0) - retval = (*a_ptr > *b_ptr) ? 1 : -1; - } - return retval; + return (*a_ptr > *b_ptr) ? 1 : -1; + } } return (a->dgs_used > b->dgs_used) ? 1 : -1; @@ -623,5 +625,5 @@ big_set_long((long)1, &big_one); length_last_string = 10; - if ((last_string = calloc(1,length_last_string)) == NULL) + if ((last_string = malloc(length_last_string)) == NULL) { big_errno = BIG_MEMERR; @@ -924,5 +926,5 @@ if (a->sign == BIG_SIGN_MINUS) { - *n = -*n; + *n = -*n;; } return FALSE; @@ -953,5 +955,5 @@ if (last_string != NULL) free(last_string); - if ((last_string = calloc(1,str_length)) == NULL) + if ((last_string = malloc(str_length)) == NULL) { big_errno = BIG_MEMERR; Index: trunk/src/caps.ac =================================================================== --- trunk/src/caps.ac (revision 1) +++ trunk/src/caps.ac (revision 1) @@ -0,0 +1,23 @@ + case "$host_os" in + *linux*) + if test x"${sh_use_lcaps}" = xyes + then + echo + echo "Using Linux capabilities to drop unnecessary root capabilities." + echo "Please make sure that directories used for writing have write permission" + echo "for root, because root will be a mere mortal in that respect:" + echo " Baseline database in: ${mydataroot}" + echo " Logfile in: ${localstatedir}/log" + echo " PID file in: ${localstatedir}/run" + echo "(directories not existent yet will be created upon installation, root-owned" + echo "if make install is executed by root.)" + echo + fi + if test x"${sh_use_lcaps}" = xno + then + echo + echo "Not using Linux capabilities (capability.h or libcap not found)" + echo + fi + ;; + esac Index: trunk/src/cutest_sh_hash.c =================================================================== --- trunk/src/cutest_sh_hash.c (revision 591) +++ (revision ) @@ -1,121 +1,0 @@ - -#include "config_xor.h" - -#include -#include "CuTest.h" - -extern char * quote_string (const char * str, size_t len); -extern char * unquote_string (const char * str, size_t len); - -void Test_quote_string_ok (CuTest *tc) { - -#if defined(SH_WITH_CLIENT) || defined(SH_STANDALONE) - char * ret = 0; - - char inp1[] = "foo\nba=r\ntest"; - char out1[] = "foo=0Aba=3Dr=0Atest"; - - char inp2[] = "\n=foo\nba=r\ntest=\n"; - char out2[] = "=0A=3Dfoo=0Aba=3Dr=0Atest=3D=0A"; - - ret = quote_string(inp1, strlen(inp1)); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, out1, ret); - - ret = quote_string(inp2,strlen(inp2)); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, out2, ret); -#else - (void) tc; /* fix compiler warning */ -#endif - return; -} - -void Test_unquote_string_ok (CuTest *tc) { -#if defined(SH_WITH_CLIENT) || defined(SH_STANDALONE) - char * ret = 0; - - char out1[] = "foo\nba=r\ntes[t"; - char inp1[] = "foo=0Aba=3Dr=0Ates=5Bt"; - - char out2[] = "\n=foo\nba=r\ntest=\n"; - char inp2[] = "=0A=3Dfoo=0Aba=3Dr=0Atest=3D=0A"; - - char out3[] = ""; /* encoded '\0' at start */ - char inp3[] = "=00=3Dfoo=0Aba=3Dr=0Atest=3D=0A"; - - ret = unquote_string(inp1, strlen(inp1)); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, out1, ret); - - ret = unquote_string(inp2, strlen(inp2)); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, out2, ret); - - ret = unquote_string(inp3, strlen(inp3)); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, out3, ret); -#else - (void) tc; /* fix compiler warning */ -#endif - return; -} - - -void Test_csv_escape_ok (CuTest *tc) { -#if defined(SH_WITH_CLIENT) || defined(SH_STANDALONE) - - extern char * csv_escape(const char * str); - - char test0[80]; - char expec[80]; - char *ret; - - strcpy(test0, "foobar"); - strcpy(expec, "\"foobar\""); - ret = csv_escape(test0); - CuAssertStrEquals(tc, expec, ret); - - strcpy(test0, "\"foobar\""); - strcpy(expec, "\"\"\"foobar\"\"\""); - ret = csv_escape(test0); - CuAssertStrEquals(tc, expec, ret); - - strcpy(test0, "foo,bar"); - strcpy(expec, "\"foo,bar\""); - ret = csv_escape(test0); - CuAssertStrEquals(tc, expec, ret); - - strcpy(test0, "foob,\"a\"r"); - strcpy(expec, "\"foob,\"\"a\"\"r\""); - ret = csv_escape(test0); - CuAssertStrEquals(tc, expec, ret); - - strcpy(test0, "\",\"foobar\",\""); - strcpy(expec, "\"\"\",\"\"foobar\"\",\"\"\""); - ret = csv_escape(test0); - CuAssertStrEquals(tc, expec, ret); - - strcpy(test0, ""); - strcpy(expec, ""); - ret = csv_escape(test0); - CuAssertStrEquals(tc, expec, ret); - - strcpy(test0, "a"); - strcpy(expec, "\"a\""); - ret = csv_escape(test0); - CuAssertStrEquals(tc, expec, ret); - - strcpy(test0, "foo\"bar"); - strcpy(expec, "\"foo\"\"bar\""); - ret = csv_escape(test0); - CuAssertStrEquals(tc, expec, ret); - -#else - (void) tc; /* fix compiler warning */ -#endif - return; -} - - - Index: trunk/src/cutest_sh_tiger0.c =================================================================== --- trunk/src/cutest_sh_tiger0.c (revision 591) +++ (revision ) @@ -1,460 +1,0 @@ - -#include "config_xor.h" - -#include -#include -#include -#include "CuTest.h" - -#include "sh_tiger.h" -#include "sh_checksum.h" - -#if defined(HAVE_PTHREAD) && defined(SH_STEALTH) -extern void sh_g_init(void); -#endif - - -static void init(void) { - - extern unsigned char TcpFlag[8][PW_LEN+1]; - extern UINT32 ErrFlag[2]; - unsigned char * dez = NULL; - int i; - -#if defined(HAVE_PTHREAD) && defined(SH_STEALTH) - sh_g_init(); -#endif - skey = (sh_key_t *) malloc (sizeof(sh_key_t)); - if (skey != NULL) - { - skey->mlock_failed = S_FALSE; - skey->rngI = BAD; - /* properly initialized later - */ - skey->rng0[0] = 0x03; skey->rng0[1] = 0x09; skey->rng0[2] = 0x17; - skey->rng1[0] = 0x03; skey->rng1[1] = 0x09; skey->rng1[2] = 0x17; - skey->rng2[0] = 0x03; skey->rng2[1] = 0x09; skey->rng2[2] = 0x17; - - for (i = 0; i < KEY_BYT; ++i) - skey->poolv[i] = '\0'; - - skey->poolc = 0; - - skey->ErrFlag[0] = ErrFlag[0]; - ErrFlag[0] = 0; - skey->ErrFlag[1] = ErrFlag[1]; - ErrFlag[1] = 0; - - dez = &(TcpFlag[POS_TF-1][0]); - for (i = 0; i < PW_LEN; ++i) - { - skey->pw[i] = (char) (*dez); - (*dez) = '\0'; - ++dez; - } - - skey->sh_sockpass[0] = '\0'; - skey->sigkey_old[0] = '\0'; - skey->sigkey_new[0] = '\0'; - skey->mailkey_old[0] = '\0'; - skey->mailkey_new[0] = '\0'; - skey->crypt[0] = '\0'; - skey->session[0] = '\0'; - skey->vernam[0] = '\0'; - } - else - { - perror(_("sh_init")); - _exit (EXIT_FAILURE); - } - -} - -void Test_tiger(CuTest *tc) { - - char * input; - char * actual; - char * expected; - char hashbuf[KEYBUF_SIZE]; - -#if defined(HAVE_PTHREAD) && defined(SH_STEALTH) - sh_g_init(); -#endif - - input = ""; - actual = sh_tiger_hash(input, TIGER_DATA, strlen(input), hashbuf, sizeof(hashbuf)); - expected = "24F0130C63AC933216166E76B1BB925FF373DE2D49584E7A"; - CuAssertStrEquals(tc, expected, actual); - - input = "abc"; - actual = sh_tiger_hash(input, TIGER_DATA, strlen(input), hashbuf, sizeof(hashbuf)); - expected = "F258C1E88414AB2A527AB541FFC5B8BF935F7B951C132951"; - CuAssertStrEquals(tc, expected, actual); - - input = "Tiger"; - actual = sh_tiger_hash(input, TIGER_DATA, strlen(input), hashbuf, sizeof(hashbuf)); - expected = "9F00F599072300DD276ABB38C8EB6DEC37790C116F9D2BDF"; - CuAssertStrEquals(tc, expected, actual); - - input = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-"; - actual = sh_tiger_hash(input, TIGER_DATA, strlen(input), hashbuf, sizeof(hashbuf)); - expected = "87FB2A9083851CF7470D2CF810E6DF9EB586445034A5A386"; - CuAssertStrEquals(tc, expected, actual); - - input = "ABCDEFGHIJKLMNOPQRSTUVWXYZ=abcdefghijklmnopqrstuvwxyz+0123456789"; - actual = sh_tiger_hash(input, TIGER_DATA, strlen(input), hashbuf, sizeof(hashbuf)); - expected = "467DB80863EBCE488DF1CD1261655DE957896565975F9197"; - CuAssertStrEquals(tc, expected, actual); - - input = "Tiger - A Fast New Hash Function, by Ross Anderson and Eli Biham"; - actual = sh_tiger_hash(input, TIGER_DATA, strlen(input), hashbuf, sizeof(hashbuf)); - expected = "0C410A042968868A1671DA5A3FD29A725EC1E457D3CDB303"; - CuAssertStrEquals(tc, expected, actual); - - input = "Tiger - A Fast New Hash Function, by Ross Anderson and Eli Biham, proceedings of Fast Software Encryption 3, Cambridge."; - actual = sh_tiger_hash(input, TIGER_DATA, strlen(input), hashbuf, sizeof(hashbuf)); - expected = "EBF591D5AFA655CE7F22894FF87F54AC89C811B6B0DA3193"; - CuAssertStrEquals(tc, expected, actual); - - input = "Tiger - A Fast New Hash Function, by Ross Anderson and Eli Biham, proceedings of Fast Software Encryption 3, Cambridge, 1996."; - actual = sh_tiger_hash(input, TIGER_DATA, strlen(input), hashbuf, sizeof(hashbuf)); - expected = "3D9AEB03D1BD1A6357B2774DFD6D5B24DD68151D503974FC"; - CuAssertStrEquals(tc, expected, actual); - - input = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-"; - actual = sh_tiger_hash(input, TIGER_DATA, strlen(input), hashbuf, sizeof(hashbuf)); - expected = "00B83EB4E53440C576AC6AAEE0A7485825FD15E70A59FFE4"; - CuAssertStrEquals(tc, expected, actual); -} - -void Test_tiger_file(CuTest *tc) { - - SL_TICKET rval_open; - FILE * fp; - int result; - char * actual; - char * expected; - char hashbuf[KEYBUF_SIZE]; - char hexdigest[SHA256_DIGEST_STRING_LENGTH]; - UINT64 length; - - init(); - - fp = fopen("cutest_foo", "w"); - CuAssertPtrNotNull(tc, fp); - - result = fprintf(fp, "%s\n", - "ABCDEFGHIJKLMNOPQRSTUVWXYZ=abcdefghijklmnopqrstuvwxyz+0123456789"); - CuAssertTrue(tc, result >= 0); - - result = fclose(fp); - CuAssertTrue(tc, result == 0); - - result = sh_tiger_hashtype("TIGER192"); - CuAssertTrue(tc, result == 0); - - /* same result as GnuPG 1.0.6 (gpg --load-extension tiger --print-md TIGER192) - */ - length = TIGER_NOLIM; - actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "0E9321614C966A33608C2A15F156E0435CACFD1213B9F095"; - CuAssertStrEquals(tc, expected, actual); - - rval_open = sl_open_fastread (__FILE__, __LINE__, "cutest_foo", SL_YESPRIV); - CuAssertTrue(tc, rval_open >= 0); - - length = TIGER_NOLIM; - actual = sh_tiger_generic_hash("cutest_foo", rval_open, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "0E9321614C966A33608C2A15F156E0435CACFD1213B9F095"; - CuAssertStrEquals(tc, expected, actual); - - result = sl_close(rval_open); - CuAssertTrue(tc, result == 0); - - result = sh_tiger_hashtype("MD5"); - CuAssertTrue(tc, result == 0); - - rval_open = sl_open_fastread (__FILE__, __LINE__, "cutest_foo", SL_YESPRIV); - CuAssertTrue(tc, rval_open >= 0); - - /* same result as GNU md5sum - */ - length = TIGER_NOLIM; - actual = sh_tiger_generic_hash("cutest_foo", rval_open, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "AEEC4DDA496BCFBA691F4E8863BA84C00000000000000000"; - CuAssertStrEquals(tc, expected, actual); - - result = sl_close(rval_open); - CuAssertTrue(tc, result == 0); - - result = sh_tiger_hashtype("SHA1"); - CuAssertTrue(tc, result == 0); - - rval_open = sl_open_fastread (__FILE__, __LINE__, "cutest_foo", SL_YESPRIV); - CuAssertTrue(tc, rval_open >= 0); - - /* same result as gpg --print-md SHA1 - */ - length = TIGER_NOLIM; - actual = sh_tiger_generic_hash("cutest_foo", rval_open, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "2FE65D1D995B8F8BC8B13F798C07E7E935A787ED00000000"; - CuAssertStrEquals(tc, expected, actual); - - result = sl_close(rval_open); - CuAssertTrue(tc, result == 0); - - result = sh_tiger_hashtype("SHA256"); - CuAssertTrue(tc, result == 0); - - rval_open = sl_open_fastread (__FILE__, __LINE__, "cutest_foo", SL_YESPRIV); - CuAssertTrue(tc, rval_open >= 0); - - /* same result as gpg --print-md SHA256 - */ - length = TIGER_NOLIM; - { - char * tmp = sh_tiger_generic_hash("cutest_foo", rval_open, &length, 0, hashbuf, sizeof(hashbuf)); - actual = SHA256_Base2Hex(tmp, hexdigest); - } - expected = "235790848f95e96b2c627f1bf58a2b8c05c535ada8c0a3326aac34ce1391ad40"; - CuAssertStrEquals(tc, expected, actual); - - result = sl_close(rval_open); - CuAssertTrue(tc, result == 0); - - result = remove("cutest_foo"); - CuAssertTrue(tc, result == 0); - - /* --------------------------------------------------- */ - - fp = fopen("cutest_foo", "w"); - CuAssertPtrNotNull(tc, fp); - - result = fprintf(fp, "\n"); - CuAssertTrue(tc, result >= 0); - - result = fclose(fp); - CuAssertTrue(tc, result == 0); - - result = sh_tiger_hashtype("TIGER192"); - CuAssertTrue(tc, result == 0); - - /* same result as GnuPG 1.0.6 (gpg --load-extension tiger --print-md TIGER192) - */ - length = TIGER_NOLIM; - actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "F987845A0EA784367BF9E4DB09014995810F27C99C891734"; - CuAssertStrEquals(tc, expected, actual); - - result = remove("cutest_foo"); - CuAssertTrue(tc, result == 0); - - /* --------------------------------------------------- */ - - fp = fopen("cutest_foo", "w"); - CuAssertPtrNotNull(tc, fp); - - result = fprintf(fp, "Tiger - A Fast New Hash Function, by Ross Anderson and Eli Biham, proceedings of Fast Software Encryption 3, Cambridge, 1996.\n"); - CuAssertTrue(tc, result >= 0); - - result = fclose(fp); - CuAssertTrue(tc, result == 0); - - result = sh_tiger_hashtype("TIGER192"); - CuAssertTrue(tc, result == 0); - - /* same result as GnuPG 1.0.6 (gpg --load-extension tiger --print-md TIGER192) - */ - length = TIGER_NOLIM; - actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "75B98A7AE257A230189828A40792E30B4038D286479CC7B8"; - CuAssertStrEquals(tc, expected, actual); - - result = remove("cutest_foo"); - CuAssertTrue(tc, result == 0); - -} - -/* test checksum of file upto some given length - */ -void Test_tiger_file_with_length(CuTest *tc) { - - SL_TICKET rval_open; - FILE * fp; - int result; - char * actual; - char * expected; - char hashbuf[KEYBUF_SIZE]; - UINT64 length; - - char * teststring = "Tiger - A Fast New Hash Function, by Ross Anderson and Eli Biham, proceedings of Fast Software Encryption 3, Cambridge, 1996.\n"; - size_t testlen = strlen(teststring); - - init(); - - fp = fopen("cutest_foo", "w"); - CuAssertPtrNotNull(tc, fp); - - result = fprintf(fp, "%s", teststring); - CuAssertTrue(tc, result >= 0); - result = fprintf(fp, "%s", teststring); - CuAssertTrue(tc, result >= 0); - - result = fclose(fp); - CuAssertTrue(tc, result == 0); - - result = sh_tiger_hashtype("TIGER192"); - CuAssertTrue(tc, result == 0); - - /* same as GnuPG 1.0.6 (gpg --load-extension tiger --print-md TIGER192) - */ - length = 0; - actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "24F0130C63AC933216166E76B1BB925FF373DE2D49584E7A"; - CuAssertStrEquals(tc, expected, actual); - CuAssertTrue(tc, 0 == length); - - length = testlen; - actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "75B98A7AE257A230189828A40792E30B4038D286479CC7B8"; - CuAssertStrEquals(tc, expected, actual); - CuAssertTrue(tc, testlen == length); - - length = 2*testlen; - actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "B5B4FB97B01ADB58794D87A6A01B2368852FA764BD93AB90"; - CuAssertStrEquals(tc, expected, actual); - CuAssertTrue(tc, 2*testlen == length); - - length = TIGER_NOLIM; - actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "B5B4FB97B01ADB58794D87A6A01B2368852FA764BD93AB90"; - CuAssertStrEquals(tc, expected, actual); - CuAssertTrue(tc, 2*testlen == length); - - fp = fopen("cutest_foo", "a"); - CuAssertPtrNotNull(tc, fp); - result = fprintf(fp, "%s", teststring); - CuAssertTrue(tc, result >= 0); - result = fclose(fp); - CuAssertTrue(tc, result == 0); - - length = testlen; - actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "75B98A7AE257A230189828A40792E30B4038D286479CC7B8"; - CuAssertStrEquals(tc, expected, actual); - CuAssertTrue(tc, testlen == length); - - length = 2*testlen; - actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "B5B4FB97B01ADB58794D87A6A01B2368852FA764BD93AB90"; - CuAssertStrEquals(tc, expected, actual); - CuAssertTrue(tc, 2*testlen == length); - - length = 3*testlen; - actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "D0EE1A9956CAB22D84B51A5E0C093B724828C6A1F9CBDB7F"; - CuAssertStrEquals(tc, expected, actual); - CuAssertTrue(tc, 3*testlen == length); - - length = TIGER_NOLIM; - actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "D0EE1A9956CAB22D84B51A5E0C093B724828C6A1F9CBDB7F"; - CuAssertStrEquals(tc, expected, actual); - CuAssertTrue(tc, 3*testlen == length); - - length = 5; - actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "9F00F599072300DD276ABB38C8EB6DEC37790C116F9D2BDF"; - CuAssertStrEquals(tc, expected, actual); - CuAssertTrue(tc, 5 == length); - - /* same results as GNU md5sum */ - - result = sh_tiger_hashtype("MD5"); - CuAssertTrue(tc, result == 0); - - rval_open = sl_open_fastread (__FILE__, __LINE__, "cutest_foo", SL_YESPRIV); - CuAssertTrue(tc, rval_open >= 0); - - length = testlen; - actual = sh_tiger_generic_hash("cutest_foo", rval_open, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "11E7E7EA486136273606BEE57C71F34B0000000000000000"; - CuAssertStrEquals(tc, expected, actual); - CuAssertTrue(tc, testlen == length); - - result = sl_rewind(rval_open); - CuAssertTrue(tc, rval_open >= 0); - - length = 2*testlen; - actual = sh_tiger_generic_hash("cutest_foo", rval_open, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "D49DAD474095D467E2E5EFCB2DC23A770000000000000000"; - CuAssertStrEquals(tc, expected, actual); - CuAssertTrue(tc, 2*testlen == length); - - result = sl_rewind(rval_open); - CuAssertTrue(tc, rval_open >= 0); - - length = 3*testlen; - actual = sh_tiger_generic_hash("cutest_foo", rval_open, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "00A1F1C5EDDCCFC430D3862FDA94593E0000000000000000"; - CuAssertStrEquals(tc, expected, actual); - CuAssertTrue(tc, 3*testlen == length); - - result = sl_rewind(rval_open); - CuAssertTrue(tc, rval_open >= 0); - - length = TIGER_NOLIM; - actual = sh_tiger_generic_hash("cutest_foo", rval_open, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "00A1F1C5EDDCCFC430D3862FDA94593E0000000000000000"; - CuAssertStrEquals(tc, expected, actual); - CuAssertTrue(tc, 3*testlen == length); - - /* same result as gpg --print-md SHA1 - */ - - result = sh_tiger_hashtype("SHA1"); - CuAssertTrue(tc, result == 0); - - result = sl_rewind(rval_open); - CuAssertTrue(tc, rval_open >= 0); - - length = testlen; - actual = sh_tiger_generic_hash("cutest_foo", rval_open, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "F37DB4344CCD140EE315179E9A27512FB4704F0F00000000"; - CuAssertStrEquals(tc, expected, actual); - CuAssertTrue(tc, testlen == length); - - result = sl_rewind(rval_open); - CuAssertTrue(tc, rval_open >= 0); - - length = 2*testlen; - actual = sh_tiger_generic_hash("cutest_foo", rval_open, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "D2AD5FC366452D81400BAC31F96269DEEF314BC200000000"; - CuAssertStrEquals(tc, expected, actual); - CuAssertTrue(tc, 2*testlen == length); - - result = sl_rewind(rval_open); - CuAssertTrue(tc, rval_open >= 0); - - length = 3*testlen; - actual = sh_tiger_generic_hash("cutest_foo", rval_open, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "FAA937EF3389C7E786EB0F1006D049D7AEA7B7B600000000"; - CuAssertStrEquals(tc, expected, actual); - CuAssertTrue(tc, 3*testlen == length); - - result = sl_rewind(rval_open); - CuAssertTrue(tc, rval_open >= 0); - - length = TIGER_NOLIM; - actual = sh_tiger_generic_hash("cutest_foo", rval_open, &length, 0, hashbuf, sizeof(hashbuf)); - expected = "FAA937EF3389C7E786EB0F1006D049D7AEA7B7B600000000"; - CuAssertStrEquals(tc, expected, actual); - CuAssertTrue(tc, 3*testlen == length); - - result = sl_close(rval_open); - CuAssertTrue(tc, result == 0); - - result = remove("cutest_foo"); - CuAssertTrue(tc, result == 0); -} Index: trunk/src/cutest_sh_tools.c =================================================================== --- trunk/src/cutest_sh_tools.c (revision 591) +++ (revision ) @@ -1,138 +1,0 @@ - -#include "config_xor.h" - -#include -#include "CuTest.h" -#include "samhain.h" -#include "sh_tools.h" -#include "sh_ipvx.h" - -void Test_sh_tools_safe_name_01(CuTest *tc) { - /* xml specific */ - char* input = strdup("hellorld\"foo&"); - char* actual = sh_tools_safe_name(input, 1); -#ifdef SH_USE_XML - char* expected = "hello=3cwo=3erld=22foo=26"; -#else - char* expected = "hellorld\"foo&"; -#endif - CuAssertStrEquals(tc, expected, actual); -} - -void Test_sh_tools_safe_name_02(CuTest *tc) { - /* html entities */ - char* input = strdup("hello&"><"); - char* actual = sh_tools_safe_name(input, 0); - char* expected = "hello=26=22=3e=3c"; - CuAssertStrEquals(tc, expected, actual); -} - -void Test_sh_tools_safe_name_03(CuTest *tc) { - char* input = strdup("\\\'hello\\"); - char* actual = sh_tools_safe_name(input, 0); - char* expected = "=27hello"; - CuAssertStrEquals(tc, expected, actual); - - input = strdup("hello \"world\\\""); - actual = sh_tools_safe_name(input, 0); - expected = "hello \"world=22"; - CuAssertStrEquals(tc, expected, actual); - - input = strdup("hello\\\\"); - actual = sh_tools_safe_name(input, 0); - expected = "hello=5c"; - CuAssertStrEquals(tc, expected, actual); - - input = strdup("hello\\n"); - actual = sh_tools_safe_name(input, 0); - expected = "hello=0a"; - CuAssertStrEquals(tc, expected, actual); -} - -void Test_sh_tools_safe_name_04(CuTest *tc) { - /* invalid and valid octal code */ - char* input = strdup("hello\\\n"); - char* actual = sh_tools_safe_name(input, 0); - char* expected = "hello"; - CuAssertStrEquals(tc, expected, actual); - - input = strdup("hello\\100"); - actual = sh_tools_safe_name(input, 0); - expected = "hello=40"; - CuAssertStrEquals(tc, expected, actual); - - input = strdup("h\\\"ello\\100a"); - actual = sh_tools_safe_name(input, 0); - expected = "h=22ello=40a"; - CuAssertStrEquals(tc, expected, actual); -} - -void Test_sh_tools_safe_name_05(CuTest *tc) { - /* encoding of '=' */ - char* input = strdup("he=llo=\"foo\""); - char* actual = sh_tools_safe_name(input, 0); - char* expected = "he=3dllo=\"foo\""; - CuAssertStrEquals(tc, expected, actual); - - input = strdup("he=llo="); - actual = sh_tools_safe_name(input, 0); - expected = "he=3dllo="; - CuAssertStrEquals(tc, expected, actual); -} - -void Test_sh_tools_safe_name_06(CuTest *tc) { - /* line break removal */ - char* input = strdup("hello\nworld"); - char* actual = sh_tools_safe_name(input, 0); - char* expected = "hello world"; - CuAssertStrEquals(tc, expected, actual); -} - -void Test_sh_tools_safe_name_07(CuTest *tc) { - /* non-printable chars */ - char* input = strdup("hello world"); - char* actual; - char* expected; - - input[0] = 0x01; - input[5] = 0xFF; - input[10] = 0xF0; - - actual = sh_tools_safe_name(input, 0); - expected = "=01ello=ffworl=f0"; - CuAssertStrEquals(tc, expected, actual); -} - -void Test_is_numeric_01(CuTest *tc) { - char* input = strdup("hello world"); - - CuAssertTrue(tc, !sh_ipvx_is_numeric(input)); - - input = strdup("127.0.0.1"); - CuAssertTrue(tc, sh_ipvx_is_numeric(input)); - input = strdup("127.0.0.de"); - CuAssertTrue(tc, !sh_ipvx_is_numeric(input)); - input = strdup("127"); - CuAssertTrue(tc, !sh_ipvx_is_numeric(input)); -#if defined(USE_IPVX) - input = strdup("::1"); - CuAssertTrue(tc, sh_ipvx_is_numeric(input)); - input = strdup("2002:c0a8:101::42"); - CuAssertTrue(tc, sh_ipvx_is_numeric(input)); - input = strdup("2003:dead:beef:4dad:23:46:bb:101"); - CuAssertTrue(tc, sh_ipvx_is_numeric(input)); - input = strdup("::192:168:0:1::"); - CuAssertTrue(tc, sh_ipvx_is_numeric(input)); - input = strdup("1:1:192:168:0:1:1:1"); - CuAssertTrue(tc, sh_ipvx_is_numeric(input)); - input = strdup("1:1:192:168:0:1:1:1:0"); - CuAssertTrue(tc, !sh_ipvx_is_numeric(input)); - input = strdup("2001:0db8:85a3:0000:0000:8a2e:0370:7334"); - CuAssertTrue(tc, sh_ipvx_is_numeric(input)); - input = strdup("2001:db8:85a3:0:0:8a2e:370:7334"); - CuAssertTrue(tc, sh_ipvx_is_numeric(input)); - input = strdup("2001:db8:85a3::8a2e:370:7334"); - CuAssertTrue(tc, sh_ipvx_is_numeric(input)); -#endif -} - Index: trunk/src/cutest_sh_unix.c =================================================================== --- trunk/src/cutest_sh_unix.c (revision 591) +++ (revision ) @@ -1,201 +1,0 @@ - -#include "config_xor.h" - -#include -#include "CuTest.h" -#include "samhain.h" -#include "sh_unix.h" - -int malloc_count = 0; - -void Test_dnmalloc (CuTest *tc) { - - const int nalloc = 64 /* original dnmalloc 1.0-beta5 fails for >= 45 */; - int j, i; - int sum; -#ifndef USE_SYSTEM_MALLOC - int i_malloc = malloc_count; -#endif - - char * buf; - char * area[256]; - -#if !defined(USE_SYSTEM_MALLOC) && !defined(__clang__) - /* test reuse of last freed chunk */ - buf = malloc(1024); - CuAssertPtrNotNull(tc, buf); - free(buf); - area[0] = malloc(1024); - CuAssertTrue(tc, buf == area[0]); - free(area[0]); -#endif - - /* test realloc */ - buf = malloc(16); - CuAssertPtrNotNull(tc, buf); - strcpy(buf, "testing realloc"); - buf = realloc(buf, 32); - strcat(buf, "testing realloc"); - CuAssertStrEquals(tc, "testing realloctesting realloc", buf); - -#ifndef USE_SYSTEM_MALLOC - i_malloc = malloc_count; -#endif - - for (j = 0; j < 64; ++j) - { - buf = malloc((j+1) * 1024); - CuAssertPtrNotNull(tc, buf); -#ifndef USE_SYSTEM_MALLOC -#ifndef __clang__ - CuAssertIntEquals (tc, malloc_count, (i_malloc + 1)); -#endif -#endif - free(buf); -#ifndef USE_SYSTEM_MALLOC - CuAssertIntEquals (tc, malloc_count, i_malloc); -#endif - } - - /* test realloc */ - buf = malloc(16); - CuAssertPtrNotNull(tc, buf); - strcpy(buf, "testing realloc"); - buf = realloc(buf, 32); - strcat(buf, "testing realloc"); - CuAssertStrEquals(tc, "testing realloctesting realloc", buf); - -#ifndef USE_SYSTEM_MALLOC - i_malloc = malloc_count; -#endif - - for (j = 0; j < 64; ++j) - { - buf = calloc(1, (j+1) * 1024); - CuAssertPtrNotNull(tc, buf); -#ifndef USE_SYSTEM_MALLOC - CuAssertIntEquals (tc, malloc_count, (i_malloc + 1)); -#endif - sum = 0; - for (i = 0; i < ((j+1) * 1024); ++i) - sum += buf[i]; - CuAssertIntEquals (tc, 0, sum); - free(buf); -#ifndef USE_SYSTEM_MALLOC - CuAssertIntEquals (tc, malloc_count, i_malloc); -#endif - } - - /* test realloc */ - buf = malloc(16); - CuAssertPtrNotNull(tc, buf); - strcpy(buf, "testing realloc"); - buf = realloc(buf, 32); - strcat(buf, "testing realloc"); - CuAssertStrEquals(tc, "testing realloctesting realloc", buf); - - for (j = 0; j < nalloc; ++j) - { - area[j] = malloc((j+1) * 1024); - CuAssertPtrNotNull(tc, area[j]); -#ifndef USE_SYSTEM_MALLOC - /* CuAssertIntEquals (tc, malloc_count, (i_malloc + (j+1))); */ -#endif - memset(area[j], (unsigned char) ('a'+1), (j+1) * 1024); - } - -#ifndef USE_SYSTEM_MALLOC - i_malloc = malloc_count; -#endif - - for (j = 0; j < nalloc; ++j) - { - sum = 0; - for (i = 0; i < ((j+1) * 1024); ++i) - sum += area[j][i]; - CuAssertIntEquals (tc, sum, ((j+1) * 1024 * ((unsigned char) ('a'+1)))); - free(area[j]); -#ifndef USE_SYSTEM_MALLOC - CuAssertIntEquals (tc, malloc_count, i_malloc - (j+1)); -#endif - } - - /* test realloc */ - buf = malloc(16); - CuAssertPtrNotNull(tc, buf); - strcpy(buf, "testing realloc"); - buf = realloc(buf, 32); - strcat(buf, "testing realloc"); - CuAssertStrEquals(tc, "testing realloctesting realloc", buf); - - - for (j = 0; j < 32; ++j) - { -#ifndef USE_SYSTEM_MALLOC - i_malloc = malloc_count; -#endif - buf = malloc((j+1) * 1024 * 1024); - CuAssertPtrNotNull(tc, buf); - for (i = 0; i < 32; ++i) - { - area[i] = malloc((i+1) * 1024); - CuAssertPtrNotNull(tc, area[i]); - } - free(buf); - for (i = 0; i < 32; ++i) - { - free(area[i]); - } -#ifndef USE_SYSTEM_MALLOC - CuAssertIntEquals (tc, malloc_count, i_malloc); -#endif - } - - /* test realloc */ - buf = malloc(16); - CuAssertPtrNotNull(tc, buf); - strcpy(buf, "testing realloc"); - buf = realloc(buf, 32); - strcat(buf, "testing realloc"); - CuAssertStrEquals(tc, "testing realloctesting realloc", buf); -} - - -void Test_sh_unix_lookup_page (CuTest *tc) { - - long pagesize = sh_unix_pagesize(); - - unsigned long base; - int num_pages; - - CuAssert (tc, "pagesize > 0", (pagesize > 0)); - - /* base = sh_unix_lookup_page(in_addr, len, *num_pages); */ - - base = sh_unix_lookup_page(0, pagesize, &num_pages); - CuAssert (tc, "base == 0", (base == 0)); - CuAssertIntEquals (tc, num_pages, 1); - - base = sh_unix_lookup_page(0, pagesize+1, &num_pages); - CuAssert (tc, "base == 0", (base == 0)); - CuAssertIntEquals (tc, num_pages, 2); - - base = sh_unix_lookup_page((void*)pagesize, pagesize, &num_pages); - CuAssert (tc, "base == 0", (base == (unsigned int)pagesize)); - CuAssertIntEquals (tc, num_pages, 1); - - base = sh_unix_lookup_page((void*)pagesize, pagesize+1, &num_pages); - CuAssert (tc, "base == 0", (base == (unsigned int)pagesize)); - CuAssertIntEquals (tc, num_pages, 2); - - base = sh_unix_lookup_page((void*)(pagesize-1), pagesize+1, &num_pages); - CuAssert (tc, "base == 0", (base == 0)); - CuAssertIntEquals (tc, num_pages, 2); - - base = sh_unix_lookup_page((void*)(pagesize-1), pagesize+2, &num_pages); - CuAssert (tc, "base == 0", (base == 0)); - CuAssertIntEquals (tc, num_pages, 3); - -} - - Index: trunk/src/cutest_sh_utils.c =================================================================== --- trunk/src/cutest_sh_utils.c (revision 591) +++ (revision ) @@ -1,532 +1,0 @@ - -#include "config_xor.h" - -#include -#include "CuTest.h" -#include "samhain.h" -#include "sh_utils.h" - -void Test_sl_strlcpy (CuTest *tc) { - int ret; - char out[] = "aaaaaa"; - char in[] = "bbb"; - - ret = sl_strlcpy (NULL, NULL, 0); - CuAssertIntEquals(tc, ret, SL_ENONE); - - ret = sl_strlcpy (NULL, in, 0); - CuAssertIntEquals(tc, ret, SL_ENULL); - - ret = sl_strlcpy (out, NULL, 0); - CuAssertIntEquals(tc, ret, SL_ENONE); - - ret = sl_strlcpy (out, in, 0); - CuAssertIntEquals(tc, ret, SL_ENONE); - - ret = sl_strlcpy (out, NULL, 7); - CuAssertIntEquals(tc, ret, SL_ENONE); - CuAssertStrEquals(tc, "", out); - - out[0] = 'a'; - ret = sl_strlcpy (out, in, 4); - CuAssertIntEquals(tc, ret, SL_ENONE); - CuAssertStrEquals(tc, "bbb", out); - CuAssertStrEquals(tc, "aa", &out[4]); - - return; -} - -void Test_sl_strlcat (CuTest *tc) { - int ret; - char out[16] = "aaaaaa"; - char in[16] = "bbb"; - - ret = sl_strlcat (NULL, NULL, 0); - CuAssertIntEquals(tc, ret, SL_ENONE); - - ret = sl_strlcat (NULL, in, 0); - CuAssertIntEquals(tc, ret, SL_ENONE); - - ret = sl_strlcat (out, NULL, 0); - CuAssertIntEquals(tc, ret, SL_ENONE); - - ret = sl_strlcat (out, in, 0); - CuAssertIntEquals(tc, ret, SL_ENONE); - - ret = sl_strlcat (out, NULL, sizeof(out)); - CuAssertIntEquals(tc, ret, SL_ENONE); - CuAssertStrEquals(tc, "aaaaaa", out); - - ret = sl_strlcat (out, in, 7); - CuAssertIntEquals(tc, ret, SL_ETRUNC); - CuAssertStrEquals(tc, "aaaaaa", out); - - ret = sl_strlcat (out, in, 8); - CuAssertIntEquals(tc, ret, SL_ETRUNC); - CuAssertStrEquals(tc, "aaaaaab", out); - - ret = sl_strlcat (out, in, sizeof(out)); - CuAssertIntEquals(tc, ret, SL_ENONE); - CuAssertStrEquals(tc, "aaaaaabbbb", out); - - CuAssertStrEquals(tc, "bbb", in); - - return; -} - -void Test_sh_util_acl_compact (CuTest *tc) { - char * ret = 0; - char inp1[] = "user::r--\nuser:lisa:rwx\t\t#effective: r--\ngroup::r--\ngroup:toolies:rw- #effective: r--\nmask::r--\nother::r--\n"; - char inp2[] = "use\n\nuser:lisa:rwx\t\t#effective: r--\ngroup::r--\ngroup:toolies:rw- #effective: r--\nmask::r--\nother::r--\n"; - char inp3[] = "user:\177\145\177\122:r--\nuser:lisa:rwx\t\t#effective: r--\ngroup::r--\ngroup:toolies:rw- #effective: r--\nmask::r--\nother::r--\n"; - - ret = sh_util_acl_compact (inp1, strlen(inp1)); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, "u::r--,u:lisa:rwx,g::r--,g:toolies:rw-,m::r--,o::r--", - ret); - - ret = sh_util_acl_compact (inp2, strlen(inp2)); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, "use,u:lisa:rwx,g::r--,g:toolies:rw-,m::r--,o::r--", - ret); - - ret = sh_util_acl_compact (inp3, strlen(inp3)); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, "u:eR:r--,u:lisa:rwx,g::r--,g:toolies:rw-,m::r--,o::r--", - ret); - - return; -} - -void Test_sh_util_strdup_ok (CuTest *tc) { - char * ret = 0; - char inp[] = "foobar"; - - ret = sh_util_strdup(inp); - CuAssertPtrNotNull(tc, ret); - CuAssert(tc, "expected inp != ret, but inp == ret", (inp != ret)); - CuAssertStrEquals(tc, "foobar", ret); - return; -} - -void Test_sh_util_strconcat_ok (CuTest *tc) { - char * ret = 0; - - ret = sh_util_strconcat("foo", NULL); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, "foo", ret); - - ret = sh_util_strconcat("foo", "bar", NULL); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, "foobar", ret); - - ret = sh_util_strconcat("/", "foo", "/", "bar", NULL); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, "/foo/bar", ret); - - return; -} - -void Test_sh_util_base64_enc_ok (CuTest *tc) { - unsigned char out[64]; - unsigned char ou2[64]; - int ret; - unsigned char inp0[64] = ""; - unsigned char inp1[64] = "A"; - unsigned char inp2[64] = "AB"; - unsigned char inp3[64] = "ABC"; - unsigned char inp4[64] = "ABCD"; - - ret = sh_util_base64_enc (out, inp0, strlen((char*)inp0)); - CuAssertIntEquals(tc, 0, ret); - CuAssertStrEquals(tc, "", (char*)out); - ret = sh_util_base64_dec (ou2, out, strlen((char*)out)); - CuAssertIntEquals(tc, ret, 0); - CuAssertStrEquals(tc, (char*)inp0, (char*)ou2); - - ret = sh_util_base64_enc (out, inp1, strlen((char*)inp1)); - CuAssertIntEquals(tc, ret, 4); - CuAssertStrEquals(tc, "QQ??", (char*)out); - ret = sh_util_base64_dec (ou2, out, strlen((char*)out)); - CuAssertStrEquals(tc, (char*)inp1, (char*)ou2); - CuAssertIntEquals(tc, 1, ret); - - ret = sh_util_base64_enc (out, inp2, strlen((char*)inp2)); - CuAssertIntEquals(tc, ret, 4); - CuAssertStrEquals(tc, "QUI?", (char*)out); - ret = sh_util_base64_dec (ou2, out, strlen((char*)out)); - CuAssertStrEquals(tc, (char*)inp2, (char*)ou2); - CuAssertIntEquals(tc, 2, ret); - - ret = sh_util_base64_enc (out, inp3, strlen((char*)inp3)); - CuAssertIntEquals(tc, ret, 4); - CuAssertStrEquals(tc, "QUJD", (char*)out); - ret = sh_util_base64_dec (ou2, out, strlen((char*)out)); - CuAssertStrEquals(tc, (char*)inp3, (char*)ou2); - CuAssertIntEquals(tc, 3, ret); - - ret = sh_util_base64_enc (out, inp4, strlen((char*)inp4)); - CuAssertIntEquals(tc, ret, 8); - CuAssertStrEquals(tc, "QUJDRA??", (char*)out); - ret = sh_util_base64_dec (ou2, out, strlen((char*)out)); - CuAssertStrEquals(tc, (char*)inp4, (char*)ou2); - CuAssertIntEquals(tc, 4, ret); - - - return; -} - -void Test_sh_util_dirname_ok (CuTest *tc) { - char * ret = 0; - - char input0[] = "/foo/bar"; - char res0[] = "/foo"; - - char input1[] = "/foo/bar/"; - char res1[] = "/foo"; - - char input2[] = "/foo"; - char res2[] = "/"; - - char input3[] = "/"; - char res3[] = "/"; - - char input4[] = "///foo//bar"; - char res4[] = "///foo"; - - char input5[] = "//foo///bar///"; - char res5[] = "//foo"; - - char input6[] = "///"; - char res6[] = "///"; - - char input7[] = "//f///b///"; - char res7[] = "//f"; - - char input8[] = "/f/b/"; - char res8[] = "/f"; - - char input9[] = "/e/b"; - char res9[] = "/e"; - - ret = sh_util_dirname(input0); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, res0, ret); - - ret = sh_util_dirname(input1); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, res1, ret); - - ret = sh_util_dirname(input2); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, res2, ret); - - ret = sh_util_dirname(input3); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, res3, ret); - - ret = sh_util_dirname(input4); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, res4, ret); - - ret = sh_util_dirname(input5); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, res5, ret); - - ret = sh_util_dirname(input6); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, res6, ret); - - ret = sh_util_dirname(input7); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, res7, ret); - - ret = sh_util_dirname(input8); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, res8, ret); - - ret = sh_util_dirname(input9); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, res9, ret); - return; -} - -void Test_sh_util_basename_ok (CuTest *tc) { - char * ret = 0; - - char input0[] = "/foo/bar"; - char res0[] = "bar"; - - char input1[] = "/foo/"; - char res1[] = "foo"; - - char input2[] = "/foo"; - char res2[] = "foo"; - - char input3[] = "/"; - char res3[] = "/"; - - char input4[] = "/foo/bar/"; - char res4[] = "bar"; - - char input5[] = "/foo///bar///"; - char res5[] = "bar"; - - char input6[] = "//foo"; - char res6[] = "foo"; - - ret = sh_util_basename(input0); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, res0, ret); - - ret = sh_util_basename(input1); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, res1, ret); - - ret = sh_util_basename(input2); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, res2, ret); - - ret = sh_util_basename(input3); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, res3, ret); - - ret = sh_util_basename(input4); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, res4, ret); - - ret = sh_util_basename(input5); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, res5, ret); - - ret = sh_util_basename(input6); - CuAssertPtrNotNull(tc, ret); - CuAssertStrEquals(tc, res6, ret); - - return; -} - -void Test_sh_util_utf8_ok (CuTest *tc) { - int ret = 0; -#if defined(SH_WITH_CLIENT) || defined(SH_STANDALONE) - unsigned char seq[16]; - unsigned char input[16] = "foobar"; - - seq[0] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_TRUE); - - seq[0] = 0xd7; seq[1] = 0x90; seq[2] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_TRUE); - - seq[0] = 0xed; seq[1] = 0x9f; seq[2] = 0xbf; seq[3] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_TRUE); - - seq[0] = 0xee; seq[1] = 0x80; seq[2] = 0x80; seq[3] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_TRUE); - - seq[0] = 0xef; seq[1] = 0xbf; seq[2] = 0xbd; seq[3] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_TRUE); - - seq[0] = 0xf4; seq[1] = 0x8f; seq[2] = 0xbf; seq[3] = 0xbf; seq[4] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_TRUE); - - seq[0] = 0xf4; seq[1] = 0x90; seq[2] = 0x80; seq[3] = 0x80; seq[4] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_TRUE); - - seq[0] = 0xd7; seq[1] = 0x90; seq[2] = 0xd7; seq[3] = 0x90; seq[4] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_TRUE); - - /* cont. char */ - - seq[0] = 0x80; seq[1] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_FALSE); - - seq[0] = 0xbf; seq[1] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_FALSE); - - /* overlong */ - - seq[0] = 0xc0; seq[1] = 0xaf; seq[2] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_FALSE); - - seq[0] = 0xe0; seq[1] = 0x8f; seq[2] = 0xaf; seq[3] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_FALSE); - - seq[0] = 0xf0; seq[1] = 0x80; seq[2] = 0x80; seq[3] = 0xaf; seq[4] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_FALSE); - - /* overlong */ - - seq[0] = 0xc1; seq[1] = 0xbf; seq[2] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_FALSE); - - seq[0] = 0xe0; seq[1] = 0x9f; seq[2] = 0xbf; seq[3] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_FALSE); - - seq[0] = 0xf0; seq[1] = 0x8f; seq[2] = 0xbf; seq[3] = 0xbf; seq[4] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_FALSE); - - /* overlong */ - - seq[0] = 0xc0; seq[1] = 0x80; seq[2] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_FALSE); - - seq[0] = 0xe0; seq[1] = 0x80; seq[2] = 0x80; seq[3] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_FALSE); - - seq[0] = 0xf0; seq[1] = 0x80; seq[2] = 0x80; seq[3] = 0x80; seq[4] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_FALSE); - - /* cont missing */ - - seq[0] = 0xd7; seq[1] = 0x20; seq[3] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_FALSE); - - seq[0] = 0xee; seq[1] = 0x80; seq[2] = 0x20; seq[3] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_FALSE); - - seq[0] = 0xf4; seq[1] = 0x8f; seq[2] = 0xbf; seq[3] = 0x20; seq[4] = 0x00; - ret = sh_util_valid_utf8(seq); - CuAssertIntEquals(tc, ret, S_FALSE); - - /* switch on utf8 checking for sh_util_obscurename() */ - - ret = sh_util_obscure_utf8("Y"); - CuAssertIntEquals(tc, ret, 0); - - ret = sh_util_obscure_ok ("0x01,0x02,0x03"); - CuAssertIntEquals(tc, ret, 0); - - ret = sh_util_valid_utf8 (input); - CuAssertIntEquals(tc, ret, S_TRUE); - ret = sh_util_obscurename (0, (char *)input, S_FALSE /* no log message */); - CuAssertIntEquals(tc, ret, 0); - - input[0] = '\t'; - ret = sh_util_valid_utf8 (input); - CuAssertIntEquals(tc, ret, S_FALSE); - ret = sh_util_obscurename (0, (char *)input, S_FALSE /* no log message */); - CuAssertIntEquals(tc, ret, -1); - - input[0] = 0x01; - ret = sh_util_valid_utf8 (input); - CuAssertIntEquals(tc, ret, S_TRUE); - ret = sh_util_obscurename (0, (char *)input, S_FALSE /* no log message */); - CuAssertIntEquals(tc, ret, 0); - - input[0] = 0x02; - ret = sh_util_valid_utf8 (input); - CuAssertIntEquals(tc, ret, S_TRUE); - ret = sh_util_obscurename (0, (char *)input, S_FALSE /* no log message */); - CuAssertIntEquals(tc, ret, 0); - - input[0] = 0x03; - ret = sh_util_valid_utf8 (input); - CuAssertIntEquals(tc, ret, S_TRUE); - ret = sh_util_obscurename (0, (char *)input, S_FALSE /* no log message */); - CuAssertIntEquals(tc, ret, 0); - - input[0] = 0x04; - ret = sh_util_valid_utf8 (input); - CuAssertIntEquals(tc, ret, S_FALSE); - ret = sh_util_obscurename (0, (char *)input, S_FALSE /* no log message */); - CuAssertIntEquals(tc, ret, -1); - - input[0] = 'f'; - ret = sh_util_valid_utf8 (input); - CuAssertIntEquals(tc, ret, S_TRUE); - ret = sh_util_obscurename (0, (char *)input, S_FALSE /* no log message */); - CuAssertIntEquals(tc, ret, 0); - - input[5] = ' '; - ret = sh_util_valid_utf8 (input); - CuAssertIntEquals(tc, ret, S_FALSE); - ret = sh_util_obscurename (0, (char *)input, S_FALSE /* no log message */); - CuAssertIntEquals(tc, ret, -1); - - input[5] = 'r'; input[3] = ' '; - ret = sh_util_valid_utf8 (input); - CuAssertIntEquals(tc, ret, S_TRUE); - ret = sh_util_obscurename (0, (char *)input, S_FALSE /* no log message */); - CuAssertIntEquals(tc, ret, 0); - - -#else - CuAssertIntEquals(tc, ret, 0); -#endif -} - -void Test_sh_util_obscure_ok (CuTest *tc) { - - int ret = 0; -#if defined(SH_WITH_CLIENT) || defined(SH_STANDALONE) - char input[16] = "foobar"; - - /* switch off utf8 checking for sh_util_obscurename() */ - - ret = sh_util_obscure_utf8("N"); - CuAssertIntEquals(tc, ret, 0); - - ret = sh_util_obscure_ok ("0xA1,0xA2,0xA3"); - CuAssertIntEquals(tc, ret, 0); - - ret = sh_util_obscurename (0, input, S_FALSE /* no log message */); - CuAssertIntEquals(tc, ret, 0); - - input[0] = '\t'; - ret = sh_util_obscurename (0, input, S_FALSE /* no log message */); - CuAssertIntEquals(tc, ret, -1); - - input[0] = 0xA1; - ret = sh_util_obscurename (0, input, S_FALSE /* no log message */); - CuAssertIntEquals(tc, ret, 0); - - input[0] = 0xA2; - ret = sh_util_obscurename (0, input, S_FALSE /* no log message */); - CuAssertIntEquals(tc, ret, 0); - - input[0] = 0xA3; - ret = sh_util_obscurename (0, input, S_FALSE /* no log message */); - CuAssertIntEquals(tc, ret, 0); - - input[0] = 0xA4; - ret = sh_util_obscurename (0, input, S_FALSE /* no log message */); - CuAssertIntEquals(tc, ret, -1); - - input[0] = 'f'; - ret = sh_util_obscurename (0, input, S_FALSE /* no log message */); - CuAssertIntEquals(tc, ret, 0); - - input[5] = ' '; - ret = sh_util_obscurename (0, input, S_FALSE /* no log message */); - CuAssertIntEquals(tc, ret, -1); - - input[5] = 'r'; input[3] = ' '; - ret = sh_util_obscurename (0, input, S_FALSE /* no log message */); - CuAssertIntEquals(tc, ret, 0); -#else - CuAssertIntEquals(tc, ret, 0); -#endif -} - Index: trunk/src/cutest_slib.c =================================================================== --- trunk/src/cutest_slib.c (revision 591) +++ (revision ) @@ -1,135 +1,0 @@ - -#include "config_xor.h" - -#include -#include "CuTest.h" -#include "samhain.h" - -void Test_sl_stale (CuTest *tc) { - - extern int get_the_fd (SL_TICKET ticket); - - int fd1, fd2, ret, line, val; - SL_TICKET tfd1, tfd2; - char * err1; - char err2[128]; - - line = __LINE__; tfd1 = sl_open_read(__FILE__, __LINE__, "/etc/group", SL_NOPRIV); - CuAssertTrue(tc, tfd1 > 0); - - fd1 = get_the_fd(tfd1); - CuAssertTrue(tc, fd1 >= 0); - - ret = close(fd1); - CuAssertTrue(tc, ret == 0); - - tfd2 = sl_open_read(__FILE__, __LINE__, "/etc/group", SL_NOPRIV); - CuAssertTrue(tc, tfd2 > 0); - CuAssertTrue(tc, tfd2 != tfd1); - - fd2 = get_the_fd(tfd2); - CuAssertIntEquals(tc, fd1, fd2); - - err1 = sl_check_stale(); - CuAssertTrue(tc, err1 != NULL); - - sl_snprintf(err2, sizeof(err2), - "stale handle, %s, %d", __FILE__, line); - val = strcmp(err1, err2); - CuAssertIntEquals(tc, 0, val); -} - -void Test_sl_snprintf (CuTest *tc) { - - int ret = 0; - char input[16]; - - memset (&input, 'X', 16); - ret = sl_snprintf(input, 10, "%s\n", "01234567890123456789"); - CuAssertIntEquals(tc, ret, 0); - CuAssertTrue(tc, input[9] == '\0'); - CuAssertTrue(tc, input[10] == 'X'); - - memset (&input, 'X', 16); - ret = sl_snprintf(input, 4, "%d\n", "012345"); - CuAssertIntEquals(tc, ret, 0); - CuAssertTrue(tc, input[3] == '\0'); - CuAssertTrue(tc, input[4] == 'X'); -} - -void Test_sl_ts_strncmp (CuTest *tc) { - char one[64], two[64]; - int res; - - strcpy(one, "foo"); - strcpy(two, "foo"); - res = sl_ts_strncmp(one, two, 3); - CuAssertIntEquals(tc, 0, res); - - strcpy(one, "fox"); - strcpy(two, "foo"); - res = sl_ts_strncmp(one, two, 2); - CuAssertIntEquals(tc, 0, res); - - strcpy(one, "f9o"); - strcpy(two, "foo"); - res = sl_ts_strncmp(one, two, 3); - CuAssertTrue(tc, 0 != res); - -} - -void Test_sl_strcasecmp (CuTest *tc) { - char one[64], two[64]; - int res; - - strcpy(one, "foo"); - strcpy(two, "foo"); - res = sl_strcasecmp(one, two); - CuAssertIntEquals(tc, 0, res); - - strcpy(one, "fo"); - strcpy(two, "foo"); - res = sl_strcasecmp(one, two); - CuAssertIntEquals(tc, -1, res); - - strcpy(one, "foo"); - strcpy(two, "fo"); - res = sl_strcasecmp(one, two); - CuAssertIntEquals(tc, 1, res); - - strcpy(one, "1234"); - strcpy(two, "2345"); - res = sl_strcasecmp(one, two); - CuAssertIntEquals(tc, -1, res); - - strcpy(one, "234"); - strcpy(two, "123"); - res = sl_strcasecmp(one, two); - CuAssertIntEquals(tc, 1, res); - - strcpy(one, ""); - strcpy(two, "123"); - res = sl_strcasecmp(one, two); - CuAssertIntEquals(tc, -1, res); - - strcpy(one, "234"); - strcpy(two, ""); - res = sl_strcasecmp(one, two); - CuAssertIntEquals(tc, 1, res); - - strcpy(one, ""); - strcpy(two, ""); - res = sl_strcasecmp(one, two); - CuAssertTrue(tc, res == 0); - -#ifndef SL_FAIL_ON_ERROR - res = sl_strcasecmp(NULL, two); - CuAssertIntEquals(tc, -1, res); - - res = sl_strcasecmp(one, NULL); - CuAssertIntEquals(tc, 1, res); - - res = sl_strcasecmp(NULL, NULL); - CuAssertTrue(tc, res != 0); -#endif -} Index: trunk/src/cutest_zAVLTree.c =================================================================== --- trunk/src/cutest_zAVLTree.c (revision 591) +++ (revision ) @@ -1,523 +1,0 @@ - -#include "config_xor.h" - -#include -#include "CuTest.h" -#include "zAVLTree.h" - -struct ztest { - char name[32]; - int iname; -}; - -static zAVLTree * ztest_tree = NULL; - -static zAVLKey ztest_key (void const * arg) -{ - const struct ztest * sa = (const struct ztest *) arg; - return (zAVLKey) sa->name; -} - -static zAVLKey ztest_intkey(void const *item) -{ - return (&((const struct ztest *)item)->iname); -} - - -static void free_node (void * inptr) -{ - struct ztest * ptr = (struct ztest *) inptr; - ptr->name[0] = '\0'; - ptr->iname = 0; -} - -void Test_zAVLTree(CuTest *tc) { - zAVLCursor cursor; - - int result; - int counter = 0; - - char * str; - - struct ztest z1 = { "abc" , 1 }; - struct ztest z2 = { "aac" , 2 }; - struct ztest z3 = { "aaa1" , 3 }; - struct ztest z4 = { "aaa3" , 4 }; - struct ztest z5 = { "aaa2" , 5 }; - struct ztest z6 = { "aaa6" , 6 }; - struct ztest z7 = { "aaa5" , 7 }; - struct ztest z8 = { "aaa4" , 8 }; - - struct ztest iz1 = { "aaa1" , 8 }; - struct ztest iz2 = { "aaa2" , 7 }; - struct ztest iz3 = { "aaa3" , 1 }; - struct ztest iz4 = { "aaa4" , 3 }; - struct ztest iz5 = { "aaa5" , 2 }; - struct ztest iz6 = { "aaa5" , 6 }; - struct ztest iz7 = { "aaa7" , 5 }; - struct ztest iz8 = { "aaa8" , 4 }; - - struct ztest * ptr; - - ptr = zAVLFirst(&cursor, ztest_tree); - CuAssertTrue(tc, NULL == ptr); - - ztest_tree = zAVLAllocTree (ztest_key, zAVL_KEY_STRING); - CuAssertPtrNotNull(tc, ztest_tree); - - do { - - ++counter; - - result = zAVLInsert(ztest_tree, &z1); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &z2); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &z3); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &z4); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &z5); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &z6); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &z7); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &z8); - CuAssertTrue(tc, 0 == result); - - ptr = zAVLFirst(&cursor, ztest_tree); - CuAssertStrEquals(tc, ptr->name, z3.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z5.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z4.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z8.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z7.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z6.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z2.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z1.name); - ptr = zAVLNext(&cursor); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLInsert(ztest_tree, &z8); - CuAssertTrue(tc, 0 != result); - result = zAVLInsert(ztest_tree, &z7); - CuAssertTrue(tc, 0 != result); - result = zAVLInsert(ztest_tree, &z6); - CuAssertTrue(tc, 0 != result); - result = zAVLInsert(ztest_tree, &z5); - CuAssertTrue(tc, 0 != result); - - ptr = zAVLSearch(ztest_tree, z1.name); - CuAssertStrEquals(tc, ptr->name, z1.name); - ptr = zAVLSearch(ztest_tree, z2.name); - CuAssertStrEquals(tc, ptr->name, z2.name); - ptr = zAVLSearch(ztest_tree, z3.name); - CuAssertStrEquals(tc, ptr->name, z3.name); - ptr = zAVLSearch(ztest_tree, z4.name); - CuAssertStrEquals(tc, ptr->name, z4.name); - - ptr = zAVLFirst(&cursor, ztest_tree); - CuAssertStrEquals(tc, ptr->name, z3.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z5.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z4.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z8.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z7.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z6.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z2.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z1.name); - ptr = zAVLNext(&cursor); - CuAssertTrue(tc, NULL == ptr); - - - ptr = zAVLSearch(ztest_tree, z5.name); - CuAssertStrEquals(tc, ptr->name, z5.name); - ptr = zAVLSearch(ztest_tree, z6.name); - CuAssertStrEquals(tc, ptr->name, z6.name); - ptr = zAVLSearch(ztest_tree, z7.name); - CuAssertStrEquals(tc, ptr->name, z7.name); - ptr = zAVLSearch(ztest_tree, z8.name); - CuAssertStrEquals(tc, ptr->name, z8.name); - ptr = zAVLSearch(ztest_tree, "foobar"); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, z8.name); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, z8.name); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, z3.name); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, z3.name); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, z1.name); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, z1.name); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLInsert(ztest_tree, &z1); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &z8); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &z3); - CuAssertTrue(tc, 0 == result); - - ptr = zAVLFirst(&cursor, ztest_tree); - CuAssertStrEquals(tc, ptr->name, z3.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z5.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z4.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z8.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z7.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z6.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z2.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, z1.name); - ptr = zAVLNext(&cursor); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, z1.name); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, z1.name); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, z2.name); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, z2.name); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, z3.name); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, z3.name); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, z4.name); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, z4.name); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, z5.name); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, z5.name); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, z6.name); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, z6.name); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, z7.name); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, z7.name); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, z8.name); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, z8.name); - CuAssertTrue(tc, NULL == ptr); - -} while (counter < 100); - - result = zAVLInsert(ztest_tree, &z1); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &z2); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &z3); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &z4); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &z5); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &z6); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &z7); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &z8); - CuAssertTrue(tc, 0 == result); - - zAVLFreeTree (ztest_tree, free_node); - CuAssertTrue (tc, z1.name[0] == '\0'); - CuAssertTrue (tc, z2.name[0] == '\0'); - CuAssertTrue (tc, z3.name[0] == '\0'); - CuAssertTrue (tc, z4.name[0] == '\0'); - CuAssertTrue (tc, z5.name[0] == '\0'); - CuAssertTrue (tc, z6.name[0] == '\0'); - CuAssertTrue (tc, z7.name[0] == '\0'); - CuAssertTrue (tc, z8.name[0] == '\0'); - - - /* Numeric key here */ - - counter = 0; - ztest_tree = NULL; - - ptr = zAVLFirst(&cursor, ztest_tree); - CuAssertTrue(tc, NULL == ptr); - - ztest_tree = zAVLAllocTree (ztest_intkey, zAVL_KEY_INT); - CuAssertPtrNotNull(tc, ztest_tree); - - do { - - ++counter; - - result = zAVLInsert(ztest_tree, &iz1); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &iz2); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &iz3); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &iz4); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &iz5); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &iz6); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &iz7); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &iz8); - CuAssertTrue(tc, 0 == result); - - ptr = zAVLFirst(&cursor, ztest_tree); - CuAssertStrEquals(tc, ptr->name, iz3.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, iz5.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, iz4.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, iz8.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, iz7.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, iz6.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, iz2.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, iz1.name); - ptr = zAVLNext(&cursor); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLInsert(ztest_tree, &iz8); - CuAssertTrue(tc, 0 != result); - result = zAVLInsert(ztest_tree, &iz7); - CuAssertTrue(tc, 0 != result); - result = zAVLInsert(ztest_tree, &iz6); - CuAssertTrue(tc, 0 != result); - result = zAVLInsert(ztest_tree, &iz5); - CuAssertTrue(tc, 0 != result); - - ptr = zAVLSearch(ztest_tree, &(iz1.iname)); - CuAssertIntEquals(tc, ptr->iname, iz1.iname); - ptr = zAVLSearch(ztest_tree, &(iz2.iname)); - CuAssertIntEquals(tc, ptr->iname, iz2.iname); - ptr = zAVLSearch(ztest_tree, &(iz3.iname)); - CuAssertIntEquals(tc, ptr->iname, iz3.iname); - ptr = zAVLSearch(ztest_tree, &(iz6.iname)); - CuAssertIntEquals(tc, ptr->iname, iz6.iname); - ptr = zAVLSearch(ztest_tree, &(iz4.iname)); - CuAssertIntEquals(tc, ptr->iname, iz4.iname); - - ptr = zAVLSearch(ztest_tree, &(iz2.iname)); - CuAssertIntEquals(tc, ptr->iname, iz2.iname); - ptr = zAVLSearch(ztest_tree, &(iz3.iname)); - CuAssertIntEquals(tc, ptr->iname, iz3.iname); - ptr = zAVLSearch(ztest_tree, &(iz7.iname)); - CuAssertIntEquals(tc, ptr->iname, iz7.iname); - - ptr = zAVLFirst(&cursor, ztest_tree); - CuAssertStrEquals(tc, ptr->name, iz3.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, iz5.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, iz4.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, iz8.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, iz7.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, iz6.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, iz2.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, iz1.name); - ptr = zAVLNext(&cursor); - CuAssertTrue(tc, NULL == ptr); - - - ptr = zAVLSearch(ztest_tree, &(iz5.iname)); - CuAssertStrEquals(tc, ptr->name, iz5.name); - ptr = zAVLSearch(ztest_tree, &(iz6.iname)); - CuAssertStrEquals(tc, ptr->name, iz6.name); - ptr = zAVLSearch(ztest_tree, &(iz7.iname)); - CuAssertStrEquals(tc, ptr->name, iz7.name); - ptr = zAVLSearch(ztest_tree, &(iz8.iname)); - CuAssertStrEquals(tc, ptr->name, iz8.name); - ptr = zAVLSearch(ztest_tree, &(z1.iname)); /* been set to 0 */ - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, &(iz8.iname)); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, &(iz8.iname)); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, &(iz3.iname)); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, &(iz3.iname)); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, &(iz1.iname)); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, &(iz1.iname)); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLInsert(ztest_tree, &iz1); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &iz8); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &iz3); - CuAssertTrue(tc, 0 == result); - - ptr = zAVLFirst(&cursor, ztest_tree); - CuAssertIntEquals(tc, ptr->iname, iz3.iname); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, iz5.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, iz4.name); - ptr = zAVLNext(&cursor); - CuAssertIntEquals(tc, ptr->iname, iz8.iname); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, iz7.name); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, iz6.name); - ptr = zAVLNext(&cursor); - CuAssertIntEquals(tc, ptr->iname, iz2.iname); - ptr = zAVLNext(&cursor); - CuAssertStrEquals(tc, ptr->name, iz1.name); - ptr = zAVLNext(&cursor); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, &(iz1.iname)); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, &(iz1.iname)); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, &(iz2.iname)); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, &(iz2.iname)); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, &(iz3.iname)); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, &(iz3.iname)); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, &(iz4.iname)); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, &(iz4.iname)); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, &(iz5.iname)); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, &(iz5.iname)); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, &(iz6.iname)); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, &(iz6.iname)); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, &(iz7.iname)); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, &(iz7.iname)); - CuAssertTrue(tc, NULL == ptr); - - result = zAVLDelete(ztest_tree, &(iz8.iname)); - CuAssertTrue(tc, 0 == result); - ptr = zAVLSearch(ztest_tree, &(iz8.iname)); - CuAssertTrue(tc, NULL == ptr); - -} while (counter < 100); - - result = zAVLInsert(ztest_tree, &iz1); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &iz2); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &iz3); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &iz4); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &iz5); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &iz6); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &iz7); - CuAssertTrue(tc, 0 == result); - result = zAVLInsert(ztest_tree, &iz8); - CuAssertTrue(tc, 0 == result); - - zAVLFreeTree (ztest_tree, free_node); - CuAssertTrue (tc, iz1.iname == 0); - CuAssertTrue (tc, iz2.iname == 0); - CuAssertTrue (tc, iz3.iname == 0); - CuAssertTrue (tc, iz4.iname == 0); - CuAssertTrue (tc, iz5.iname == 0); - CuAssertTrue (tc, iz6.iname == 0); - CuAssertTrue (tc, iz7.iname == 0); - CuAssertTrue (tc, iz8.iname == 0); - - ztest_tree = NULL; - str = strdup("foo"); - result = zAVL_string_set(&ztest_tree, str); - CuAssertTrue(tc, 0 == result); - CuAssertPtrNotNull(tc, ztest_tree); - CuAssertStrEquals(tc, "foo", zAVL_string_get(ztest_tree, "foo")); - - str = strdup("bar"); - result = zAVL_string_set(&ztest_tree, str); - CuAssertTrue(tc, 0 == result); - CuAssertStrEquals(tc, "foo", zAVL_string_get(ztest_tree, "foo")); - CuAssertStrEquals(tc, "bar", zAVL_string_get(ztest_tree, "bar")); - - str = strdup("balloon"); - result = zAVL_string_set(&ztest_tree, str); - CuAssertTrue(tc, 0 == result); - CuAssertStrEquals(tc, "foo", zAVL_string_get(ztest_tree, "foo")); - CuAssertStrEquals(tc, "bar", zAVL_string_get(ztest_tree, "bar")); - CuAssertStrEquals(tc, "balloon", zAVL_string_get(ztest_tree, "balloon")); - - str = zAVL_string_get(ztest_tree, "foobar"); - CuAssertTrue(tc, str == NULL); - str = zAVL_string_get(ztest_tree, ""); - CuAssertTrue(tc, str == NULL); - str = zAVL_string_get(ztest_tree, NULL); - CuAssertTrue(tc, str == NULL); - - zAVL_string_reset(ztest_tree); - ztest_tree = NULL; - str = zAVL_string_get(ztest_tree, "foo"); - CuAssertTrue(tc, str == NULL); - str = zAVL_string_get(ztest_tree, "bar"); - CuAssertTrue(tc, str == NULL); - str = zAVL_string_get(ztest_tree, "balloon"); - CuAssertTrue(tc, str == NULL); - -} Index: trunk/src/depend-gen.c =================================================================== --- trunk/src/depend-gen.c (revision 591) +++ trunk/src/depend-gen.c (revision 1) @@ -197,8 +197,6 @@ p = strrchr(name, '/'); if (p) - { - ++p; - len = strlen(p); - } + ++p; + len = strlen(p); /* skip other dependencies @@ -208,5 +206,5 @@ if (NULL == fgets(line, 1023, fout)) break; - if (p && 0 == strncmp(line, p, len)) + if (0 == strncmp(line, p, len)) break; fprintf(ftmp, "%s", line); @@ -245,5 +243,5 @@ * **************************************************/ - if (0 == strcmp(p, "sh_sig_chksum.h") || + if (0 == strcmp(p, "sh_gpg_chksum.h") || 0 == strcmp(p, "sh_gpg_fp.h")) { Index: trunk/src/dnmalloc.c =================================================================== --- trunk/src/dnmalloc.c (revision 591) +++ (revision ) @@ -1,5622 +1,0 @@ -/* DistriNet malloc (dnmalloc): a more secure memory allocator. - Copyright (C) 2005, Yves Younan, Wouter Joosen, Frank Piessens - and Rainer Wichmann - - The authors can be contacted by: - Email: dnmalloc@fort-knox.org - Address: -#if defined(WITH_TPT) - Yves Younan - Celestijnenlaan 200A - B-3001 Heverlee - Belgium - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -*/ - -/* Current version: dnmalloc 1.0 */ -/* Includes arc4random from OpenBSD, which is under the BDS license */ - -/* Versions: - 0.1-0.5: - Proof of concept implementation by Hans Van den Eynden and Yves Younan - 0.6-0.7: - Bug fixes by Yves Younan - 0.8-1.0.beta4: - Reimplementation from scratch by Yves Younan - 1.0.beta4: - Public release - 1.0.beta5: - Prev_chunkinfo speeded up, was really slow because of the way we did lookups - A freechunkinfo region is now freed when it is completely empty and - not the current one - - 1.0 (Rainer Wichmann [support at la dash samhna dot org]): - --------------------- - - Compiler warnings fixed - Define REALLOC_ZERO_BYTES_FREES because it's what GNU libc does - (and what the standard says) - Removed unused code - Fix assert(aligned_OK(chunk(newp))); - -> assert(aligned_OK(chunk(oldp))); - Fix statistics in sYSMALLOc - Fix overwrite of av->top in sYSMALLOc - Provide own assert(), glibc assert() doesn't work (calls malloc) - Fix bug in mEMALIGn(), put remainder in hashtable before calling fREe - Remove cfree, independent_cmalloc, independent_comalloc (untested - public functions not covered by any standard) - Provide posix_memalign (that one is in the standard) - Move the malloc_state struct to mmapped memory protected by guard pages - Add arc4random function to initialize random canary on startup - Implement random canary at end of (re|m)alloced/memaligned buffer, - check at free/realloc - Remove code conditional on !HAVE_MMAP, since mmap is required anyway. - Use standard HAVE_foo macros (as generated by autoconf) instead of LACKS_foo - - Profiling: Reorder branches in hashtable_add, next_chunkinfo, - prev_chunkinfo, hashtable_insert, mALLOc, fREe, request2size, - checked_request2size (gcc predicts if{} branch to be taken). - Use UNLIKELY macro (gcc __builtin_expect()) where branch - reordering would make the code awkward. - - Portability: Hashtable always covers full 32bit address space to - avoid assumptions about memory layout. - Portability: Try hard to enforce mapping of mmapped memory into - 32bit address space, even on 64bit systems. - Portability: Provide a dnmalloc_pthread_init() function, since - pthread locking on HP-UX only works if initialized - after the application has entered main(). - Portability: On *BSD, pthread_mutex_lock is unusable since it - calls malloc, use spinlocks instead. - Portability: Dynamically detect whether the heap is within - 32bit address range (e.g. on Linux x86_64, it isn't). - Don't use sbrk() if the heap is mapped to an address - outside the 32bit range, since this doesn't work with - the hashtable. New macro morecore32bit. - - Success on: HP-UX 11.11/pthread, Linux/pthread (32/64 bit), - FreeBSD/pthread, and Solaris 10 i386/pthread. - Fail on: OpenBSD/pthread (in _thread_machdep_save_float_state), - might be related to OpenBSD pthread internals (??). - Non-treaded version (#undef USE_MALLOC_LOCK) - works on OpenBSD. - - further to 1.0: - Valgrind client requests inserted (#define USE_VALGRIND) - Fix: malloc_consolidate (nextchunk->fd, nextchunk->bck may be NULL) - Portability: minsize = 32 bit on 64bit architecture - Minor cleanups - Fix: eliminate prototypes for memset, memcpy (they're in string.h) - Fix: one more malloc_consolidate segfault - - There may be some bugs left in this version. please use with caution. -*/ - - - -/* Please read the following papers for documentation: - - Yves Younan, Wouter Joosen, and Frank Piessens, A Methodology for Designing - Countermeasures against Current and Future Code Injection Attacks, - Proceedings of the Third IEEE International Information Assurance - Workshop 2005 (IWIA2005), College Park, Maryland, U.S.A., March 2005, - IEEE, IEEE Press. - http://www.fort-knox.org/younany_countermeasures.pdf - - Yves Younan, Wouter Joosen and Frank Piessens and Hans Van den - Eynden. Security of Memory Allocators for C and C++. Technical Report - CW419, Departement Computerwetenschappen, Katholieke Universiteit - Leuven, July 2005. http://www.fort-knox.org/CW419.pdf - - */ - -/* Compile: - gcc -fPIC -rdynamic -c -Wall dnmalloc-portable.c - "Link": - Dynamic: - gcc -shared -Wl,-soname,libdnmalloc.so.0 -o libdnmalloc.so.0.0 dnmalloc-portable.o -lc - Static: - ar -rv libdnmalloc.a dnmalloc-portable.o - -*/ - -/* - dnmalloc is based on dlmalloc 2.7.2 (by Doug Lea (dl@cs.oswego.edu)) - dlmalloc was released as public domain and contained the following license: - - "This is a version (aka dlmalloc) of malloc/free/realloc written by - Doug Lea and released to the public domain. Use, modify, and - redistribute this code without permission or acknowledgement in any - way you wish. Send questions, comments, complaints, performance - data, etc to dl@cs.oswego.edu - - * VERSION 2.7.2 Sat Aug 17 09:07:30 2002 Doug Lea (dl at gee) - - Note: There may be an updated version of this malloc obtainable at - ftp://gee.cs.oswego.edu/pub/misc/malloc.c - Check before installing!" - -*/ - -/* The following preprocessor macros are tested, - * and hence should have #define directives: - * - * HAVE_CONFIG_H Define to #include "config.h" (autoconf-generated) - * - * HAVE_UNISTD_H Define to #include - * - * HAVE_SYS_UIO_H Define to #include (for writev) - * HAVE_WRITEV Define if the 'writev' function is available - * - * HAVE_SYS_PARAM_H Define to #include (for pagesize) - * - * HAVE_MALLOC_H Define to #include (for struct mallinfo2) - * - * HAVE_FCNTL_H Define to #include - * - * HAVE_SYS_MMAN_H Define to #include - * HAVE_MMAP Define if the 'mmap' function is available. - * - * HAVE_SCHED_H Define to #include - * HAVE_SCHED_YIELD Define id the 'sched_yield' function is available - */ - - -/* - __STD_C should be nonzero if using ANSI-standard C compiler, a C++ - compiler, or a C compiler sufficiently close to ANSI to get away - with it. -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#ifdef USE_VALGRIND -#include -#else -#define VALGRIND_FREELIKE_BLOCK(a,b) ((void)0) -#define VALGRIND_MALLOCLIKE_BLOCK(a,b,c,d) ((void)0) -#define VALGRIND_CREATE_MEMPOOL(a,b,c) ((void)0) -#define VALGRIND_MEMPOOL_ALLOC(a,b,c) ((void)0) -#define VALGRIND_MEMPOOL_FREE(a,b) ((void)0) -#define VALGRIND_DESTROY_MEMPOOL(a) ((void)0) -#define VALGRIND_MAKE_MEM_DEFINED(a,b) ((void)0) -#define VALGRIND_MAKE_MEM_UNDEFINED(a,b) ((void)0) -#define VALGRIND_MAKE_MEM_NOACCESS(a,b) ((void)0) -#endif - -#if defined (__GNUC__) && __GNUC__ > 2 -# define LIKELY(expression) (__builtin_expect(!!(expression), 1)) -# define UNLIKELY(expression) (__builtin_expect(!!(expression), 0)) -# define __attribute_malloc__ __attribute__ ((__malloc__)) -#else -# define LIKELY(x) (x) -# define UNLIKELY(x) (x) -# define __attribute_malloc__ /* Ignore */ -#endif - -/* - Define HAVE_MREMAP to make realloc() use mremap() to re-allocate - large blocks. This is currently only possible on Linux with - kernel versions newer than 1.3.77. -*/ - -#ifndef HAVE_MREMAP -#ifdef linux -#define HAVE_MREMAP 1 -#define _GNU_SOURCE 1 -#else -#define HAVE_MREMAP 0 -#endif -#endif /* HAVE_MREMAP */ - - - -#ifndef __STD_C -#if defined(__STDC__) || defined(_cplusplus) -#define __STD_C 1 -#else -#define __STD_C 0 -#endif -#endif /*__STD_C*/ - - -/* - Void_t* is the pointer type that malloc should say it returns -*/ - -#ifndef Void_t -#if (__STD_C || defined(WIN32)) -#define Void_t void -#else -#define Void_t char -#endif -#endif /*Void_t*/ - -#if __STD_C -#include /* for size_t */ -#else -#include -#endif - -#if !defined(USE_SYSTEM_MALLOC) - -#ifdef __cplusplus -extern "C" { -#endif - -/* define HAVE_UNISTD_H if your system has a . */ - -#ifdef HAVE_UNISTD_H -#include -#endif - -#ifdef HAVE_SYS_UIO_H -#include -#endif - -#include /* needed for malloc_stats */ -#include /* needed for optional MALLOC_FAILURE_ACTION */ - -#include -#include - -#include - -extern int errno; - - /* 0: lazy, - * 1: medium (assertions compiled in), - * 2: high (guard pages at end of hash table and ciregions) - * 3: paranoid (guards at end of each allocated chunk, check at free) - */ -#ifndef PARANOIA -#define PARANOIA 9 -#endif - - /* Using assert() with multithreading will cause the code - * to deadlock since glibc __assert_fail will call malloc(). - * We need our very own assert(). - */ -typedef void assert_handler_tp(const char * error, const char *file, int line); - -#if PARANOIA > 0 - -#ifdef NDEBUG -#undef NDEBUG -#endif - -static void default_assert_handler(const char *error, - const char *file, int line) -{ -#ifdef HAVE_WRITEV - struct iovec iov[5]; - char * i1 = "assertion failed ("; - char * i3 = "): "; - char * i5 = "\n"; - int res = 0; - char ifile[128]; - char ierr[128]; - - strncpy(ifile, file, sizeof(ifile)); ifile[sizeof(ifile)-1] = '\0'; - strncpy(ierr, error, sizeof(ierr)); ierr[sizeof(ierr)-1] = '\0'; - - iov[0].iov_base = i1; iov[0].iov_len = strlen(i1); - iov[1].iov_base = ifile; iov[1].iov_len = strlen(ifile); - iov[2].iov_base = i3; iov[2].iov_len = strlen(i3); - iov[3].iov_base = ierr; iov[3].iov_len = strlen(ierr); - iov[4].iov_base = i5; iov[4].iov_len = strlen(i5); - do { - res = writev(STDERR_FILENO, iov, 5); - } while (res < 0 && errno == EINTR); -#else - fputs("assertion failed (", stderr); - fputs(file, stderr); - fputs("): ", stderr); - fputs(error, stderr); - fputc('\n', stderr); -#endif - (void) line; - abort(); -} -static assert_handler_tp *assert_handler = default_assert_handler; - - -#define assert(x) \ - do { \ - if (UNLIKELY(!(x))) { \ - assert_handler(#x, __FILE__, __LINE__); \ - } \ - } while (0) - -#else - -static assert_handler_tp *assert_handler = NULL; -#ifndef NDEBUG -#define NDEBUG -#endif -#define assert(x) ((void)0) - -#endif - -assert_handler_tp *dnmalloc_set_handler(assert_handler_tp *new) -{ - assert_handler_tp *old = assert_handler; - assert_handler = new; - return old; -} - - -#include - - /* define for debugging */ - /* #define DNMALLOC_DEBUG */ - - /* Do some extra checks? if not, covered by assrt()s */ - /* #define DNMALLOC_CHECKS */ - - /* - The unsigned integer type used for comparing any two chunk sizes. - This should be at least as wide as size_t, but should not be signed. - */ - -#ifndef CHUNK_SIZE_T -#define CHUNK_SIZE_T unsigned long -#endif - -/* - The unsigned integer type used to hold addresses when they are are - manipulated as integers. Except that it is not defined on all - systems, intptr_t would suffice. -*/ -#ifndef PTR_UINT -#define PTR_UINT unsigned long -#endif - - -/* - INTERNAL_SIZE_T is the word-size used for internal bookkeeping - of chunk sizes. - - The default version is the same as size_t. - - While not strictly necessary, it is best to define this as an - unsigned type, even if size_t is a signed type. This may avoid some - artificial size limitations on some systems. - - On a 64-bit machine, you may be able to reduce malloc overhead by - defining INTERNAL_SIZE_T to be a 32 bit `unsigned int' at the - expense of not being able to handle more than 2^32 of malloced - space. If this limitation is acceptable, you are encouraged to set - this unless you are on a platform requiring 16byte alignments. In - this case the alignment requirements turn out to negate any - potential advantages of decreasing size_t word size. - - Implementors: Beware of the possible combinations of: - - INTERNAL_SIZE_T might be signed or unsigned, might be 32 or 64 bits, - and might be the same width as int or as long - - size_t might have different width and signedness as INTERNAL_SIZE_T - - int and long might be 32 or 64 bits, and might be the same width - To deal with this, most comparisons and difference computations - among INTERNAL_SIZE_Ts should cast them to CHUNK_SIZE_T, being - aware of the fact that casting an unsigned int to a wider long does - not sign-extend. (This also makes checking for negative numbers - awkward.) Some of these casts result in harmless compiler warnings - on some systems. -*/ - -#ifndef INTERNAL_SIZE_T -#define INTERNAL_SIZE_T size_t -#endif - -/* The corresponding word size */ -#define SIZE_SZ (sizeof(INTERNAL_SIZE_T)) - - - -/* - MALLOC_ALIGNMENT is the minimum alignment for malloc'ed chunks. - It must be a power of two at least 2 * SIZE_SZ, even on machines - for which smaller alignments would suffice. It may be defined as - larger than this though. Note however that code and data structures - are optimized for the case of 8-byte alignment. -*/ - - -#ifndef MALLOC_ALIGNMENT -#define MALLOC_ALIGNMENT (2 * SIZE_SZ) -#endif - -/* The corresponding bit mask value */ -#define MALLOC_ALIGN_MASK (MALLOC_ALIGNMENT - 1) - - - -/* - REALLOC_ZERO_BYTES_FREES should be set if a call to - realloc with zero bytes should be the same as a call to free. - Some people think it should. Otherwise, since this malloc - returns a unique pointer for malloc(0), so does realloc(p, 0). -*/ - -#define REALLOC_ZERO_BYTES_FREES - -/* - TRIM_FASTBINS controls whether free() of a very small chunk can - immediately lead to trimming. Setting to true (1) can reduce memory - footprint, but will almost always slow down programs that use a lot - of small chunks. - - Define this only if you are willing to give up some speed to more - aggressively reduce system-level memory footprint when releasing - memory in programs that use many small chunks. You can get - essentially the same effect by setting MXFAST to 0, but this can - lead to even greater slowdowns in programs using many small chunks. - TRIM_FASTBINS is an in-between compile-time option, that disables - only those chunks bordering topmost memory from being placed in - fastbins. -*/ - -#ifndef TRIM_FASTBINS -#define TRIM_FASTBINS 0 -#endif - - -/* - USE_DL_PREFIX will prefix all public routines with the string 'dl'. - This is necessary when you only want to use this malloc in one part - of a program, using your regular system malloc elsewhere. -*/ - -/* #define USE_DL_PREFIX */ - - -/* - USE_MALLOC_LOCK causes wrapper functions to surround each - callable routine with pthread mutex lock/unlock. - - USE_MALLOC_LOCK forces USE_PUBLIC_MALLOC_WRAPPERS to be defined -*/ - -/* #define USE_MALLOC_LOCK */ - - -/* - If USE_PUBLIC_MALLOC_WRAPPERS is defined, every public routine is - actually a wrapper function that first calls MALLOC_PREACTION, then - calls the internal routine, and follows it with - MALLOC_POSTACTION. This is needed for locking, but you can also use - this, without USE_MALLOC_LOCK, for purposes of interception, - instrumentation, etc. It is a sad fact that using wrappers often - noticeably degrades performance of malloc-intensive programs. -*/ - - -#ifdef USE_MALLOC_LOCK -#define USE_PUBLIC_MALLOC_WRAPPERS -#else -/* #define USE_PUBLIC_MALLOC_WRAPPERS */ -#endif - - -/* - Two-phase name translation. - All of the actual routines are given mangled names. - When wrappers are used, they become the public callable versions. - When DL_PREFIX is used, the callable names are prefixed. -*/ - -#ifndef USE_PUBLIC_MALLOC_WRAPPERS -#define cALLOc public_cALLOc -#define fREe public_fREe -#define mALLOc public_mALLOc -#define mEMALIGn public_mEMALIGn -#define posix_mEMALIGn public_posix_mEMALIGn -#define rEALLOc public_rEALLOc -#define vALLOc public_vALLOc -#define pVALLOc public_pVALLOc -#define mALLINFo2 public_mALLINFo2 -#define mALLOPt public_mALLOPt -#define mTRIm public_mTRIm -#define mSTATs public_mSTATs -#define mUSABLe public_mUSABLe -#endif - -#ifdef USE_DL_PREFIX -#define public_cALLOc dlcalloc -#define public_fREe dlfree -#define public_mALLOc dlmalloc -#define public_mEMALIGn dlmemalign -#define public_posix_mEMALIGn dlposix_memalign -#define public_rEALLOc dlrealloc -#define public_vALLOc dlvalloc -#define public_pVALLOc dlpvalloc -#define public_mALLINFo2 dlmallinfo2 -#define public_mALLOPt dlmallopt -#define public_mTRIm dlmalloc_trim -#define public_mSTATs dlmalloc_stats -#define public_mUSABLe dlmalloc_usable_size -#else /* USE_DL_PREFIX */ -#define public_cALLOc calloc -#define public_fREe free -#define public_mALLOc malloc -#define public_mEMALIGn memalign -#define public_posix_mEMALIGn posix_memalign -#define public_rEALLOc realloc -#define public_vALLOc valloc -#define public_pVALLOc pvalloc -#define public_mALLINFo2 mallinfo2 -#define public_mALLOPt mallopt -#define public_mTRIm malloc_trim -#define public_mSTATs malloc_stats -#define public_mUSABLe malloc_usable_size -#endif /* USE_DL_PREFIX */ - - -/* - HAVE_MEMCPY should be defined if you are not otherwise using - ANSI STD C, but still have memcpy and memset in your C library - and want to use them in calloc and realloc. Otherwise simple - macro versions are defined below. - - USE_MEMCPY should be defined as 1 if you actually want to - have memset and memcpy called. People report that the macro - versions are faster than libc versions on some systems. - - Even if USE_MEMCPY is set to 1, loops to copy/clear small chunks - (of <= 36 bytes) are manually unrolled in realloc and calloc. -*/ - -#ifndef HAVE_MEMCPY -#define HAVE_MEMCPY -#endif - -#ifndef USE_MEMCPY -#ifdef HAVE_MEMCPY -#define USE_MEMCPY 1 -#else -#define USE_MEMCPY 0 -#endif -#endif - - -#if (__STD_C || defined(HAVE_MEMCPY)) - -#ifdef WIN32 - /* On Win32 memset and memcpy are already declared in windows.h */ -#else -#if __STD_C - /* Defined in string.h */ -#else -Void_t* memset(); -Void_t* memcpy(); -#endif -#endif -#endif - -/* - MALLOC_FAILURE_ACTION is the action to take before "return 0" when - malloc fails to be able to return memory, either because memory is - exhausted or because of illegal arguments. - - By default, sets errno if running on STD_C platform, else does nothing. -*/ - -#ifndef MALLOC_FAILURE_ACTION -#if __STD_C -#define MALLOC_FAILURE_ACTION \ - errno = ENOMEM; - -#else -#define MALLOC_FAILURE_ACTION -#endif -#endif - -/* - MORECORE-related declarations. By default, rely on sbrk -*/ - - -#if !defined(HAVE_UNISTD_H) -#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) -#if __STD_C -extern Void_t* sbrk(ptrdiff_t); -#else -extern Void_t* sbrk(); -#endif -#endif -#endif - -/* - MORECORE_FAILURE is the value returned upon failure of MORECORE - as well as mmap. Since it cannot be an otherwise valid memory address, - and must reflect values of standard sys calls, you probably ought not - try to redefine it. -*/ - -#ifndef MORECORE_FAILURE -#define MORECORE_FAILURE ((void*)(-1UL)) -#endif - -/* - MORECORE is the name of the routine to call to obtain more memory - from the system. See below for general guidance on writing - alternative MORECORE functions, as well as a version for WIN32 and a - sample version for pre-OSX macos. -*/ - -#ifndef MORECORE -#define MORECORE sbrk -#endif - - -/* - If MORECORE_CONTIGUOUS is true, take advantage of fact that - consecutive calls to MORECORE with positive arguments always return - contiguous increasing addresses. This is true of unix sbrk. Even - if not defined, when regions happen to be contiguous, malloc will - permit allocations spanning regions obtained from different - calls. But defining this when applicable enables some stronger - consistency checks and space efficiencies. -*/ - -#ifndef MORECORE_CONTIGUOUS -#define MORECORE_CONTIGUOUS 1 -#endif - -/* - Define MORECORE_CANNOT_TRIM if your version of MORECORE - cannot release space back to the system when given negative - arguments. This is generally necessary only if you are using - a hand-crafted MORECORE function that cannot handle negative arguments. -*/ - -/* #define MORECORE_CANNOT_TRIM */ - - -/* - This malloc requires mmap for heap management data. It is an error - if mmap is not available. - - Additionally, mmap will be used to satisfy large requests. -*/ - -#ifndef HAVE_MMAP -# error HAVE_MMAP not defined, has your operating system mmap? -#endif - -/* - Standard unix mmap using /dev/zero clears memory so calloc doesn't - need to. -*/ - -#ifndef MMAP_CLEARS -#define MMAP_CLEARS 1 -#endif - - -/* - MMAP_AS_MORECORE_SIZE is the minimum mmap size argument to use if - sbrk fails, and mmap is used as a backup (which is done only if - HAVE_MMAP). The value must be a multiple of page size. This - backup strategy generally applies only when systems have "holes" in - address space, so sbrk cannot perform contiguous expansion, but - there is still space available on system. On systems for which - this is known to be useful (i.e. most linux kernels), this occurs - only when programs allocate huge amounts of memory. Between this, - and the fact that mmap regions tend to be limited, the size should - be large, to avoid too many mmap calls and thus avoid running out - of kernel resources. -*/ - -#ifndef MMAP_AS_MORECORE_SIZE -#define MMAP_AS_MORECORE_SIZE (1024 * 1024) -#endif - - -/* - The system page size. To the extent possible, this malloc manages - memory from the system in page-size units. Note that this value is - cached during initialization into a field of malloc_state. So even - if malloc_getpagesize is a function, it is only called once. - - The following mechanics for getpagesize were adapted from bsd/gnu - getpagesize.h. If none of the system-probes here apply, a value of - 4096 is used, which should be OK: If they don't apply, then using - the actual value probably doesn't impact performance. -*/ - - -#ifndef malloc_getpagesize - -# ifdef _SC_PAGESIZE /* some SVR4 systems omit an underscore */ -# ifndef _SC_PAGE_SIZE -# define _SC_PAGE_SIZE _SC_PAGESIZE -# endif -# endif - -# ifdef _SC_PAGE_SIZE -# define malloc_getpagesize sysconf(_SC_PAGE_SIZE) -# else -# if defined(BSD) || defined(DGUX) || defined(HAVE_GETPAGESIZE) - extern size_t getpagesize(); -# define malloc_getpagesize getpagesize() -# else -# ifdef WIN32 /* use supplied emulation of getpagesize */ -# define malloc_getpagesize getpagesize() -# else -# if defined(HAVE_SYS_PARAM_H) -# include -# endif -# ifdef EXEC_PAGESIZE -# define malloc_getpagesize EXEC_PAGESIZE -# else -# ifdef NBPG -# ifndef CLSIZE -# define malloc_getpagesize NBPG -# else -# define malloc_getpagesize (NBPG * CLSIZE) -# endif -# else -# ifdef NBPC -# define malloc_getpagesize NBPC -# else -# ifdef PAGESIZE -# define malloc_getpagesize PAGESIZE -# else /* just guess */ -# define malloc_getpagesize (4096) -# endif -# endif -# endif -# endif -# endif -# endif -# endif -#endif - -/* - This version of malloc supports the standard SVID/XPG mallinfo2 - routine that returns a struct containing usage properties and - statistics. It should work on any SVID/XPG compliant system that has - a /usr/include/malloc.h defining struct mallinfo2. (If you'd like to - install such a thing yourself, cut out the preliminary declarations - as described above and below and save them in a malloc.h file. But - there's no compelling reason to bother to do this.) - - The main declaration needed is the mallinfo2 struct that is returned - (by-copy) by mallinfo2(). The SVID/XPG malloinfo2 struct contains a - bunch of fields that are not even meaningful in this version of - malloc. These fields are are instead filled by mallinfo2() with - other numbers that might be of interest. - - HAVE_MALLOC_H should be set if you have a - /usr/include/malloc.h file that includes a declaration of struct - mallinfo2. If so, it is included; else an SVID2/XPG2 compliant - version is declared below. These must be precisely the same for - mallinfo2() to work. The original SVID version of this struct, - defined on most systems with mallinfo2, declares all fields as - size_2. But some others define as unsigned long. If your system - defines the fields using a type of different width than listed here, - you must #include your system version and #define - HAVE_MALLOC_H. -*/ - -/* #define HAVE_MALLOC_H */ - -/* On *BSD, malloc.h is deprecated, and on some *BSD including - * it may actually raise an error. - */ -#if defined(HAVE_MALLOC_H) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 33) -#include -#else - -/* SVID2/XPG mallinfo2 structure */ - -struct mallinfo2 { - size_t arena; /* non-mmapped space allocated from system */ - size_t ordblks; /* number of free chunks */ - size_t smblks; /* number of fastbin blocks */ - size_t hblks; /* number of mmapped regions */ - size_t hblkhd; /* space in mmapped regions */ - size_t usmblks; /* maximum total allocated space */ - size_t fsmblks; /* space available in freed fastbin blocks */ - size_t uordblks; /* total allocated space */ - size_t fordblks; /* total free space */ - size_t keepcost; /* top-most, releasable (via malloc_trim) space */ -}; - -/* - SVID/XPG defines four standard parameter numbers for mallopt, - normally defined in malloc.h. Only one of these (M_MXFAST) is used - in this malloc. The others (M_NLBLKS, M_GRAIN, M_KEEP) don't apply, - so setting them has no effect. But this malloc also supports other - options in mallopt described below. -*/ -#endif - - -/* ---------- description of public routines ------------ */ - -/* - malloc(size_t n) - Returns a pointer to a newly allocated chunk of at least n bytes, or null - if no space is available. Additionally, on failure, errno is - set to ENOMEM on ANSI C systems. - - If n is zero, malloc returns a minumum-sized chunk. (The minimum - size is 16 bytes on most 32bit systems, and 24 or 32 bytes on 64bit - systems.) On most systems, size_t is an unsigned type, so calls - with negative arguments are interpreted as requests for huge amounts - of space, which will often fail. The maximum supported value of n - differs across systems, but is in all cases less than the maximum - representable value of a size_t. -*/ -#if __STD_C -Void_t* public_mALLOc(size_t) __attribute_malloc__; -#else -Void_t* public_mALLOc(); -#endif - -/* - free(Void_t* p) - Releases the chunk of memory pointed to by p, that had been previously - allocated using malloc or a related routine such as realloc. - It has no effect if p is null. It can have arbitrary (i.e., bad!) - effects if p has already been freed. - - Unless disabled (using mallopt), freeing very large spaces will - when possible, automatically trigger operations that give - back unused memory to the system, thus reducing program footprint. -*/ -#if __STD_C -void public_fREe(Void_t*); -#else -void public_fREe(); -#endif - -/* - calloc(size_t n_elements, size_t element_size); - Returns a pointer to n_elements * element_size bytes, with all locations - set to zero. -*/ -#if __STD_C -Void_t* public_cALLOc(size_t, size_t) __attribute_malloc__; -#else -Void_t* public_cALLOc(); -#endif - -/* - realloc(Void_t* p, size_t n) - Returns a pointer to a chunk of size n that contains the same data - as does chunk p up to the minimum of (n, p's size) bytes, or null - if no space is available. - - The returned pointer may or may not be the same as p. The algorithm - prefers extending p when possible, otherwise it employs the - equivalent of a malloc-copy-free sequence. - - If p is null, realloc is equivalent to malloc. - - If space is not available, realloc returns null, errno is set (if on - ANSI) and p is NOT freed. - - if n is for fewer bytes than already held by p, the newly unused - space is lopped off and freed if possible. Unless the #define - REALLOC_ZERO_BYTES_FREES is set, realloc with a size argument of - zero (re)allocates a minimum-sized chunk. - - Large chunks that were internally obtained via mmap will always - be reallocated using malloc-copy-free sequences unless - the system supports MREMAP (currently only linux). - - The old unix realloc convention of allowing the last-free'd chunk - to be used as an argument to realloc is not supported. -*/ -#if __STD_C -Void_t* public_rEALLOc(Void_t*, size_t) __attribute_malloc__; -#else -Void_t* public_rEALLOc(); -#endif - -/* - memalign(size_t alignment, size_t n); - Returns a pointer to a newly allocated chunk of n bytes, aligned - in accord with the alignment argument. - - The alignment argument should be a power of two. If the argument is - not a power of two, the nearest greater power is used. - 8-byte alignment is guaranteed by normal malloc calls, so don't - bother calling memalign with an argument of 8 or less. - - Overreliance on memalign is a sure way to fragment space. -*/ -#if __STD_C -Void_t* public_mEMALIGn(size_t, size_t) __attribute_malloc__; -#else -Void_t* public_mEMALIGn(); -#endif - -/* - posix_memalign(void** memptr, size_t alignment, size_t n); - Sets *memptr to the address of a newly allocated chunk of n bytes, aligned - in accord with the alignment argument. Returns 0 on success, otherwise - an error (EINVAL for incorrect alignment, ENOMEM for out of memory). - - The alignment must be a power of two, and a multiple of sizeof(void *). -*/ -#if __STD_C -int public_posix_mEMALIGn(Void_t**, size_t, size_t); -#else -int public_posix_mEMALIGn(); -#endif - -/* - valloc(size_t n); - Equivalent to memalign(pagesize, n), where pagesize is the page - size of the system. If the pagesize is unknown, 4096 is used. -*/ -#if __STD_C -Void_t* public_vALLOc(size_t) __attribute_malloc__; -#else -Void_t* public_vALLOc(); -#endif - - - -/* - mallopt(int parameter_number, int parameter_value) - Sets tunable parameters The format is to provide a - (parameter-number, parameter-value) pair. mallopt then sets the - corresponding parameter to the argument value if it can (i.e., so - long as the value is meaningful), and returns 1 if successful else - 0. SVID/XPG/ANSI defines four standard param numbers for mallopt, - normally defined in malloc.h. Only one of these (M_MXFAST) is used - in this malloc. The others (M_NLBLKS, M_GRAIN, M_KEEP) don't apply, - so setting them has no effect. But this malloc also supports four - other options in mallopt. See below for details. Briefly, supported - parameters are as follows (listed defaults are for "typical" - configurations). - - Symbol param # default allowed param values - M_MXFAST 1 64 0-80 (0 disables fastbins) - M_TRIM_THRESHOLD -1 256*1024 any (-1U disables trimming) - M_TOP_PAD -2 0 any - M_MMAP_THRESHOLD -3 256*1024 any (or 0 if no MMAP support) - M_MMAP_MAX -4 65536 any (0 disables use of mmap) -*/ -#if __STD_C -int public_mALLOPt(int, int); -#else -int public_mALLOPt(); -#endif - - -/* - mallinfo2() - Returns (by copy) a struct containing various summary statistics: - - arena: current total non-mmapped bytes allocated from system - ordblks: the number of free chunks - smblks: the number of fastbin blocks (i.e., small chunks that - have been freed but not use resused or consolidated) - hblks: current number of mmapped regions - hblkhd: total bytes held in mmapped regions - usmblks: the maximum total allocated space. This will be greater - than current total if trimming has occurred. - fsmblks: total bytes held in fastbin blocks - uordblks: current total allocated space (normal or mmapped) - fordblks: total free space - keepcost: the maximum number of bytes that could ideally be released - back to system via malloc_trim. ("ideally" means that - it ignores page restrictions etc.) - - Because these fields are ints, but internal bookkeeping may - be kept as longs, the reported values may wrap around zero and - thus be inaccurate. -*/ -#if __STD_C -struct mallinfo2 public_mALLINFo2(void); -#else -struct mallinfo2 public_mALLINFo2(); -#endif - -/* - pvalloc(size_t n); - Equivalent to valloc(minimum-page-that-holds(n)), that is, - round up n to nearest pagesize. - */ -#if __STD_C -Void_t* public_pVALLOc(size_t) __attribute_malloc__; -#else -Void_t* public_pVALLOc(); -#endif - -/* - malloc_trim(size_t pad); - - If possible, gives memory back to the system (via negative - arguments to sbrk) if there is unused memory at the `high' end of - the malloc pool. You can call this after freeing large blocks of - memory to potentially reduce the system-level memory requirements - of a program. However, it cannot guarantee to reduce memory. Under - some allocation patterns, some large free blocks of memory will be - locked between two used chunks, so they cannot be given back to - the system. - - The `pad' argument to malloc_trim represents the amount of free - trailing space to leave untrimmed. If this argument is zero, - only the minimum amount of memory to maintain internal data - structures will be left (one page or less). Non-zero arguments - can be supplied to maintain enough trailing space to service - future expected allocations without having to re-obtain memory - from the system. - - Malloc_trim returns 1 if it actually released any memory, else 0. - On systems that do not support "negative sbrks", it will always - rreturn 0. -*/ -#if __STD_C -int public_mTRIm(size_t); -#else -int public_mTRIm(); -#endif - -/* - malloc_usable_size(Void_t* p); - - Returns the number of bytes you can actually use in - an allocated chunk, which may be more than you requested (although - often not) due to alignment and minimum size constraints. - You can use this many bytes without worrying about - overwriting other allocated objects. This is not a particularly great - programming practice. malloc_usable_size can be more useful in - debugging and assertions, for example: - - p = malloc(n); - assert(malloc_usable_size(p) >= 256); - -*/ -#if __STD_C -size_t public_mUSABLe(Void_t*); -#else -size_t public_mUSABLe(); -#endif - -/* - malloc_stats(); - Prints on stderr the amount of space obtained from the system (both - via sbrk and mmap), the maximum amount (which may be more than - current if malloc_trim and/or munmap got called), and the current - number of bytes allocated via malloc (or realloc, etc) but not yet - freed. Note that this is the number of bytes allocated, not the - number requested. It will be larger than the number requested - because of alignment and bookkeeping overhead. Because it includes - alignment wastage as being in use, this figure may be greater than - zero even when no user-level chunks are allocated. - - The reported current and maximum system memory can be inaccurate if - a program makes other calls to system memory allocation functions - (normally sbrk) outside of malloc. - - malloc_stats prints only the most commonly interesting statistics. - More information can be obtained by calling mallinfo2. - -*/ -#if __STD_C -void public_mSTATs(); -#else -void public_mSTATs(); -#endif - -/* mallopt tuning options */ - -/* - M_MXFAST is the maximum request size used for "fastbins", special bins - that hold returned chunks without consolidating their spaces. This - enables future requests for chunks of the same size to be handled - very quickly, but can increase fragmentation, and thus increase the - overall memory footprint of a program. - - This malloc manages fastbins very conservatively yet still - efficiently, so fragmentation is rarely a problem for values less - than or equal to the default. The maximum supported value of MXFAST - is 80. You wouldn't want it any higher than this anyway. Fastbins - are designed especially for use with many small structs, objects or - strings -- the default handles structs/objects/arrays with sizes up - to 16 4byte fields, or small strings representing words, tokens, - etc. Using fastbins for larger objects normally worsens - fragmentation without improving speed. - - M_MXFAST is set in REQUEST size units. It is internally used in - chunksize units, which adds padding and alignment. You can reduce - M_MXFAST to 0 to disable all use of fastbins. This causes the malloc - algorithm to be a closer approximation of fifo-best-fit in all cases, - not just for larger requests, but will generally cause it to be - slower. -*/ - - -/* M_MXFAST is a standard SVID/XPG tuning option, usually listed in malloc.h */ -#ifndef M_MXFAST -#define M_MXFAST 1 -#endif - -#ifndef DEFAULT_MXFAST -#define DEFAULT_MXFAST 64 -#endif - - -/* - M_TRIM_THRESHOLD is the maximum amount of unused top-most memory - to keep before releasing via malloc_trim in free(). - - Automatic trimming is mainly useful in long-lived programs. - Because trimming via sbrk can be slow on some systems, and can - sometimes be wasteful (in cases where programs immediately - afterward allocate more large chunks) the value should be high - enough so that your overall system performance would improve by - releasing this much memory. - - The trim threshold and the mmap control parameters (see below) - can be traded off with one another. Trimming and mmapping are - two different ways of releasing unused memory back to the - system. Between these two, it is often possible to keep - system-level demands of a long-lived program down to a bare - minimum. For example, in one test suite of sessions measuring - the XF86 X server on Linux, using a trim threshold of 128K and a - mmap threshold of 192K led to near-minimal long term resource - consumption. - - If you are using this malloc in a long-lived program, it should - pay to experiment with these values. As a rough guide, you - might set to a value close to the average size of a process - (program) running on your system. Releasing this much memory - would allow such a process to run in memory. Generally, it's - worth it to tune for trimming rather tham memory mapping when a - program undergoes phases where several large chunks are - allocated and released in ways that can reuse each other's - storage, perhaps mixed with phases where there are no such - chunks at all. And in well-behaved long-lived programs, - controlling release of large blocks via trimming versus mapping - is usually faster. - - However, in most programs, these parameters serve mainly as - protection against the system-level effects of carrying around - massive amounts of unneeded memory. Since frequent calls to - sbrk, mmap, and munmap otherwise degrade performance, the default - parameters are set to relatively high values that serve only as - safeguards. - - The trim value must be greater than page size to have any useful - effect. To disable trimming completely, you can set to - (unsigned long)(-1) - - Trim settings interact with fastbin (MXFAST) settings: Unless - TRIM_FASTBINS is defined, automatic trimming never takes place upon - freeing a chunk with size less than or equal to MXFAST. Trimming is - instead delayed until subsequent freeing of larger chunks. However, - you can still force an attempted trim by calling malloc_trim. - - Also, trimming is not generally possible in cases where - the main arena is obtained via mmap. - - Note that the trick some people use of mallocing a huge space and - then freeing it at program startup, in an attempt to reserve system - memory, doesn't have the intended effect under automatic trimming, - since that memory will immediately be returned to the system. -*/ - -#define M_TRIM_THRESHOLD -1 - -#ifndef DEFAULT_TRIM_THRESHOLD -#define DEFAULT_TRIM_THRESHOLD (256 * 1024) -#endif - -/* - M_TOP_PAD is the amount of extra `padding' space to allocate or - retain whenever sbrk is called. It is used in two ways internally: - - * When sbrk is called to extend the top of the arena to satisfy - a new malloc request, this much padding is added to the sbrk - request. - - * When malloc_trim is called automatically from free(), - it is used as the `pad' argument. - - In both cases, the actual amount of padding is rounded - so that the end of the arena is always a system page boundary. - - The main reason for using padding is to avoid calling sbrk so - often. Having even a small pad greatly reduces the likelihood - that nearly every malloc request during program start-up (or - after trimming) will invoke sbrk, which needlessly wastes - time. - - Automatic rounding-up to page-size units is normally sufficient - to avoid measurable overhead, so the default is 0. However, in - systems where sbrk is relatively slow, it can pay to increase - this value, at the expense of carrying around more memory than - the program needs. -*/ - -#define M_TOP_PAD -2 - -#ifndef DEFAULT_TOP_PAD -#define DEFAULT_TOP_PAD (0) -#endif - -/* - M_MMAP_THRESHOLD is the request size threshold for using mmap() - to service a request. Requests of at least this size that cannot - be allocated using already-existing space will be serviced via mmap. - (If enough normal freed space already exists it is used instead.) - - Using mmap segregates relatively large chunks of memory so that - they can be individually obtained and released from the host - system. A request serviced through mmap is never reused by any - other request (at least not directly; the system may just so - happen to remap successive requests to the same locations). - - Segregating space in this way has the benefits that: - - 1. Mmapped space can ALWAYS be individually released back - to the system, which helps keep the system level memory - demands of a long-lived program low. - 2. Mapped memory can never become `locked' between - other chunks, as can happen with normally allocated chunks, which - means that even trimming via malloc_trim would not release them. - 3. On some systems with "holes" in address spaces, mmap can obtain - memory that sbrk cannot. - - However, it has the disadvantages that: - - 1. The space cannot be reclaimed, consolidated, and then - used to service later requests, as happens with normal chunks. - 2. It can lead to more wastage because of mmap page alignment - requirements - 3. It causes malloc performance to be more dependent on host - system memory management support routines which may vary in - implementation quality and may impose arbitrary - limitations. Generally, servicing a request via normal - malloc steps is faster than going through a system's mmap. - - The advantages of mmap nearly always outweigh disadvantages for - "large" chunks, but the value of "large" varies across systems. The - default is an empirically derived value that works well in most - systems. -*/ - -#define M_MMAP_THRESHOLD -3 - -#ifndef DEFAULT_MMAP_THRESHOLD -#define DEFAULT_MMAP_THRESHOLD (256 * 1024) -#endif - -/* - M_MMAP_MAX is the maximum number of requests to simultaneously - service using mmap. This parameter exists because -. Some systems have a limited number of internal tables for - use by mmap, and using more than a few of them may degrade - performance. - - The default is set to a value that serves only as a safeguard. - Setting to 0 disables use of mmap for servicing large requests. If - HAVE_MMAP is not set, the default value is 0, and attempts to set it - to non-zero values in mallopt will fail. -*/ - -#define M_MMAP_MAX -4 - -#ifndef DEFAULT_MMAP_MAX -#define DEFAULT_MMAP_MAX (65536) -#endif - -#ifdef __cplusplus -}; /* end of extern "C" */ -#endif - -/* - ======================================================================== - To make a fully customizable malloc.h header file, cut everything - above this line, put into file malloc.h, edit to suit, and #include it - on the next line, as well as in programs that use this malloc. - ======================================================================== -*/ - -/* #include "malloc.h" */ - -/* --------------------- public wrappers ---------------------- */ - -#ifdef USE_PUBLIC_MALLOC_WRAPPERS - -/* DL_STATIC used to make functions (deep down) consistent - * with prototypes (otherwise the prototypes are static - * with USE_PUBLIC_MALLOC_WRAPPERS, but the functions aren't). - * The gcc compiler doesn't care, but the HP-UX compiler does. - */ -#define DL_STATIC static - -/* Declare all routines as internal */ -#if __STD_C -static Void_t* mALLOc(size_t) __attribute_malloc__; -static void fREe(Void_t*); -static Void_t* rEALLOc(Void_t*, size_t) __attribute_malloc__; -static Void_t* mEMALIGn(size_t, size_t) __attribute_malloc__; -static int posix_mEMALIGn(Void_t**, size_t, size_t); -static Void_t* vALLOc(size_t) __attribute_malloc__; -static Void_t* pVALLOc(size_t) __attribute_malloc__; -static Void_t* cALLOc(size_t, size_t) __attribute_malloc__; -static int mTRIm(size_t); -static size_t mUSABLe(Void_t*); -static void mSTATs(); -static int mALLOPt(int, int); -static struct mallinfo2 mALLINFo2(void); -#else -static Void_t* mALLOc(); -static void fREe(); -static Void_t* rEALLOc(); -static Void_t* mEMALIGn(); -static int posix_mEMALIGn(); -static Void_t* vALLOc(); -static Void_t* pVALLOc(); -static Void_t* cALLOc(); -static int mTRIm(); -static size_t mUSABLe(); -static void mSTATs(); -static int mALLOPt(); -static struct mallinfo2 mALLINFo2(); -#endif - -/* - MALLOC_PREACTION and MALLOC_POSTACTION should be - defined to return 0 on success, and nonzero on failure. - The return value of MALLOC_POSTACTION is currently ignored - in wrapper functions since there is no reasonable default - action to take on failure. -*/ - - -#ifdef USE_MALLOC_LOCK - -# ifdef WIN32 - -static int mALLOC_MUTEx; -#define MALLOC_PREACTION slwait(&mALLOC_MUTEx) -#define MALLOC_POSTACTION slrelease(&mALLOC_MUTEx) -int dnmalloc_pthread_init(void) { return 0; } - -# elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) - -# if defined(__NetBSD__) -#include -extern int __isthreaded; -static mutex_t thread_lock = MUTEX_INITIALIZER; -#define _MALLOC_LOCK() if (__isthreaded) mutex_lock(&thread_lock) -#define _MALLOC_UNLOCK() if (__isthreaded) mutex_unlock(&thread_lock) -void _malloc_prefork(void) { _MALLOC_LOCK(); } -void _malloc_postfork(void) { _MALLOC_UNLOCK(); } -# endif - -# if defined(__OpenBSD__) -extern int __isthreaded; -void _thread_malloc_lock(void); -void _thread_malloc_unlock(void); -#define _MALLOC_LOCK() if (__isthreaded) _thread_malloc_lock() -#define _MALLOC_UNLOCK() if (__isthreaded) _thread_malloc_unlock() -# endif - -# if defined(__FreeBSD__) -extern int __isthreaded; -struct _spinlock { - volatile long access_lock; - volatile long lock_owner; - volatile char *fname; - volatile int lineno; -}; -typedef struct _spinlock spinlock_t; -#define _SPINLOCK_INITIALIZER { 0, 0, 0, 0 } -void _spinlock(spinlock_t *); -void _spinunlock(spinlock_t *); -/* # include "/usr/src/lib/libc/include/spinlock.h" */ -static spinlock_t thread_lock = _SPINLOCK_INITIALIZER; -spinlock_t *__malloc_lock = &thread_lock; -#define _MALLOC_LOCK() if (__isthreaded) _spinlock(&thread_lock) -#define _MALLOC_UNLOCK() if (__isthreaded) _spinunlock(&thread_lock) -# endif - -/* Common for all three *BSD - */ -static int malloc_active = 0; -static int dnmalloc_mutex_lock() -{ - _MALLOC_LOCK(); - if (!malloc_active) - { - ++malloc_active; - return 0; - } - assert(malloc_active == 0); - _MALLOC_UNLOCK(); - errno = EDEADLK; - return 1; -} -static int dnmalloc_mutex_unlock() -{ - --malloc_active; - _MALLOC_UNLOCK(); - return 0; -} -#define MALLOC_PREACTION dnmalloc_mutex_lock() -#define MALLOC_POSTACTION dnmalloc_mutex_unlock() -int dnmalloc_pthread_init(void) { return 0; } - -# else - -/* Wrapping malloc with pthread_mutex_lock/pthread_mutex_unlock - * - * Works fine on linux (no malloc in pthread_mutex_lock) - * Works with on HP-UX if initialized after entering main() - */ -#include -static int malloc_active = 0; -void dnmalloc_fork_prepare(void); -void dnmalloc_fork_parent(void); -void dnmalloc_fork_child(void); - -#if !defined(__linux__) - -static pthread_mutex_t mALLOC_MUTEx; -pthread_once_t dnmalloc_once_control = PTHREAD_ONCE_INIT; -static int dnmalloc_use_mutex = 0; -static void dnmalloc_pthread_init_int(void) -{ - pthread_mutexattr_t mta; - pthread_mutexattr_init(&mta); - pthread_mutexattr_settype(&mta, PTHREAD_MUTEX_RECURSIVE); - pthread_mutex_init(&(mALLOC_MUTEx), &mta); - pthread_mutexattr_destroy(&mta); - pthread_atfork(dnmalloc_fork_prepare, - dnmalloc_fork_parent, - dnmalloc_fork_child); - dnmalloc_use_mutex = 1; -} -int dnmalloc_pthread_init(void) -{ - return pthread_once(&dnmalloc_once_control, dnmalloc_pthread_init_int); -} - -#else - -static pthread_mutex_t mALLOC_MUTEx = PTHREAD_MUTEX_INITIALIZER; -static int dnmalloc_use_mutex = 1; -int dnmalloc_pthread_init(void) { - return pthread_atfork(dnmalloc_fork_prepare, - dnmalloc_fork_parent, - dnmalloc_fork_child); -} -#endif /* !defined(__linux__) */ - -void dnmalloc_fork_prepare(void) { - if (dnmalloc_use_mutex) - pthread_mutex_lock(&mALLOC_MUTEx); -} -void dnmalloc_fork_parent(void) { - if (dnmalloc_use_mutex) - pthread_mutex_unlock(&mALLOC_MUTEx); -} -void dnmalloc_fork_child(void) { - int rc = 0; -#ifdef __GLIBC__ - if (dnmalloc_use_mutex) - { - pthread_mutex_unlock (&mALLOC_MUTEx); - pthread_mutex_destroy(&mALLOC_MUTEx); - rc = pthread_mutex_init(&mALLOC_MUTEx, NULL); - } -#else - if (dnmalloc_use_mutex) - rc = pthread_mutex_unlock(&mALLOC_MUTEx); -#endif - if (rc != 0) - { - fputs("fork_child failed", stderr); - _exit(EXIT_FAILURE); - } -} -static int dnmalloc_mutex_lock(pthread_mutex_t *mutex) -{ - if (dnmalloc_use_mutex) - { - int rc = pthread_mutex_lock(mutex); - if (rc == 0) - { - if (!malloc_active) - { - ++malloc_active; - return 0; - } - assert(malloc_active == 0); - (void) pthread_mutex_unlock(mutex); - errno = EDEADLK; - return 1; - } - return rc; - } - return 0; -} -static int dnmalloc_mutex_unlock(pthread_mutex_t *mutex) -{ - if (dnmalloc_use_mutex) - { - --malloc_active; - return pthread_mutex_unlock(mutex); - } - return 0; -} -# define MALLOC_PREACTION dnmalloc_mutex_lock(&mALLOC_MUTEx) -# define MALLOC_POSTACTION dnmalloc_mutex_unlock(&mALLOC_MUTEx) - -# endif - -#else - -/* Substitute anything you like for these */ - -# define MALLOC_PREACTION (0) -# define MALLOC_POSTACTION (0) -int dnmalloc_pthread_init(void) { return 0; } - -#endif /* USE_MALLOC_LOCK */ - -Void_t* public_mALLOc(size_t bytes) { - Void_t* m; - if (MALLOC_PREACTION == 0) { - m = mALLOc(bytes); - (void) MALLOC_POSTACTION; - return m; - } - return 0; -} - -void public_fREe(Void_t* m) { - if (MALLOC_PREACTION == 0) { - fREe(m); - (void) MALLOC_POSTACTION; - } -} - -Void_t* public_rEALLOc(Void_t* m, size_t bytes) { - if (MALLOC_PREACTION == 0) { - m = rEALLOc(m, bytes); - (void) MALLOC_POSTACTION; - return m; - } - return 0; -} - -Void_t* public_mEMALIGn(size_t alignment, size_t bytes) { - Void_t* m; - if (MALLOC_PREACTION == 0) { - m = mEMALIGn(alignment, bytes); - (void) MALLOC_POSTACTION; - return m; - } - return 0; -} - -int public_posix_mEMALIGn(Void_t**memptr, size_t alignment, size_t bytes) { - int m, ret; - if ((ret = MALLOC_PREACTION) == 0) { - m = posix_mEMALIGn(memptr, alignment, bytes); - (void) MALLOC_POSTACTION; - return m; - } - return ret; -} - -Void_t* public_vALLOc(size_t bytes) { - Void_t* m; - if (MALLOC_PREACTION == 0) { - m = vALLOc(bytes); - (void) MALLOC_POSTACTION; - return m; - } - return 0; -} - -Void_t* public_pVALLOc(size_t bytes) { - Void_t* m; - if (MALLOC_PREACTION == 0) { - m = pVALLOc(bytes); - (void) MALLOC_POSTACTION; - return m; - } - return 0; -} - -Void_t* public_cALLOc(size_t n, size_t elem_size) { - Void_t* m; - if (MALLOC_PREACTION == 0) { - m = cALLOc(n, elem_size); - (void) MALLOC_POSTACTION; - return m; - } - return 0; -} - -int public_mTRIm(size_t s) { - int result; - if (MALLOC_PREACTION == 0) { - result = mTRIm(s); - (void) MALLOC_POSTACTION; - return result; - } - return 0; -} - -size_t public_mUSABLe(Void_t* m) { - size_t result; - if (MALLOC_PREACTION == 0) { - result = mUSABLe(m); - (void) MALLOC_POSTACTION; - return result; - } - return 0; -} - -void public_mSTATs() { - if (MALLOC_PREACTION == 0) { - mSTATs(); - (void) MALLOC_POSTACTION; - } -} - -struct mallinfo2 public_mALLINFo2() { - struct mallinfo2 m; - if (MALLOC_PREACTION == 0) { - m = mALLINFo2(); - (void) MALLOC_POSTACTION; - return m; - } else { - struct mallinfo2 nm = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - return nm; - } -} - -int public_mALLOPt(int p, int v) { - int result; - if (MALLOC_PREACTION == 0) { - result = mALLOPt(p, v); - (void) MALLOC_POSTACTION; - return result; - } - return 0; -} - -#else - -int dnmalloc_pthread_init(void) { return 0; } -#define DL_STATIC - -#endif /* USE_PUBLIC_MALLOC_WRAPPERS */ - - - -/* ------------- Optional versions of memcopy ---------------- */ - - -#if USE_MEMCPY - -/* - Note: memcpy is ONLY invoked with non-overlapping regions, - so the (usually slower) memmove is not needed. -*/ - -#define MALLOC_COPY(dest, src, nbytes) memcpy(dest, src, nbytes) -#define MALLOC_ZERO(dest, nbytes) memset(dest, 0, nbytes) - -#else /* !USE_MEMCPY */ - -/* Use Duff's device for good zeroing/copying performance. */ - -#define MALLOC_ZERO(charp, nbytes) \ -do { \ - INTERNAL_SIZE_T* mzp = (INTERNAL_SIZE_T*)(charp); \ - CHUNK_SIZE_T mctmp = (nbytes)/sizeof(INTERNAL_SIZE_T); \ - long mcn; \ - if (mctmp < 8) mcn = 0; else { mcn = (mctmp-1)/8; mctmp %= 8; } \ - switch (mctmp) { \ - case 0: for(;;) { *mzp++ = 0; \ - case 7: *mzp++ = 0; \ - case 6: *mzp++ = 0; \ - case 5: *mzp++ = 0; \ - case 4: *mzp++ = 0; \ - case 3: *mzp++ = 0; \ - case 2: *mzp++ = 0; \ - case 1: *mzp++ = 0; if(mcn <= 0) break; mcn--; } \ - } \ -} while(0) - -#define MALLOC_COPY(dest,src,nbytes) \ -do { \ - INTERNAL_SIZE_T* mcsrc = (INTERNAL_SIZE_T*) src; \ - INTERNAL_SIZE_T* mcdst = (INTERNAL_SIZE_T*) dest; \ - CHUNK_SIZE_T mctmp = (nbytes)/sizeof(INTERNAL_SIZE_T); \ - long mcn; \ - if (mctmp < 8) mcn = 0; else { mcn = (mctmp-1)/8; mctmp %= 8; } \ - switch (mctmp) { \ - case 0: for(;;) { *mcdst++ = *mcsrc++; \ - case 7: *mcdst++ = *mcsrc++; \ - case 6: *mcdst++ = *mcsrc++; \ - case 5: *mcdst++ = *mcsrc++; \ - case 4: *mcdst++ = *mcsrc++; \ - case 3: *mcdst++ = *mcsrc++; \ - case 2: *mcdst++ = *mcsrc++; \ - case 1: *mcdst++ = *mcsrc++; if(mcn <= 0) break; mcn--; } \ - } \ -} while(0) - -#endif - -/* ------------------ MMAP support ------------------ */ - - -#if defined(HAVE_FCNTL_H) -#include -#endif - -#if defined(HAVE_SYS_MMAN_H) -#include -#endif - -#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON) -#define MAP_ANONYMOUS MAP_ANON -#endif - -/* - Nearly all versions of mmap support MAP_ANONYMOUS, - so the following is unlikely to be needed, but is - supplied just in case. -*/ - -#ifndef MAP_ANONYMOUS - -/* rw 19.05.2008 changed to avoid cached file descriptor, untested - */ -void * anon_mmap (void *addr, size_t length, int prot, int flags) -{ - void * retval = NULL; - int dev_zero_fd = -1; /* File descriptor for /dev/zero. */ - - dev_zero_fd = open("/dev/zero", O_RDWR); - if (dev_zero_fd >= 0) - { - retval = mmap((addr), (size), (prot), (flags), dev_zero_fd, 0); - /* closing the file descriptor does not unmap the region */ - close(dev_zero_fd); - } - return retval; -} - -#define MMAP(addr, size, prot, flags) \ - (anon_mmap((addr), (size), (prot), (flags))) - - -#else /* have MAP_ANONYMOUS */ - -#if !defined(MAP_32BIT) && defined(MAP_ADDR32) -#define MAP_32BIT MAP_ADDR32 -#endif - -#if defined(MAP_32BIT) -#define MMAP(addr, size, prot, flags) \ - (mmap((addr), (size), (prot), (flags)|MAP_ANONYMOUS|MAP_32BIT, -1, 0)) -#elif defined(__sun) -/* - * Hint an address within 32bit address space - */ -#define MMAP(addr, size, prot, flags) \ - (mmap((void*)0xC0000000, (size), (prot), (flags)|MAP_ANONYMOUS, -1, 0)) -#else -/* *BSD */ -#define MMAP(addr, size, prot, flags) \ - (mmap((void*)0x80000000, (size), (prot), (flags)|MAP_ANONYMOUS, -1, 0)) -#endif - -#endif /* have MAP_ANONYMOUS */ - - -/* - ----------------------- Chunk representations ----------------------- -*/ - -typedef void * mchunkptr; - -struct chunkinfo { - INTERNAL_SIZE_T prev_size; /* Size of previous in bytes */ - INTERNAL_SIZE_T size; /* Size in bytes, including overhead. */ - INTERNAL_SIZE_T req; /* Original request size, for guard. */ - struct chunkinfo* hash_next; /* contains a pointer to the next chunk - in the linked list if the hash - value is the same as the chunk */ - struct chunkinfo* fd; /* double links -- used only if free. */ - struct chunkinfo* bk; - mchunkptr chunk; -}; - -typedef struct chunkinfo* chunkinfoptr; - -struct cireginfo { - unsigned long position; - unsigned long *freebitmap; - struct cireginfo* next; - struct chunkinfo *freelist; - struct chunkinfo *begin; - unsigned long freecounter; -}; - -/* - ---------- Size and alignment checks and conversions ---------- -*/ - -/* conversion from malloc headers to user pointers, and back */ -#define chunk(p) (p->chunk) - - -#define chunk2mem(p) (chunk(p)) -#define mem2chunk(mem) (hashtable_lookup(mem)) - -/* The smallest possible chunk */ -/* #define MIN_CHUNK_SIZE 16 */ -#if (SIZEOF_UNSIGNED_LONG == 8) || defined(__arch64__) || defined(__ia64__) || defined(__x86_64__) || defined(__LP64__) || defined(__64BIT__) || defined(_LP64) || defined(_M_IA64) || (defined(_MIPS_SZLONG) && (_MIPS_SZLONG == 64)) -# define MIN_CHUNK_SIZE 32 -#else -# define MIN_CHUNK_SIZE 16 -#endif - -/* The smallest size we can malloc is an aligned minimal chunk */ - -#define MINSIZE \ - (CHUNK_SIZE_T)(((MIN_CHUNK_SIZE+MALLOC_ALIGN_MASK) & ~MALLOC_ALIGN_MASK)) - -/* Check if m has acceptable alignment */ - -#define aligned_OK(m) (((PTR_UINT)((m)) & (MALLOC_ALIGN_MASK)) == 0) - -#define GUARD_SIZE 4 - -/* - Check if a request is so large that it would wrap around zero when - padded and aligned. To simplify some other code, the bound is made - low enough so that adding MINSIZE will also not wrap around zero. - - Make it 4*MINSIZE. -*/ - -#define REQUEST_OUT_OF_RANGE(req) \ - ((CHUNK_SIZE_T)(req) >= \ - (CHUNK_SIZE_T)(INTERNAL_SIZE_T)(-4 * MINSIZE)) - -/* pad request bytes into a usable size -- internal version */ - -#define request2size(req) \ - (((req) + GUARD_SIZE + MALLOC_ALIGN_MASK >= MINSIZE) ? \ - ((req) + GUARD_SIZE + MALLOC_ALIGN_MASK) & ~MALLOC_ALIGN_MASK :\ - MINSIZE) - -/* Same, except also perform argument check */ - -#define checked_request2size(req, sz) \ - if (!REQUEST_OUT_OF_RANGE(req)) { \ - (sz) = request2size(req); \ - assert((sz-req) >= GUARD_SIZE); \ - } else { \ - MALLOC_FAILURE_ACTION; \ - return 0; \ - } - -#if PARANOIA > 2 -static char * guard_set_p; -static char * guard_set_q; - -#define guard_set(guard, P, request, sz) \ - assert((sz-request) >= GUARD_SIZE); \ - guard_set_p = (char*)(chunk(P)); \ - guard_set_p += request; \ - VALGRIND_MAKE_MEM_UNDEFINED(guard_set_p,GUARD_SIZE); \ - guard_set_q = (char*)(guard); \ - *guard_set_p = *guard_set_q; ++guard_set_p; ++guard_set_q; \ - *guard_set_p = *guard_set_q; ++guard_set_p; ++guard_set_q; \ - *guard_set_p = *guard_set_q; ++guard_set_p; ++guard_set_q; \ - *guard_set_p = *guard_set_q; \ - VALGRIND_MAKE_MEM_NOACCESS((((char*)chunk(P))+request),GUARD_SIZE); \ - (P)->req = request - -#define guard_check(guard, P) \ - VALGRIND_MAKE_MEM_DEFINED((((char *)chunk(P))+(P)->req), GUARD_SIZE); \ - assert(0 == memcmp((((char *)chunk(P))+(P)->req),(void*)(guard),GUARD_SIZE));\ - VALGRIND_MAKE_MEM_NOACCESS((((char *)chunk(P))+(P)->req), GUARD_SIZE); - -#else -#define guard_set(guard, P, request, sz) ((void)0) -#define guard_check(guard, P) ((void)0) -#endif /* PARANOIA > 2 */ - -/* dnmalloc forward declarations */ -static char * dnmalloc_arc4random(void); -static void dnmalloc_init (void); -static void malloc_mmap_state(void); -static void cireg_extend (void); -static chunkinfoptr cireg_getfree (void); -static void hashtable_add (chunkinfoptr ci); -static void hashtable_insert (chunkinfoptr ci_orig, chunkinfoptr ci_insert); -static void hashtable_remove (mchunkptr p); -static void hashtable_skiprm (chunkinfoptr ci_orig, chunkinfoptr ci_todelete); -static chunkinfoptr hashtable_lookup (mchunkptr p); -static chunkinfoptr next_chunkinfo (chunkinfoptr ci); -static chunkinfoptr prev_chunkinfo (chunkinfoptr ci); - - - -/* - --------------- Physical chunk operations --------------- -*/ - - -/* size field is or'ed with PREV_INUSE when previous adjacent chunk in use */ -#define PREV_INUSE 0x1 - -/* extract inuse bit of previous chunk */ -#define prev_inuse(p) ((p)->size & PREV_INUSE) - -/* size field is or'ed with IS_MMAPPED if the chunk was obtained with mmap() */ -#define IS_MMAPPED 0x2 - -/* check for mmap()'ed chunk */ -#define chunk_is_mmapped(p) ((p)->size & IS_MMAPPED) - - -/* size field is or'ed when the chunk is in use */ -#define INUSE 0x4 - -/* extract inuse bit of chunk */ -#define inuse(p) ((p)->size & INUSE) - -/* - Bits to mask off when extracting size - - Note: IS_MMAPPED is intentionally not masked off from size field in - macros for which mmapped chunks should never be seen. This should - cause helpful core dumps to occur if it is tried by accident by - people extending or adapting this malloc. -*/ -#define SIZE_BITS (PREV_INUSE|IS_MMAPPED|INUSE) - -/* Bits to mask off when extracting size of chunks for macros which do not use mmap */ -#define SIZE_NOMMAP (PREV_INUSE|INUSE) - -/* Get size, ignoring use bits */ -#define chunksize(p) ((p)->size & ~(SIZE_BITS)) - -/* Ptr to chunkinfo of next physical malloc_chunk. */ -#define next_chunk(p) ((mchunkptr)( ((char*)(p)) + ((p)->size & SIZE_NOMMAP) )) - -/* Treat space at ptr + offset as a chunk */ -#define chunk_at_offset(p, s) ((mchunkptr)(((char*)(p)) + (s))) - -/* set/clear chunk as being inuse without otherwise disturbing */ -#define set_inuse(p) ((p)->size |= INUSE) - -#define clear_inuse(p) ((p)->size &= ~(INUSE)) - -#define set_previnuse(p) ((p)->size |= PREV_INUSE) - -#define clear_previnuse(p) ((p)->size &= ~(PREV_INUSE)) - -static void set_previnuse_next (chunkinfoptr p) -{ - chunkinfoptr q; - q = next_chunkinfo (p); - if (q) - set_previnuse (q); -} - -#define set_all_inuse(p) \ -set_inuse(p); \ -set_previnuse_next(p); - - -/* Set size at head, without disturbing its use bit */ -#define set_head_size(p, s) ((p)->size = (((p)->size & SIZE_NOMMAP) | (s))) - -/* Set size/use field */ -#define set_head(p, s) ((p)->size = (s)) - -/* - Bins - - An array of bin headers for free chunks. Each bin is doubly - linked. The bins are approximately proportionally (log) spaced. - There are a lot of these bins (128). This may look excessive, but - works very well in practice. Most bins hold sizes that are - unusual as malloc request sizes, but are more usual for fragments - and consolidated sets of chunks, which is what these bins hold, so - they can be found quickly. All procedures maintain the invariant - that no consolidated chunk physically borders another one, so each - chunk in a list is known to be preceeded and followed by either - inuse chunks or the ends of memory. - - Chunks in bins are kept in size order, with ties going to the - approximately least recently used chunk. Ordering isn't needed - for the small bins, which all contain the same-sized chunks, but - facilitates best-fit allocation for larger chunks. These lists - are just sequential. Keeping them in order almost never requires - enough traversal to warrant using fancier ordered data - structures. - - Chunks of the same size are linked with the most - recently freed at the front, and allocations are taken from the - back. This results in LRU (FIFO) allocation order, which tends - to give each chunk an equal opportunity to be consolidated with - adjacent freed chunks, resulting in larger free chunks and less - fragmentation. - - To simplify use in double-linked lists, each bin header acts - as a malloc_chunk. This avoids special-casing for headers. - But to conserve space and improve locality, we allocate - only the fd/bk pointers of bins, and then use repositioning tricks - to treat these as the fields of a malloc_chunk*. -*/ - -typedef struct chunkinfo* mbinptr; - -/* addressing -- note that bin_at(0) does not exist */ -#define bin_at(m, i) (&(m)->bins[i]) - -/* analog of ++bin */ -#define next_bin(b) (b+1) - -/* Reminders about list directionality within bins */ -#define first(b) ((b)->fd) -#define last(b) ((b)->bk) - -/* Take a chunk off a bin list */ -#define unlink(P, BK, FD) { \ - FD = P->fd; \ - BK = P->bk; \ - FD->bk = BK; \ - BK->fd = FD; \ -} - -/* - Indexing - - Bins for sizes < 512 bytes contain chunks of all the same size, spaced - 8 bytes apart. Larger bins are approximately logarithmically spaced: - - 64 bins of size 8 - 32 bins of size 64 - 16 bins of size 512 - 8 bins of size 4096 - 4 bins of size 32768 - 2 bins of size 262144 - 1 bin of size what's left - - The bins top out around 1MB because we expect to service large - requests via mmap. -*/ - -#define NBINS 96 -#define NSMALLBINS 32 -#define SMALLBIN_WIDTH 8 -#define MIN_LARGE_SIZE 256 - -#define in_smallbin_range(sz) \ - ((CHUNK_SIZE_T)(sz) < (CHUNK_SIZE_T)MIN_LARGE_SIZE) - -#define smallbin_index(sz) (((unsigned)(sz)) >> 3) - -/* - Compute index for size. We expect this to be inlined when - compiled with optimization, else not, which works out well. -*/ -static int largebin_index(size_t sz) { - - unsigned long xx = sz >> SMALLBIN_WIDTH; - - if (xx < 0x10000) - { - unsigned int m; /* bit position of highest set bit of m */ - - /* On intel, use BSRL instruction to find highest bit */ -#if defined(__GNUC__) && defined(i386) && !defined(USE_UNO) - - unsigned int x = (unsigned int) xx; - - __asm__("bsrl %1,%0\n\t" - : "=r" (m) - : "rm" (x)); - -#elif defined(__GNUC__) && defined(x86_64) && !defined(USE_UNO) - - __asm__("bsrq %1,%0\n\t" - : "=r" (m) - : "rm" (xx)); - -#else - - /* Taken from Bit Twiddling Hacks - * http://graphics.stanford.edu/~seander/bithacks.html - * public domain - */ - unsigned int v = (unsigned int) xx; - register unsigned int shift; - - m = (v > 0xFFFF) << 4; v >>= m; - shift = (v > 0xFF ) << 3; v >>= shift; m |= shift; - shift = (v > 0xF ) << 2; v >>= shift; m |= shift; - shift = (v > 0x3 ) << 1; v >>= shift; m |= shift; - m |= (v >> 1); - -#endif - - /* Use next 2 bits to create finer-granularity bins */ - return NSMALLBINS + (m << 2) + ((sz >> (m + 6)) & 3); - } - else - { - return NBINS-1; - } -} - -#define bin_index(sz) \ - ((in_smallbin_range(sz)) ? smallbin_index(sz) : largebin_index(sz)) - -/* - FIRST_SORTED_BIN_SIZE is the chunk size corresponding to the - first bin that is maintained in sorted order. This must - be the smallest size corresponding to a given bin. - - Normally, this should be MIN_LARGE_SIZE. But you can weaken - best fit guarantees to sometimes speed up malloc by increasing value. - Doing this means that malloc may choose a chunk that is - non-best-fitting by up to the width of the bin. - - Some useful cutoff values: - 512 - all bins sorted - 2560 - leaves bins <= 64 bytes wide unsorted - 12288 - leaves bins <= 512 bytes wide unsorted - 65536 - leaves bins <= 4096 bytes wide unsorted - 262144 - leaves bins <= 32768 bytes wide unsorted - -1 - no bins sorted (not recommended!) -*/ - -/* #define FIRST_SORTED_BIN_SIZE 65536 */ - -#define FIRST_SORTED_BIN_SIZE MIN_LARGE_SIZE - - -/* - Unsorted chunks - - All remainders from chunk splits, as well as all returned chunks, - are first placed in the "unsorted" bin. They are then placed - in regular bins after malloc gives them ONE chance to be used before - binning. So, basically, the unsorted_chunks list acts as a queue, - with chunks being placed on it in free (and malloc_consolidate), - and taken off (to be either used or placed in bins) in malloc. -*/ - -/* The otherwise unindexable 1-bin is used to hold unsorted chunks. */ -#define unsorted_chunks(M) (bin_at(M, 1)) - -/* - Top - - The top-most available chunk (i.e., the one bordering the end of - available memory) is treated specially. It is never included in - any bin, is used only if no other chunk is available, and is - released back to the system if it is very large (see - M_TRIM_THRESHOLD). Because top initially - points to its own bin with initial zero size, thus forcing - extension on the first malloc request, we avoid having any special - code in malloc to check whether it even exists yet. But we still - need to do so when getting memory from system, so we make - initial_top treat the bin as a legal but unusable chunk during the - interval between initialization and the first call to - sYSMALLOc. (This is somewhat delicate, since it relies on - the 2 preceding words to be zero during this interval as well.) -*/ - -/* Conveniently, the unsorted bin can be used as dummy top on first call */ -#define initial_top(M) (unsorted_chunks(M)) - -/* - Binmap - - To help compensate for the large number of bins, a one-level index - structure is used for bin-by-bin searching. `binmap' is a - bitvector recording whether bins are definitely empty so they can - be skipped over during during traversals. The bits are NOT always - cleared as soon as bins are empty, but instead only - when they are noticed to be empty during traversal in malloc. -*/ - -/* Conservatively use 32 bits per map word, even if on 64bit system */ -#define BINMAPSHIFT 5 -#define BITSPERMAP (1U << BINMAPSHIFT) -#define BINMAPSIZE (NBINS / BITSPERMAP) - -#define idx2block(i) ((i) >> BINMAPSHIFT) -#define idx2bit(i) ((1U << ((i) & ((1U << BINMAPSHIFT)-1)))) - -#define mark_bin(m,i) ((m)->binmap[idx2block(i)] |= idx2bit(i)) -#define unmark_bin(m,i) ((m)->binmap[idx2block(i)] &= ~(idx2bit(i))) -#define get_binmap(m,i) ((m)->binmap[idx2block(i)] & idx2bit(i)) - -/* - Fastbins - - An array of lists holding recently freed small chunks. Fastbins - are not doubly linked. It is faster to single-link them, and - since chunks are never removed from the middles of these lists, - double linking is not necessary. Also, unlike regular bins, they - are not even processed in FIFO order (they use faster LIFO) since - ordering doesn't much matter in the transient contexts in which - fastbins are normally used. - - Chunks in fastbins keep their inuse bit set, so they cannot - be consolidated with other free chunks. malloc_consolidate - releases all chunks in fastbins and consolidates them with - other free chunks. -*/ - -typedef struct chunkinfo* mfastbinptr; - -/* offset 2 to use otherwise unindexable first 2 bins */ -#define fastbin_index(sz) ((((unsigned int)(sz)) >> 3) - 2) - -/* The maximum fastbin request size we support */ -#define MAX_FAST_SIZE 80 - -#define NFASTBINS (fastbin_index(request2size(MAX_FAST_SIZE))+1) - -/* - FASTBIN_CONSOLIDATION_THRESHOLD is the size of a chunk in free() - that triggers automatic consolidation of possibly-surrounding - fastbin chunks. This is a heuristic, so the exact value should not - matter too much. It is defined at half the default trim threshold as a - compromise heuristic to only attempt consolidation if it is likely - to lead to trimming. However, it is not dynamically tunable, since - consolidation reduces fragmentation surrounding loarge chunks even - if trimming is not used. -*/ - -#define FASTBIN_CONSOLIDATION_THRESHOLD \ - ((unsigned long)(DEFAULT_TRIM_THRESHOLD) >> 1) - -/* - Since the lowest 2 bits in max_fast don't matter in size comparisons, - they are used as flags. -*/ - -/* - ANYCHUNKS_BIT held in max_fast indicates that there may be any - freed chunks at all. It is set true when entering a chunk into any - bin. -*/ - -#define ANYCHUNKS_BIT (1U) - -#define have_anychunks(M) (((M)->max_fast & ANYCHUNKS_BIT)) -#define set_anychunks(M) ((M)->max_fast |= ANYCHUNKS_BIT) -#define clear_anychunks(M) ((M)->max_fast &= ~ANYCHUNKS_BIT) - -/* - FASTCHUNKS_BIT held in max_fast indicates that there are probably - some fastbin chunks. It is set true on entering a chunk into any - fastbin, and cleared only in malloc_consolidate. -*/ - -#define FASTCHUNKS_BIT (2U) - -#define have_fastchunks(M) (((M)->max_fast & FASTCHUNKS_BIT)) -#define set_fastchunks(M) ((M)->max_fast |= (FASTCHUNKS_BIT|ANYCHUNKS_BIT)) -#define clear_fastchunks(M) ((M)->max_fast &= ~(FASTCHUNKS_BIT)) - -/* - Set value of max_fast. - Use impossibly small value if 0. -*/ - -#define set_max_fast(M, s) \ - (M)->max_fast = (((s) == 0)? SMALLBIN_WIDTH: request2size(s)) | \ - ((M)->max_fast & (FASTCHUNKS_BIT|ANYCHUNKS_BIT)) - -#define get_max_fast(M) \ - ((M)->max_fast & ~(FASTCHUNKS_BIT | ANYCHUNKS_BIT)) - - -/* - morecore_properties is a status word holding dynamically discovered - or controlled properties of the morecore function -*/ - -#define MORECORE_CONTIGUOUS_BIT (1U) - -#define contiguous(M) \ - (((M)->morecore_properties & MORECORE_CONTIGUOUS_BIT)) -#define noncontiguous(M) \ - (((M)->morecore_properties & MORECORE_CONTIGUOUS_BIT) == 0) -#define set_contiguous(M) \ - ((M)->morecore_properties |= MORECORE_CONTIGUOUS_BIT) -#define set_noncontiguous(M) \ - ((M)->morecore_properties &= ~MORECORE_CONTIGUOUS_BIT) - -#define MORECORE_32BIT_BIT (2U) - -#define morecore32bit(M) \ - (((M)->morecore_properties & MORECORE_32BIT_BIT)) -#define nonmorecore32bit(M) \ - (((M)->morecore_properties & MORECORE_32BIT_BIT) == 0) -#define set_morecore32bit(M) \ - ((M)->morecore_properties |= MORECORE_32BIT_BIT) -#define set_nonmorecore32bit(M) \ - ((M)->morecore_properties &= ~MORECORE_32BIT_BIT) - - - -/* ----------------- dnmalloc -------------------- */ - -/* size of pages */ -#define PGSIZE malloc_getpagesize -/* pointer size */ -#define PTRSIZE sizeof(long) - - - -/* TODO: mmapped chunks are always multiples of pagesize -> we're wasting - address space: the hashtable has granularity of 16*8, set it to something - closer to pagesize for mmapped chunks (current waste: 32 positions/mmapped - page) -*/ - -/* The maximum heap size that dnmalloc can operate with - * represented in hex to avoid annoying gcc warning - * - * Avoid integer overflow, cover complete 32bit address - * space for portability. With deferred allocation, the - * hashtable size is a non-issue. - */ -#define HEAPMAXSIZE_HALF 0x80000000UL - -/* How many elements are stored in the linked list */ -#define LINKEDLSTELS 8 - -/* Minimum size of a chunk */ - -#if (SIZEOF_UNSIGNED_LONG == 8) || defined(__arch64__) || defined(__ia64__) || defined(__x86_64__) || defined(__LP64__) || defined(__64BIT__) || defined(_LP64) || defined(_M_IA64) || (defined(_MIPS_SZLONG) && (_MIPS_SZLONG == 64)) -# define MINCHUNKSIZE 32 -#else -# define MINCHUNKSIZE 16 -#endif - - -/* The amount of hashtable entries for each page: -Pagesize divded by the numer of elements in the linkedlists -divided by the minimum chunk size -*/ -#define CHUNKINFOPAGE (PGSIZE / LINKEDLSTELS / MINCHUNKSIZE) - -/* The amount of hashtable entries needed to manage the memory: -Maximum heap size divided by page size multiplied by the amount -of chunk info's per page -*/ -#define AMOUNTHASH ((HEAPMAXSIZE_HALF / PGSIZE) * CHUNKINFOPAGE * 2) - -/* Initial size of the map for the hashtable -Amount of entries muliplied by pointer size -*/ -#define HASHTABLESIZE (AMOUNTHASH * PTRSIZE) - -/* Amount of free chunks that the system should allocate at the start */ -#define NUMBER_FREE_CHUNKS 32768 - -/* Initial size of the chunk info region, -also used when growing the region */ -#define CIREGSIZE (NUMBER_FREE_CHUNKS * sizeof(struct chunkinfo)) - -/* Start address of the heap */ -char *startheap; - -/* pointer to the hashtable: struct chunkinfo **hashtable -> *hashtable[] */ -chunkinfoptr *hashtable; - -/* Current chunkinfo region */ -struct cireginfo *currciinfo = 0; -struct cireginfo *firstciinfo = 0; - -unsigned long totalcictr = 0; - - -/* Initialize the area for chunkinfos and the hashtable and protect - * it with non-writable pages - */ -static void -dnmalloc_init () -{ - void *hashtb; - int mprot; - int flags = MAP_PRIVATE; - - /* Allocate the malloc_state struct */ - malloc_mmap_state(); - - /* Use MAP_NORESERVE if available (Solaris, HP-UX; most other - * systems use defered allocation anyway. - */ -#ifdef MAP_NORESERVE - flags |= MAP_NORESERVE; -#endif - - /* Always start at 0, hashtable covers whole 32bit address space - */ -#define STARTHEAP_IS_ZERO - startheap = 0; - - /* Map space for the hashtable */ -#if PARANOIA > 1 - hashtb = MMAP(0, HASHTABLESIZE+(2*PGSIZE), PROT_READ|PROT_WRITE, flags); -#else - hashtb = MMAP(0, HASHTABLESIZE+PGSIZE, PROT_READ|PROT_WRITE, flags); -#endif - -#ifdef NDEBUG - if (hashtb == MAP_FAILED) { - fprintf (stderr, "Couldn't mmap hashtable: %s\n", strerror (errno)); - abort (); - } -#else - assert(hashtb != MAP_FAILED); -#endif - - /* Protect the hashtable with non-writable pages */ - mprot = mprotect(hashtb, (size_t) PGSIZE, PROT_NONE); -#ifdef NDEBUG - if (mprot == -1) { - fprintf (stderr, "Couldn't mprotect first non-rw page for hashtable: %s\n", - strerror (errno)); - abort (); - } -#else - assert(mprot != -1); -#endif - - /* HP-UX: Cannot do arithmetic with pointers to objects of unknown size. */ - hashtable = (chunkinfoptr *) (((char*)hashtb) + PGSIZE); - - /* Protect the hashtable with non-writable pages */ -#if PARANOIA > 1 - mprot = mprotect((void*)((char*)hashtb+HASHTABLESIZE+PGSIZE), (size_t) PGSIZE, PROT_NONE); -#ifdef NDEBUG - if (mprot == -1) { - fprintf (stderr, "Couldn't mprotect last non-rw page for hashtable: %s\n", - strerror (errno)); - abort (); - } -#else - assert(mprot != -1); -#endif -#endif -} - - - -/* Extend the region for chunk infos by mapping more memory before the region */ -static void -cireg_extend () -{ - void *newcireg; - int mprot; - struct cireginfo *tempciinfo = 0; - -#if PARANOIA > 1 - newcireg = MMAP(0, CIREGSIZE+(2*PGSIZE), PROT_READ|PROT_WRITE, MAP_PRIVATE); -#else - newcireg = MMAP(0, CIREGSIZE+PGSIZE, PROT_READ|PROT_WRITE, MAP_PRIVATE); -#endif - -#ifdef NDEBUG - if (newcireg == MAP_FAILED) - { - fprintf (stderr, "Couldn't extend chunkinfo region: %s\n", - strerror (errno)); - abort (); - } -#else - assert(newcireg != MAP_FAILED); -#endif - mprot = mprotect(newcireg, PGSIZE, PROT_NONE); -#ifdef NDEBUG - if (mprot == -1) { - fprintf (stderr, "Couldn't mprotect first non-rw page for extended region: %s\n", - strerror (errno)); - abort (); - } -#else - assert(mprot != -1); -#endif - newcireg = ((char*)newcireg)+PGSIZE; - -#if PARANOIA > 1 - mprot = mprotect((void*)((char*)newcireg+CIREGSIZE), (size_t) PGSIZE, PROT_NONE); -#ifdef NDEBUG - if (mprot == -1) { - fprintf (stderr, "Couldn't mprotect last non-rw page for extended region: %s\n", - strerror (errno)); - abort (); - } -#else - assert(mprot != -1); -#endif -#endif - - tempciinfo = currciinfo; - currciinfo = (struct cireginfo *) newcireg; - if (tempciinfo) - tempciinfo->next = currciinfo; - currciinfo->position = 1; - currciinfo->freecounter = NUMBER_FREE_CHUNKS; - if (!firstciinfo) - firstciinfo = currciinfo; - totalcictr++; - VALGRIND_CREATE_MEMPOOL(newcireg, 0, 0); -} - - -/* Get a free chunkinfo */ -static chunkinfoptr -cireg_getfree () -{ - chunkinfoptr freeci; - chunkinfoptr freelst = 0; - struct cireginfo *newciinfo = firstciinfo; - - if (newciinfo) { - freelst = newciinfo->freelist; - - if (!freelst && newciinfo->next) { - do { - newciinfo = newciinfo->next; - freelst = newciinfo->freelist; - } while (!freelst && newciinfo->next); - } - } - - /* Check if there are any free chunkinfos on the list of free chunkinfos */ - if (freelst) - { - freeci = freelst; - newciinfo->freecounter--; - newciinfo->freelist = freelst->fd; - - VALGRIND_MEMPOOL_ALLOC((char*)currciinfo, (char*)freeci, - sizeof(struct chunkinfo)); - - freeci->prev_size = 0; - freeci->size = 0; - freeci->req = 0; - freeci->hash_next = NULL; - freeci->fd = NULL; - freeci->bk = NULL; - freeci->chunk = NULL; - return (freeci); - } - else - { - /* No free chunkinfos, check if chunkinfo region still has place - * for a chunkinfo. If not, extend the region. - */ - if (UNLIKELY(!currciinfo || currciinfo->position == NUMBER_FREE_CHUNKS)) - cireg_extend (); - /* Get a chunkinfo from the chunkinfo region */ - freeci = (chunkinfoptr) currciinfo + currciinfo->position; - currciinfo->freecounter--; - currciinfo->position++; - - VALGRIND_MEMPOOL_ALLOC((char*)currciinfo, (char*)freeci, - sizeof(struct chunkinfo)); - - return (freeci); - } -} - -static void freeciregion(struct cireginfo *freeme) { - /* free the chunkinfo region */ - struct cireginfo *newciinfo = firstciinfo; - struct cireginfo *prevciinfo = firstciinfo; - void *unmapme; - - while (newciinfo && newciinfo != freeme) { - prevciinfo = newciinfo; - newciinfo = newciinfo->next; - } - assert(freeme == newciinfo); /* rw */ - assert(newciinfo != NULL); /* rw */ - if (newciinfo) - prevciinfo->next = newciinfo->next; - unmapme = (void *) ((char*)freeme - PGSIZE); - VALGRIND_DESTROY_MEMPOOL((char*)freeme); -#if PARANOIA > 1 - munmap(unmapme, CIREGSIZE+(2*PGSIZE)); -#else - munmap(unmapme, CIREGSIZE+PGSIZE); -#endif -} - - -static void freecilst_add(chunkinfoptr p) { - - struct cireginfo *newciinfo; - - newciinfo = currciinfo; - if (((chunkinfoptr) newciinfo < p) && (p < (chunkinfoptr) (newciinfo+NUMBER_FREE_CHUNKS))) { - p->fd = newciinfo->freelist; - newciinfo->freelist = p; - newciinfo->freecounter++; - VALGRIND_MEMPOOL_FREE((char*)newciinfo, (char*)p); - VALGRIND_MAKE_MEM_DEFINED(p,sizeof(struct chunkinfo)); - VALGRIND_MAKE_MEM_NOACCESS(p->size, sizeof(INTERNAL_SIZE_T)); - VALGRIND_MAKE_MEM_NOACCESS(p->req, sizeof(INTERNAL_SIZE_T)); - VALGRIND_MAKE_MEM_NOACCESS(p->bk, sizeof(struct chunkinfo*)); - VALGRIND_MAKE_MEM_NOACCESS(p->chunk, sizeof(mchunkptr)); - } else { - newciinfo = firstciinfo; - if (newciinfo) { - do { - if (((chunkinfoptr) newciinfo < p) && (p < (chunkinfoptr) (newciinfo+NUMBER_FREE_CHUNKS))) { - p->fd = newciinfo->freelist; - newciinfo->freelist = p; - newciinfo->freecounter++; - VALGRIND_MEMPOOL_FREE((char*)newciinfo, (char*)p); - VALGRIND_MAKE_MEM_DEFINED(p,sizeof(struct chunkinfo)); - VALGRIND_MAKE_MEM_NOACCESS(p->size, sizeof(INTERNAL_SIZE_T)); - VALGRIND_MAKE_MEM_NOACCESS(p->req, sizeof(INTERNAL_SIZE_T)); - VALGRIND_MAKE_MEM_NOACCESS(p->bk, sizeof(struct chunkinfo*)); - VALGRIND_MAKE_MEM_NOACCESS(p->chunk, sizeof(mchunkptr)); - if (UNLIKELY(newciinfo->freecounter == NUMBER_FREE_CHUNKS)) - freeciregion(newciinfo); - break; - } - newciinfo = newciinfo->next; - } while (newciinfo); - } - } -} - -/* Calculate the hash table entry for a chunk */ -#ifdef STARTHEAP_IS_ZERO -#define hash(p) (((unsigned long) p) >> 7) -#else -#define hash(p) (((unsigned long) p - (unsigned long) startheap) >> 7) -#endif - -static void -hashtable_add (chunkinfoptr ci) -{ - chunkinfoptr temp, next; - unsigned long hashval; - mchunkptr cic = chunk (ci); - - hashval = hash (cic); - - if (hashval < AMOUNTHASH) { - - temp = hashtable[hashval]; - -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "hashtable_add: %p, %lu\n", chunk(ci), hashval); -#endif - - /* If no pointer to a chunk info list is stored at this location - * in the hashtable or if the chunk's address is smaller than the - * one present, add the chunk to the front of the linked list - */ - if (temp == 0 || chunk (temp) > cic) - { - ci->hash_next = temp; - hashtable[hashval] = ci; - if (!temp) /* more likely case */ - goto out; - temp->prev_size = chunksize(ci); - return; - } - else - { - /* We must place the chunk in the linked list for this hashentry - * Loop to end of list or to a position where temp's chunk's address - * is larger than the new chunkinfo's chunk's address - */ - if (!temp->hash_next || (chunk (temp->hash_next) > cic)) - { - ci->hash_next = temp->hash_next; - temp->hash_next = ci; - } - else - { - while ((temp->hash_next != 0) && (chunk (temp->hash_next) < cic)) - { - temp = temp->hash_next; - } - /* Place in linked list if not already there */ - if (!temp->hash_next || !(chunk (temp->hash_next) == cic)) - { - ci->hash_next = temp->hash_next; - temp->hash_next = ci; - } - } - } - } - else { -#ifdef DNMALLOC_CHECKS - if (hashval >= AMOUNTHASH) { - fprintf(stderr, "Dnmalloc error: trying to write outside of the bounds of the hashtable, this is definitely a bug, please email dnmalloc@fort-knox.org (hashval: %lu, AMOUNTHASH: %lu, HEAPMAXSIZE_HALF %lu PGSIZE %ld CHUNKINFOPAGE %ld chunk: %p, chunkinfo: %p, startheap: %p).\n", hashval, AMOUNTHASH, HEAPMAXSIZE_HALF, PGSIZE, CHUNKINFOPAGE, chunk(ci), ci, startheap); - abort(); - } -#else - assert(hashval < AMOUNTHASH); -#endif - } - - out: - next = next_chunkinfo(ci); - if (!next) - return; - next->prev_size = chunksize(ci); -} - -static void -hashtable_insert (chunkinfoptr ci_orig, chunkinfoptr ci_insert) -{ - chunkinfoptr next; - -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "hashtable_ins: %p, %lu\n", chunk(ci_insert), - (unsigned long)hash(chunk(ci_insert)); -#endif - - if (hash(chunk(ci_orig)) != hash(chunk(ci_insert))) { - hashtable_add(ci_insert); - } - else { - - ci_insert->hash_next = ci_orig->hash_next; - ci_orig->hash_next = ci_insert; - - /* added for prevsize */ - if (!(ci_insert->hash_next)) - next = next_chunkinfo(ci_insert); - else - next = ci_insert->hash_next; - - if (!next) - { - ci_insert->prev_size = chunksize(ci_orig); - } - else - { - next->prev_size = chunksize(ci_insert); - ci_insert->prev_size = chunksize(ci_orig); - } - } -} - -static void -hashtable_remove (mchunkptr p) -{ - chunkinfoptr prevtemp, temp; - unsigned long hashval; - - hashval = hash (p); -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "hashtable_rem: %p, %lu\n", p, hashval); -#endif - assert(hashval < AMOUNTHASH); /* rw */ - prevtemp = temp = hashtable[hashval]; - if (chunk (temp) == p) { - hashtable[hashval] = temp->hash_next; - } - else - { - if (temp && chunk (temp) != p) { - do - { - prevtemp = temp; - temp = temp->hash_next; - } while (temp && chunk (temp) != p); - } -#ifdef DNMALLOC_CHECKS - if (!temp) { - fprintf (stderr, - "Dnmalloc error (hash_rm): could not find a chunkinfo for the chunk %p in the hashtable at entry %lu\n This is definitely a bug, please report it to dnmalloc@fort-knox.org.\n", - p, hashval); - abort(); - } -#else - assert(temp != NULL); -#endif - if (temp) prevtemp->hash_next = temp->hash_next; - } -} - -/* mmapped chunks are multiples of pagesize, no hash_nexts, - * just remove from the hashtable - */ -#define hashtable_remove_mmapped(p) hashtable[hash(p)] = 0; - -static void -hashtable_skiprm (chunkinfoptr ci_orig, chunkinfoptr ci_todelete) -{ - unsigned long hashval; - chunkinfoptr next; - -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "hashtable_skiprm: %p, %lu\n", chunk(ci_todelete), hash(chunk(ci_todelete))); -#endif - - if (ci_orig->hash_next != ci_todelete) { - hashval = hash(chunk(ci_todelete)); - assert(hashval < AMOUNTHASH); /* rw */ -#ifdef DNMALLOC_CHECKS - if (hashtable[hashval] != ci_todelete ) { - fprintf(stderr, "Dnmalloc error: trying to delete wrong value (hash: %lu): ci_todelete: %p (%p), hashtable[hashval]: %p (%p)\n This is definitely a bug, please report it to dnmalloc@fort-knox.org.\n", hashval, ci_todelete, chunk(ci_todelete), hashtable[hashval], chunk(hashtable[hashval])); - } -#else - assert(hashtable[hashval] == ci_todelete); -#endif - hashtable[hashval] = ci_todelete->hash_next; - } - - else { - ci_orig->hash_next = ci_todelete->hash_next; - if (!ci_orig->hash_next) { - next = next_chunkinfo(ci_orig); - } else { - next = ci_orig->hash_next; - } - if (next) - next->prev_size = chunksize(ci_orig); - - } -} - - -static chunkinfoptr -hashtable_lookup (mchunkptr p) -{ - chunkinfoptr ci; - unsigned long hashval; - - /* if we were called wrongly - * if ((char *) p < startheap) return 0; - */ - if ((char *) p >= startheap) - { - hashval = hash (p); - assert(hashval < AMOUNTHASH); /* rw */ - ci = hashtable[hashval]; - if (ci && chunk (ci) == p) - return ci; - - if (ci) { - do { - ci = ci->hash_next; - } while (ci && chunk (ci) != p); - } -#ifdef DNMALLOC_CHECKS - /* This should never occur but if it does, we'd like to know */ - if (!ci) { - fprintf (stderr, - "Dnmalloc error: could not find a chunkinfo for the chunk %p in the hashtable at entry %lu\n This is definitely a bug, please report it to dnmalloc@fort-knox.org.\n", - p, hashval); - abort(); - } -#else - assert(ci != NULL); -#endif - return ci; - } - return 0; -} - - - -/* - ----------- Internal state representation and initialization ----------- -*/ - -struct malloc_state { - - /* The maximum chunk size to be eligible for fastbin */ - INTERNAL_SIZE_T max_fast; /* low 2 bits used as flags */ - - /* Fastbins */ - mfastbinptr fastbins[NFASTBINS]; - - /* Base of the topmost chunk -- not otherwise kept in a bin */ - chunkinfoptr top; - - /* The remainder from the most recent split of a small request */ - chunkinfoptr last_remainder; - - /* Normal bins */ - struct chunkinfo bins[NBINS]; - - /* Bitmap of bins. Trailing zero map handles cases of largest binned size */ - unsigned int binmap[BINMAPSIZE+1]; - - /* Tunable parameters */ - CHUNK_SIZE_T trim_threshold; - INTERNAL_SIZE_T top_pad; - INTERNAL_SIZE_T mmap_threshold; - - /* Memory map support */ - int n_mmaps; - int n_mmaps_max; - int max_n_mmaps; - - /* Cache malloc_getpagesize */ - unsigned int pagesize; - - /* Canary */ - char guard_stored[GUARD_SIZE]; - - /* Track properties of MORECORE */ - unsigned int morecore_properties; - - /* Statistics */ - INTERNAL_SIZE_T mmapped_mem; - INTERNAL_SIZE_T sbrked_mem; - INTERNAL_SIZE_T max_sbrked_mem; - INTERNAL_SIZE_T max_mmapped_mem; - INTERNAL_SIZE_T max_total_mem; -}; - -typedef struct malloc_state *mstate; - -/* - There is exactly one instance of this struct in this malloc. - If you are adapting this malloc in a way that does NOT use a static - malloc_state, you MUST explicitly zero-fill it before using. This - malloc relies on the property that malloc_state is initialized to - all zeroes (as is true of C statics). -*/ - -static struct malloc_state * av_ = NULL; /* never directly referenced */ - -/* - All uses of av_ are via get_malloc_state(). - At most one "call" to get_malloc_state is made per invocation of - the public versions of malloc and free, but other routines - that in turn invoke malloc and/or free may call more then once. - Also, it is called in check* routines if DEBUG is set. -*/ - -#define get_malloc_state() (av_) - -/* - Initialize a malloc_state struct. - - This is called only from within malloc_consolidate, which needs - be called in the same contexts anyway. It is never called directly - outside of malloc_consolidate because some optimizing compilers try - to inline it at all call points, which turns out not to be an - optimization at all. (Inlining it in malloc_consolidate is fine though.) -*/ - -#if __STD_C -static void malloc_mmap_state(void) -#else -static void malloc_mmap_state() -#endif -{ - int mprot; - unsigned long pagesize = malloc_getpagesize; - size_t size = (sizeof(struct malloc_state) + pagesize - 1) & ~(pagesize - 1); - - void * foo = MMAP(0, size+(2*pagesize), PROT_READ|PROT_WRITE, MAP_PRIVATE); - - -#ifdef NDEBUG - if (foo == MAP_FAILED) { - fprintf (stderr, "Couldn't mmap struct malloc_state: %s\n", strerror (errno)); - abort (); - } -#else - assert(foo != MAP_FAILED); -#endif - - mprot = mprotect(foo, pagesize, PROT_NONE); -#ifdef NDEBUG - if (mprot == -1) { - fprintf (stderr, "Couldn't mprotect first non-rw page for struct malloc_state: %s\n", - strerror (errno)); - abort (); - } -#else - assert(mprot != -1); -#endif - - av_ = (struct malloc_state *) ((char*)foo + pagesize); - - MALLOC_ZERO(av_, sizeof(struct malloc_state)); - - mprot = mprotect((void*)((char*)foo + size + pagesize), (size_t) pagesize, PROT_NONE); -#ifdef NDEBUG - if (mprot == -1) { - fprintf (stderr, - "Couldn't mprotect last non-rw page for struct malloc_state: %s\n", - strerror (errno)); - abort (); - } -#else - assert(mprot != -1); -#endif -} - -#if __STD_C -static void malloc_init_state(mstate av) -#else -static void malloc_init_state(av) mstate av; -#endif -{ - int i; - mbinptr bin; - - void * morecore_test = MORECORE(0); - unsigned long hashval; - - /* Test morecore function - */ - set_morecore32bit(av); - - if (morecore_test == MORECORE_FAILURE) - { - set_nonmorecore32bit(av); - } - else - { - /* On 64bit systems, the heap may be located above the - * 32bit address space. Since mmap() probably still can be - * convinced to map within 32bit, we don't use sbrk(). - */ - hashval = hash (morecore_test); - if (hashval >= AMOUNTHASH) - { - set_nonmorecore32bit(av); - } - } - - - /* Establish circular links for normal bins */ - for (i = 1; i < NBINS; ++i) { - bin = bin_at(av,i); - bin->fd = bin->bk = bin; - } - - av->top_pad = DEFAULT_TOP_PAD; - av->n_mmaps_max = DEFAULT_MMAP_MAX; - av->mmap_threshold = DEFAULT_MMAP_THRESHOLD; - av->trim_threshold = DEFAULT_TRIM_THRESHOLD; - -#if MORECORE_CONTIGUOUS - set_contiguous(av); -#else - set_noncontiguous(av); -#endif - - set_max_fast(av, DEFAULT_MXFAST); - - av->top = cireg_getfree (); - av->top->chunk = (mchunkptr) startheap; - av->top->size = 0; - set_previnuse(av->top); - clear_inuse(av->top); - hashtable[0] = av->top; - av->pagesize = malloc_getpagesize; - - memcpy(av->guard_stored, dnmalloc_arc4random(), GUARD_SIZE); - -} - -/* - Other internal utilities operating on mstates -*/ - -#if __STD_C -static Void_t* sYSMALLOc(INTERNAL_SIZE_T, mstate); -static int sYSTRIm(size_t, mstate); -static void malloc_consolidate(mstate); -#else -static Void_t* sYSMALLOc(); -static int sYSTRIm(); -static void malloc_consolidate(); -#endif - -/* dnmalloc functions */ -/* needs mstate so moved here */ - -static chunkinfoptr -next_chunkinfo (chunkinfoptr ci) -{ - mchunkptr nextp; - unsigned long hashval; - chunkinfoptr cinfonextp; - mstate av = get_malloc_state(); - - /* ci is not the last element in the linked list, just - return the next chunkinfo from the list - */ - if (!ci->hash_next) - { - /* ci is the last element, find the next chunkinfo by - * looking up the chunkinfo for the chunk that is after p's chunk - */ - nextp = (mchunkptr) (((char *) (ci->chunk)) + chunksize (ci)); - - if (!(nextp == av->top->chunk)) - { - hashval = hash (nextp); - /* assert(hashval < AMOUNTHASH); *//* major bottleneck */ - cinfonextp = hashtable[hashval]; - if (cinfonextp && chunk (cinfonextp) == nextp) - return cinfonextp; - -#ifdef DNMALLOC_CHECKS_EXTRA - /* This seems bogus; a chunkinfo may legally have no nextp if - * it's the last one allocated (?) - */ - else { - if (cinfonextp) - fprintf (stderr, - "Dnmalloc error: could not find a next chunkinfo for the chunk %p in the hashtable at entry %lu, cinfonextp: %p, chunk(cinfonextp): %p, nextp: %p\n This is definitely a bug, please report it to dnmalloc@fort-knox.org.\n", - chunk(ci), hashval, cinfonextp, chunk(cinfonextp), nextp); - else - fprintf (stderr, - "Dnmalloc error: could not find a next chunkinfo for the chunk %p in the hashtable at entry %lu, cinfonextp: %s, chunk(cinfonextp): %s, nextp: %p\n This is definitely a bug, please report it to dnmalloc@fort-knox.org.\n", - chunk(ci), hashval, "null", "null", nextp); - } -#endif - - return NULL; - } - else - { - return av->top; - } - - } - else - { - return (ci->hash_next); - } -} - -static int is_next_chunk(chunkinfoptr oldp, chunkinfoptr newp) { - mchunkptr nextp; - if (oldp->hash_next == newp) - return 1; - nextp = (mchunkptr) (((char *) (oldp->chunk)) + chunksize (oldp)); - if (nextp == chunk(newp)) - return 1; - return 0; -} - - - -/* Get the chunkinfo of the physically previous chunk */ -/* Since we disposed of prev_size, we need this function to find the previous */ - -static chunkinfoptr -prev_chunkinfo (chunkinfoptr ci) -{ - unsigned int i; - chunkinfoptr prev; - mchunkptr prevchunk = 0; - /* chunkinfoptr temp; */ - - /* Get the hashtable location of the chunkinfo */ - i = hash (chunk (ci)); - assert(i < AMOUNTHASH); /* rw */ - - /* Get the first element of the linked list of chunkinfo's that contains p */ - prev = hashtable[i]; - - if (ci == prev) { - prevchunk = (mchunkptr) (((char *) (ci->chunk)) - (ci->prev_size)); - i = hash(prevchunk); - assert(i < AMOUNTHASH); /* rw */ - /* Loop over the linked list until we reach the last element */ - for (prev = hashtable[i]; prev->hash_next != 0; prev = prev->hash_next) ; - } else { - /* p is not the first element in the linked list, we can just - loop over the list and return the previous - */ - for (prev = hashtable[i]; prev->hash_next != ci; prev = prev->hash_next); - } - - return prev; -} - - -/* - Debugging support - Dnmalloc broke dlmallocs debugging functions, should fix them some - time in the future, for now leave them undefined. -*/ - -#define check_chunk(P) -#define check_free_chunk(P) -#define check_inuse_chunk(P) -#define check_remalloced_chunk(P,N) -#define check_malloced_chunk(P,N) -#define check_malloc_state() - - -/* ----------- Routines dealing with system allocation -------------- */ - -/* - sysmalloc handles malloc cases requiring more memory from the system. - On entry, it is assumed that av->top does not have enough - space to service request for nb bytes, thus requiring that av->top - be extended or replaced. -*/ - -#if __STD_C -static Void_t* sYSMALLOc(INTERNAL_SIZE_T nb, mstate av) -#else -static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av; -#endif -{ - chunkinfoptr old_top; /* incoming value of av->top */ - INTERNAL_SIZE_T old_size; /* its size */ - char* old_end; /* its end address */ - - long size; /* arg to first MORECORE or mmap call */ - char* brk; /* return value from MORECORE */ - - long correction; /* arg to 2nd MORECORE call */ - char* snd_brk; /* 2nd return val */ - - INTERNAL_SIZE_T front_misalign; /* unusable bytes at front of new space */ - INTERNAL_SIZE_T end_misalign; /* partial page left at end of new space */ - char* aligned_brk; /* aligned offset into brk */ - - chunkinfoptr p; /* the allocated/returned chunk */ - chunkinfoptr remainder; /* remainder from allocation */ - chunkinfoptr fencepost; /* fencepost */ - CHUNK_SIZE_T remainder_size; /* its size */ - - CHUNK_SIZE_T sum; /* for updating stats */ - - size_t pagemask = av->pagesize - 1; - -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Enter sysmalloc\n"); -#endif - /* - If there is space available in fastbins, consolidate and retry - malloc from scratch rather than getting memory from system. This - can occur only if nb is in smallbin range so we didn't consolidate - upon entry to malloc. It is much easier to handle this case here - than in malloc proper. - */ - - - if (have_fastchunks(av)) { - Void_t * retval; - assert(in_smallbin_range(nb)); - malloc_consolidate(av); -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Return sysmalloc have_fastchunks\n"); -#endif - retval = mALLOc(nb - MALLOC_ALIGN_MASK); - VALGRIND_FREELIKE_BLOCK(retval, 0); - return retval; - } - - - /* - If have mmap, and the request size meets the mmap threshold, and - the system supports mmap, and there are few enough currently - allocated mmapped regions, try to directly map this request - rather than expanding top. - */ - - if (UNLIKELY((CHUNK_SIZE_T)(nb) >= (CHUNK_SIZE_T)(av->mmap_threshold) && - (av->n_mmaps < av->n_mmaps_max))) { - - char* mm; /* return value from mmap call*/ - - /* - Round up size to nearest page. For mmapped chunks, the overhead - is one SIZE_SZ unit larger than for normal chunks, because there - is no following chunk whose prev_size field could be used. - */ - size = (nb + MALLOC_ALIGN_MASK + pagemask) & ~pagemask; - - /* Don't try if size wraps around 0 */ - if ((CHUNK_SIZE_T)(size) > (CHUNK_SIZE_T)(nb)) { - - - mm = (char*)(MMAP(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE)); - - if (mm != (char*)(MORECORE_FAILURE)) { - - VALGRIND_MAKE_MEM_NOACCESS(mm,size); - - /* - The offset to the start of the mmapped region is stored - in the prev_size field of the chunk. This allows us to adjust - returned start address to meet alignment requirements here - and in memalign(), and still be able to compute proper - address argument for later munmap in free() and realloc(). - */ - - front_misalign = (INTERNAL_SIZE_T) mm & MALLOC_ALIGN_MASK; - p = cireg_getfree(); - - if (front_misalign > 0) { - correction = MALLOC_ALIGNMENT - front_misalign; - p->chunk = (mchunkptr)(mm + correction); - p->hash_next = (chunkinfoptr) correction; - set_head(p, (size - correction) |INUSE|IS_MMAPPED); - } - else { - p->chunk = (mchunkptr)mm; - p->hash_next = 0; - set_head(p, size|INUSE|IS_MMAPPED); - } - hashtable_add(p); - /* update statistics */ - - if (++av->n_mmaps > av->max_n_mmaps) - av->max_n_mmaps = av->n_mmaps; - - sum = av->mmapped_mem += size; - if (sum > (CHUNK_SIZE_T)(av->max_mmapped_mem)) - av->max_mmapped_mem = sum; - sum += av->sbrked_mem; - if (sum > (CHUNK_SIZE_T)(av->max_total_mem)) - av->max_total_mem = sum; - - check_chunk(p); - -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Return mmapped (%lu, total %lu)\n", - size, (unsigned long)/* size_t */av->max_total_mem ); -#endif - return chunk(p); - } - } - } - - /* Record incoming configuration of top */ - - old_top = av->top; - old_size = chunksize(old_top); - old_end = (char*)(chunk_at_offset(chunk(old_top), old_size)); - - brk = snd_brk = (char*)(MORECORE_FAILURE); - - /* - If not the first time through, we require old_size to be - at least MINSIZE and to have prev_inuse set. - */ - - /* assert((old_top == initial_top(av) && old_size == 0) || - ((CHUNK_SIZE_T) (old_size) >= MINSIZE && - prev_inuse(old_top))); */ - - /* Precondition: not enough current space to satisfy nb request */ - assert((CHUNK_SIZE_T)(old_size) < (CHUNK_SIZE_T)(nb + MINSIZE)); - - /* Precondition: all fastbins are consolidated */ - assert(!have_fastchunks(av)); - - /* Request enough space for nb + pad + overhead */ - size = nb + av->top_pad + MINSIZE; - - /* - If contiguous, we can subtract out existing space that we hope to - combine with new space. We add it back later only if - we don't actually get contiguous space. - */ - if (contiguous(av)) - size -= old_size; - - /* - Round to a multiple of page size. - If MORECORE is not contiguous, this ensures that we only call it - with whole-page arguments. And if MORECORE is contiguous and - this is not first time through, this preserves page-alignment of - previous calls. Otherwise, we correct to page-align below. - */ - - size = (size + pagemask) & ~pagemask; - - /* - Don't try to call MORECORE if argument is so big as to appear - negative. Note that since mmap takes size_t arg, it may succeed - below even if we cannot call MORECORE. - */ - if (size > 0 && morecore32bit(av)) - brk = (char*)(MORECORE(size)); - - /* - If have mmap, try using it as a backup when MORECORE fails or - cannot be used. This is worth doing on systems that have "holes" in - address space, so sbrk cannot extend to give contiguous space, but - space is available elsewhere. Note that we ignore mmap max count - and threshold limits, since the space will not be used as a - segregated mmap region. - */ - if (brk != (char*)(MORECORE_FAILURE)) { - av->sbrked_mem += size; - VALGRIND_MAKE_MEM_NOACCESS(brk,size); - } - - else { - -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Morecore failure in sysmalloc\n"); -#endif - - /* Cannot merge with old top, so add its size back in */ - if (contiguous(av)) - size = (size + old_size + pagemask) & ~pagemask; - - /* If we are relying on mmap as backup, then use larger units */ - if ((CHUNK_SIZE_T)(size) < (CHUNK_SIZE_T)(MMAP_AS_MORECORE_SIZE)) - size = MMAP_AS_MORECORE_SIZE; - - /* Don't try if size wraps around 0 */ - if ((CHUNK_SIZE_T)(size) > (CHUNK_SIZE_T)(nb)) { - -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Try mmap in sysmalloc\n"); -#endif - brk = (char*)(MMAP(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE)); - - if (brk != (char*)(MORECORE_FAILURE)) { - - VALGRIND_MAKE_MEM_NOACCESS(brk,size); - - av->mmapped_mem += size; -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Mmapped successfully in sysmalloc %p\n", brk); -#endif - - /* We do not need, and cannot use, another sbrk call to find end */ - snd_brk = brk + size; - - /* - Record that we no longer have a contiguous sbrk region. - After the first time mmap is used as backup, we do not - ever rely on contiguous space since this could incorrectly - bridge regions. - */ - set_noncontiguous(av); - } - } - } - - if (brk != (char*)(MORECORE_FAILURE)) { -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Success path %lu allocated, sbrked %lu\n", - size, (unsigned long)av->sbrked_mem); -#endif - /* av->sbrked_mem += size; moved up */ - - /* - If MORECORE extends previous space, we can likewise extend top size. - */ - - if (brk == old_end && snd_brk == (char*)(MORECORE_FAILURE)) { - set_head(old_top, (size + old_size) | PREV_INUSE); -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Previous space extended\n"); -#endif - } - - /* - Otherwise, make adjustments: - - * If the first time through or noncontiguous, we need to call sbrk - just to find out where the end of memory lies. - - * We need to ensure that all returned chunks from malloc will meet - MALLOC_ALIGNMENT - - * If there was an intervening foreign sbrk, we need to adjust sbrk - request size to account for fact that we will not be able to - combine new space with existing space in old_top. - - * Almost all systems internally allocate whole pages at a time, in - which case we might as well use the whole last page of request. - So we allocate enough more memory to hit a page boundary now, - which in turn causes future contiguous calls to page-align. - */ - - else { - /* front_misalign = 0; *//*superfluous */ - /* end_misalign = 0; *//*superfluous */ - correction = 0; - aligned_brk = brk; - - /* - If MORECORE returns an address lower than we have seen before, - we know it isn't really contiguous. This and some subsequent - checks help cope with non-conforming MORECORE functions and - the presence of "foreign" calls to MORECORE from outside of - malloc or by other threads. We cannot guarantee to detect - these in all cases, but cope with the ones we do detect. - */ - if (contiguous(av) && old_size != 0 && brk < old_end) { - set_noncontiguous(av); - } - - /* handle contiguous cases */ - if (contiguous(av)) { - -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Handle contiguous cases\n"); -#endif - /* - We can tolerate forward non-contiguities here (usually due - to foreign calls) but treat them as part of our space for - stats reporting. - */ - if (old_size != 0) - av->sbrked_mem += brk - old_end; - - /* Guarantee alignment of first new chunk made from this space */ - - front_misalign = (INTERNAL_SIZE_T) brk & MALLOC_ALIGN_MASK; - if (front_misalign > 0) { - - /* - Skip over some bytes to arrive at an aligned position. - We don't need to specially mark these wasted front bytes. - They will never be accessed anyway because - prev_inuse of av->top (and any chunk created from its start) - is always true after initialization. - */ - - correction = MALLOC_ALIGNMENT - front_misalign; - aligned_brk += correction; - } - - /* - If this isn't adjacent to existing space, then we will not - be able to merge with old_top space, so must add to 2nd request. - */ - - correction += old_size; - - /* Extend the end address to hit a page boundary */ - end_misalign = (INTERNAL_SIZE_T)(brk + size + correction); - correction += ((end_misalign + pagemask) & ~pagemask) - end_misalign; - - assert(correction >= 0); - snd_brk = (char*)(MORECORE(correction)); - - if (snd_brk == (char*)(MORECORE_FAILURE)) { - /* - If can't allocate correction, try to at least find out current - brk. It might be enough to proceed without failing. - */ - correction = 0; - snd_brk = (char*)(MORECORE(0)); - } - else if (snd_brk < brk) { - /* - If the second call gives noncontiguous space even though - it says it won't, the only course of action is to ignore - results of second call, and conservatively estimate where - the first call left us. Also set noncontiguous, so this - won't happen again, leaving at most one hole. - - Note that this check is intrinsically incomplete. Because - MORECORE is allowed to give more space than we ask for, - there is no reliable way to detect a noncontiguity - producing a forward gap for the second call. - */ - snd_brk = brk + size; - correction = 0; - set_noncontiguous(av); - } - else { - VALGRIND_MAKE_MEM_NOACCESS(snd_brk,correction); - } - - } - - /* handle non-contiguous cases */ - else { - -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Handle non-contiguous cases\n"); -#endif - - /* MORECORE/mmap must correctly align */ - assert(aligned_OK(brk)); - - /* Find out current end of memory */ - if (snd_brk == (char*)(MORECORE_FAILURE)) { - snd_brk = (char*)(MORECORE(0)); - av->sbrked_mem += snd_brk - brk - size; - } -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Sbrked now %lu\n", (unsigned long)av->sbrked_mem); -#endif - } - - /* Adjust top based on results of second sbrk. - * - * If mmap() has been used as backup for failed morecore(), - * we end up in this branch as well. - */ - if (snd_brk != (char*)(MORECORE_FAILURE)) { -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Adjust top, correction %lu\n", correction); -#endif - /* hashtable_remove(chunk(av->top)); *//* rw 19.05.2008 removed */ - av->top = cireg_getfree(); - av->top->chunk = (mchunkptr)aligned_brk; - set_head(av->top, (snd_brk - aligned_brk + correction) | PREV_INUSE); -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Adjust top, top %p size %lu\n", - av->top, (unsigned long)chunksize(av->top)); -#endif - hashtable_add(av->top); - av->sbrked_mem += correction; - - /* - If not the first time through, we either have a - gap due to foreign sbrk or a non-contiguous region. Insert a - double fencepost at old_top to prevent consolidation with space - we don't own. These fenceposts are artificial chunks that are - marked as inuse. Original dlmalloc had two of these but too - small to use. To ensure that the linked lists contain a maximum - of 8 elements we only use 1. Inuse is determined by the - current rather than the next chunk anyway. - */ - - if (old_size != 0) { -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Shrink old_top to insert fenceposts\n"); -#endif - /* - Shrink old_top to insert fenceposts, keeping size a - multiple of MALLOC_ALIGNMENT. We know there is at least - enough space in old_top to do this. - */ -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Adjust top, old_top %p old_size before %lu\n", - old_top, (unsigned long)old_size); -#endif - old_size = (old_size - 4*SIZE_SZ) & ~MALLOC_ALIGN_MASK; - set_head(old_top, old_size | PREV_INUSE); -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Adjust top, old_size after %lu\n", - (unsigned long)old_size); -#endif - - /* - Note that the following assignments completely overwrite - old_top when old_size was previously MINSIZE. This is - intentional. We need the fencepost, even if old_top otherwise gets - lost. - */ - /* dnmalloc, we need the fencepost to be 16 bytes, however since - it's marked inuse it will never be coalesced - */ - fencepost = cireg_getfree(); - fencepost->chunk = (mchunkptr) chunk_at_offset(chunk(old_top), - old_size); - fencepost->size = 16|INUSE|PREV_INUSE; - hashtable_add(fencepost); - /* - If possible, release the rest, suppressing trimming. - */ - if (old_size >= MINSIZE) { - INTERNAL_SIZE_T tt = av->trim_threshold; -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Release\n"); -#endif - av->trim_threshold = (INTERNAL_SIZE_T)(-1); - set_head(old_top, old_size | PREV_INUSE | INUSE); - guard_set(av->guard_stored, old_top, 0, old_size); - VALGRIND_MALLOCLIKE_BLOCK(chunk(old_top), old_size, 0, 0); - fREe(chunk(old_top)); - av->trim_threshold = tt; -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Release done\n"); -#endif - } - -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Adjust top, size %lu\n", - (unsigned long)chunksize(av->top)); -#endif - - } /* fenceposts */ - } /* adjust top */ - } /* not extended previous region */ - - /* Update statistics */ - sum = av->sbrked_mem; - if (sum > (CHUNK_SIZE_T)(av->max_sbrked_mem)) - av->max_sbrked_mem = sum; - - sum += av->mmapped_mem; - if (sum > (CHUNK_SIZE_T)(av->max_total_mem)) - av->max_total_mem = sum; - - check_malloc_state(); - - /* finally, do the allocation */ - - p = av->top; - size = chunksize(p); - -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Size: %lu nb+MINSIZE: %lu\n", - (CHUNK_SIZE_T)(size), (CHUNK_SIZE_T)(nb + MINSIZE)); -#endif - - /* check that one of the above allocation paths succeeded */ - if ((CHUNK_SIZE_T)(size) >= (CHUNK_SIZE_T)(nb + MINSIZE)) { - remainder_size = size - nb; - remainder = cireg_getfree(); - remainder->chunk = chunk_at_offset(chunk(p), nb); - av->top = remainder; - set_head(p, nb | PREV_INUSE | INUSE); - set_head(remainder, remainder_size | PREV_INUSE); - hashtable_insert (p, av->top); - check_malloced_chunk(p, nb); -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Return any (total %lu)\n", - (unsigned long)/* size_t */av->max_total_mem ); -#endif - return chunk(p); - } - - } - -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Return failed (total %lu)\n", - (unsigned long)/* size_t */av->max_total_mem ); -#endif - - /* catch all failure paths */ - MALLOC_FAILURE_ACTION; - return 0; -} - - - - -/* - sYSTRIm is an inverse of sorts to sYSMALLOc. It gives memory back - to the system (via negative arguments to sbrk) if there is unused - memory at the `high' end of the malloc pool. It is called - automatically by free() when top space exceeds the trim - threshold. It is also called by the public malloc_trim routine. It - returns 1 if it actually released any memory, else 0. -*/ - -#if __STD_C -static int sYSTRIm(size_t pad, mstate av) -#else -static int sYSTRIm(pad, av) size_t pad; mstate av; -#endif -{ - long top_size; /* Amount of top-most memory */ - long extra; /* Amount to release */ - long released; /* Amount actually released */ - char* current_brk; /* address returned by pre-check sbrk call */ - char* new_brk; /* address returned by post-check sbrk call */ - size_t pagesz; - - pagesz = av->pagesize; - top_size = chunksize(av->top); - - /* Release in pagesize units, keeping at least one page */ - extra = ((top_size - pad - MINSIZE + (pagesz-1)) / pagesz - 1) * pagesz; - - if (extra > 0) { - - /* - Only proceed if end of memory is where we last set it. - This avoids problems if there were foreign sbrk calls. - */ - current_brk = (char*)(MORECORE(0)); - if (current_brk == (char*)(av->top) + top_size) { - - /* - Attempt to release memory. We ignore MORECORE return value, - and instead call again to find out where new end of memory is. - This avoids problems if first call releases less than we asked, - of if failure somehow altered brk value. (We could still - encounter problems if it altered brk in some very bad way, - but the only thing we can do is adjust anyway, which will cause - some downstream failure.) - */ - - MORECORE(-extra); - new_brk = (char*)(MORECORE(0)); - - if (new_brk != (char*)MORECORE_FAILURE) { - released = (long)(current_brk - new_brk); - - if (released != 0) { - /* Success. Adjust top. */ - av->sbrked_mem -= released; - set_head(av->top, (top_size - released) | PREV_INUSE); - check_malloc_state(); - return 1; - } - } - } - } - return 0; -} - -/* - ------------------------------ malloc ------------------------------ -*/ - - -#if __STD_C -DL_STATIC Void_t* mALLOc(size_t bytes) -#else -DL_STATIC Void_t* mALLOc(bytes) size_t bytes; -#endif -{ - mstate av = get_malloc_state(); - - INTERNAL_SIZE_T nb; /* normalized request size */ - unsigned int idx; /* associated bin index */ - mbinptr bin; /* associated bin */ - mfastbinptr* fb; /* associated fastbin */ - - chunkinfoptr victim; /* inspected/selected chunk */ - INTERNAL_SIZE_T size; /* its size */ - int victim_index; /* its bin index */ - - chunkinfoptr remainder; /* remainder from a split */ - CHUNK_SIZE_T remainder_size; /* its size */ - - unsigned int block; /* bit map traverser */ - unsigned int bit; /* bit map traverser */ - unsigned int map; /* current word of binmap */ - - chunkinfoptr fwd; /* misc temp for linking */ - chunkinfoptr bck; /* misc temp for linking */ - - Void_t* retval; - - /* chunkinfoptr next; */ - - - /* - Convert request size to internal form by adding SIZE_SZ bytes - overhead plus possibly more to obtain necessary alignment and/or - to obtain a size of at least MINSIZE, the smallest allocatable - size. Also, checked_request2size traps (returning 0) request sizes - that are so large that they wrap around zero when padded and - aligned. - */ -#if defined(SH_CUTEST) - extern int malloc_count; - ++malloc_count; -#endif - - checked_request2size(bytes, nb); - - /* - Bypass search if no frees yet - */ - if (av && have_anychunks(av)) { - goto av_initialized; - } - else { - if (!av || av->max_fast == 0) { /* initialization check */ - malloc_consolidate(av); - av = get_malloc_state(); - } - goto use_top; - } - - av_initialized: - - /* - If the size qualifies as a fastbin, first check corresponding bin. - */ - if ((CHUNK_SIZE_T)(nb) <= (CHUNK_SIZE_T)(av->max_fast)) { - fb = &(av->fastbins[(fastbin_index(nb))]); - if ( (victim = *fb) != 0) { - *fb = victim->fd; - check_remalloced_chunk(victim, nb); - guard_set(av->guard_stored, victim, bytes, nb); - VALGRIND_MALLOCLIKE_BLOCK(chunk(victim), bytes, 0, 0); - return chunk(victim); - } - } - - /* - If a small request, check regular bin. Since these "smallbins" - hold one size each, no searching within bins is necessary. - (For a large request, we need to wait until unsorted chunks are - processed to find best fit. But for small ones, fits are exact - anyway, so we can check now, which is faster.) - */ - - if (in_smallbin_range(nb)) { - idx = smallbin_index(nb); - bin = bin_at(av,idx); - - if ((victim = last(bin)) != bin) { - bck = victim->bk; - bin->bk = bck; - bck->fd = bin; - - set_all_inuse(victim); - - check_malloced_chunk(victim, nb); - guard_set(av->guard_stored, victim, bytes, nb); - VALGRIND_MALLOCLIKE_BLOCK(chunk(victim), bytes, 0, 0); - return chunk(victim); - } - } - - /* - If this is a large request, consolidate fastbins before continuing. - While it might look excessive to kill all fastbins before - even seeing if there is space available, this avoids - fragmentation problems normally associated with fastbins. - Also, in practice, programs tend to have runs of either small or - large requests, but less often mixtures, so consolidation is not - invoked all that often in most programs. And the programs that - it is called frequently in otherwise tend to fragment. - */ - - else { - idx = largebin_index(nb); - if (have_fastchunks(av)) - malloc_consolidate(av); - } - - /* - Process recently freed or remaindered chunks, taking one only if - it is exact fit, or, if this a small request, the chunk is remainder from - the most recent non-exact fit. Place other traversed chunks in - bins. Note that this step is the only place in any routine where - chunks are placed in bins. - */ - - while ( (victim = unsorted_chunks(av)->bk) != unsorted_chunks(av)) { - bck = victim->bk; - size = chunksize(victim); - - /* - If a small request, try to use last remainder if it is the - only chunk in unsorted bin. This helps promote locality for - runs of consecutive small requests. This is the only - exception to best-fit, and applies only when there is - no exact fit for a small chunk. - */ - - if (UNLIKELY(in_smallbin_range(nb) && - bck == unsorted_chunks(av) && - victim == av->last_remainder && - (CHUNK_SIZE_T)(size) > (CHUNK_SIZE_T)(nb + MINSIZE))) { - - /* split and reattach remainder */ - remainder_size = size - nb; - remainder = cireg_getfree(); - remainder->chunk = chunk_at_offset(chunk(victim), nb); - unsorted_chunks(av)->bk = unsorted_chunks(av)->fd = remainder; - av->last_remainder = remainder; - remainder->bk = remainder->fd = unsorted_chunks(av); - - set_head(victim, nb | PREV_INUSE|INUSE); - set_head(remainder, remainder_size | PREV_INUSE); - hashtable_insert(victim, remainder); - - check_malloced_chunk(victim, nb); - guard_set(av->guard_stored, victim, bytes, nb); - VALGRIND_MALLOCLIKE_BLOCK(chunk(victim), bytes, 0, 0); - return chunk(victim); - } - - /* remove from unsorted list */ - unsorted_chunks(av)->bk = bck; - bck->fd = unsorted_chunks(av); - - /* Take now instead of binning if exact fit */ - - if (UNLIKELY(size == nb)) { - set_all_inuse(victim) - check_malloced_chunk(victim, nb); - guard_set(av->guard_stored, victim, bytes, nb); - VALGRIND_MALLOCLIKE_BLOCK(chunk(victim), bytes, 0, 0); - return chunk(victim); - } - - /* place chunk in bin */ - - if (in_smallbin_range(size)) { - - victim_index = smallbin_index(size); - bck = bin_at(av, victim_index); - fwd = bck->fd; - } - else { - victim_index = largebin_index(size); - bck = bin_at(av, victim_index); - fwd = bck->fd; - - if (UNLIKELY(fwd != bck)) { - /* if smaller than smallest, place first */ - if ((CHUNK_SIZE_T)(size) < (CHUNK_SIZE_T)(bck->bk->size)) { - fwd = bck; - bck = bck->bk; - } - else if ((CHUNK_SIZE_T)(size) >= - (CHUNK_SIZE_T)(FIRST_SORTED_BIN_SIZE)) { - - /* maintain large bins in sorted order */ - size |= PREV_INUSE|INUSE; /* Or with inuse bits to speed comparisons */ - while ((CHUNK_SIZE_T)(size) < (CHUNK_SIZE_T)(fwd->size)) - fwd = fwd->fd; - bck = fwd->bk; - } - } - } - - mark_bin(av, victim_index); - victim->bk = bck; - victim->fd = fwd; - fwd->bk = victim; - bck->fd = victim; - } - - /* - If a large request, scan through the chunks of current bin to - find one that fits. (This will be the smallest that fits unless - FIRST_SORTED_BIN_SIZE has been changed from default.) This is - the only step where an unbounded number of chunks might be - scanned without doing anything useful with them. However the - lists tend to be short. - */ - - if (!in_smallbin_range(nb)) { - bin = bin_at(av, idx); - - victim = last(bin); - - if (UNLIKELY(victim != bin)) { - - do { - size = chunksize(victim); - - if ((CHUNK_SIZE_T)(size) >= (CHUNK_SIZE_T)(nb)) { - remainder_size = size - nb; - unlink(victim, bck, fwd); - - /* Split */ - if (remainder_size >= MINSIZE) { - remainder = cireg_getfree(); - remainder->chunk = chunk_at_offset(chunk(victim), nb); - unsorted_chunks(av)->bk = unsorted_chunks(av)->fd = remainder; - remainder->bk = remainder->fd = unsorted_chunks(av); - set_head(victim, nb | PREV_INUSE | INUSE); - set_head(remainder, remainder_size | PREV_INUSE); - hashtable_insert(victim, remainder); - check_malloced_chunk(victim, nb); - guard_set(av->guard_stored, victim, bytes, nb); - VALGRIND_MALLOCLIKE_BLOCK(chunk(victim), bytes, 0, 0); - return chunk(victim); - } - /* Exhaust */ - else { - set_all_inuse(victim); - check_malloced_chunk(victim, nb); - guard_set(av->guard_stored, victim, bytes, nb); - VALGRIND_MALLOCLIKE_BLOCK(chunk(victim), bytes, 0, 0); - return chunk(victim); - } - } - victim = victim->bk; - } while(victim != bin); - } - } - - /* - Search for a chunk by scanning bins, starting with next largest - bin. This search is strictly by best-fit; i.e., the smallest - (with ties going to approximately the least recently used) chunk - that fits is selected. - - The bitmap avoids needing to check that most blocks are nonempty. - */ - - - ++idx; - bin = bin_at(av,idx); - block = idx2block(idx); - map = av->binmap[block]; - bit = idx2bit(idx); - - for (;;) { - - /* Skip rest of block if there are no more set bits in this block. */ - if (bit > map || bit == 0) { - do { - if (++block >= BINMAPSIZE) /* out of bins */ - goto use_top; - } while ( (map = av->binmap[block]) == 0); - - bin = bin_at(av, (block << BINMAPSHIFT)); - bit = 1; - } - - /* Advance to bin with set bit. There must be one. */ - while ((bit & map) == 0) { - bin = next_bin(bin); - bit <<= 1; - assert(bit != 0); - } - - /* Inspect the bin. It is likely to be non-empty */ - victim = last(bin); - - /* If a false alarm (empty bin), clear the bit. */ - if (victim == bin) { - av->binmap[block] = map &= ~bit; /* Write through */ - bin = next_bin(bin); - bit <<= 1; - } - - else { - size = chunksize(victim); - - /* We know the first chunk in this bin is big enough to use. */ - assert((CHUNK_SIZE_T)(size) >= (CHUNK_SIZE_T)(nb)); - - remainder_size = size - nb; - - /* unlink */ - bck = victim->bk; - bin->bk = bck; - bck->fd = bin; - - /* Split */ - if (remainder_size >= MINSIZE) { - remainder = cireg_getfree(); - remainder->chunk = chunk_at_offset(chunk(victim), nb); - - unsorted_chunks(av)->bk = unsorted_chunks(av)->fd = remainder; - remainder->bk = remainder->fd = unsorted_chunks(av); - /* advertise as last remainder */ - if (in_smallbin_range(nb)) - av->last_remainder = remainder; - - set_head(victim, nb | PREV_INUSE | INUSE); - set_head(remainder, remainder_size | PREV_INUSE); - hashtable_insert(victim, remainder); - check_malloced_chunk(victim, nb); - guard_set(av->guard_stored, victim, bytes, nb); - VALGRIND_MALLOCLIKE_BLOCK(chunk(victim), bytes, 0, 0); - return chunk(victim); - } - /* Exhaust */ - else { - set_all_inuse(victim); - check_malloced_chunk(victim, nb); - guard_set(av->guard_stored, victim, bytes, nb); - VALGRIND_MALLOCLIKE_BLOCK(chunk(victim), bytes, 0, 0); - return chunk(victim); - } - - } - } - - use_top: - - - /* - If large enough, split off the chunk bordering the end of memory - (held in av->top). Note that this is in accord with the best-fit - search rule. In effect, av->top is treated as larger (and thus - less well fitting) than any other available chunk since it can - be extended to be as large as necessary (up to system - limitations). - - We require that av->top always exists (i.e., has size >= - MINSIZE) after initialization, so if it would otherwise be - exhuasted by current request, it is replenished. (The main - reason for ensuring it exists is that we may need MINSIZE space - to put in fenceposts in sysmalloc.) - */ - - victim = av->top; - size = chunksize(victim); - - if ((CHUNK_SIZE_T)(size) >= (CHUNK_SIZE_T)(nb + MINSIZE)) { - remainder = cireg_getfree(); - remainder_size = size - nb; - remainder->chunk = chunk_at_offset(chunk(victim), nb); - av->top = remainder; - set_head(victim, nb | PREV_INUSE | INUSE); - set_head(remainder, remainder_size | PREV_INUSE); - hashtable_insert(victim, remainder); - check_malloced_chunk(victim, nb); - guard_set(av->guard_stored, victim, bytes, nb); - VALGRIND_MALLOCLIKE_BLOCK(chunk(victim), bytes, 0, 0); - return chunk(victim); - } - - /* - If no space in top, relay to handle system-dependent cases - */ - retval = sYSMALLOc(nb, av); - if (retval) { -#if PARANOIA > 2 - victim = mem2chunk(retval); /* is used in guard_set macro */ -#endif - guard_set(av->guard_stored, victim, bytes, nb); - } - VALGRIND_MALLOCLIKE_BLOCK(retval, bytes, 0, 0); - return retval; -} - -/* - ------------------------------ free ------------------------------ -*/ - -#if __STD_C -DL_STATIC void fREe(Void_t* mem) -#else -DL_STATIC void fREe(mem) Void_t* mem; -#endif -{ - mstate av = get_malloc_state(); - - chunkinfoptr p; /* chunk corresponding to mem */ - INTERNAL_SIZE_T size; /* its size */ - mfastbinptr* fb; /* associated fastbin */ - chunkinfoptr prevchunk; /* previous physical chunk */ - chunkinfoptr nextchunk; /* next contiguous chunk */ - INTERNAL_SIZE_T nextsize; /* its size */ - INTERNAL_SIZE_T prevsize; /* size of previous contiguous chunk */ - chunkinfoptr bck; /* misc temp for linking */ - chunkinfoptr fwd; /* misc temp for linking */ - chunkinfoptr next; -#if defined(SH_CUTEST) - extern int malloc_count; - --malloc_count; -#endif - - /* free(0) has no effect */ - if (mem != 0) { - p = hashtable_lookup(mem); - /* check that memory is managed by us - * and is inuse - */ - if (UNLIKELY(!p || !inuse(p))) - { -#ifdef DNMALLOC_CHECKS - if (p) { - fprintf(stderr, "Attempt to free memory not in use\n"); - abort(); - } else { - fprintf(stderr, "Attempt to free memory not allocated\n"); - abort(); - } -#endif - assert(p && inuse(p)); - return; - } - - VALGRIND_FREELIKE_BLOCK(mem, 0); - - guard_check(av->guard_stored, p); - - size = chunksize(p); - - check_inuse_chunk(p); - - /* - If eligible, place chunk on a fastbin so it can be found - and used quickly in malloc. - */ - - if ((CHUNK_SIZE_T)(size) <= (CHUNK_SIZE_T)(av->max_fast) - -#if TRIM_FASTBINS - /* - If TRIM_FASTBINS set, don't place chunks - bordering top into fastbins - */ - && (chunk_at_offset(chunk(p), size) != av->top) -#endif - ) { - - set_fastchunks(av); - fb = &(av->fastbins[fastbin_index(size)]); - p->fd = *fb; - *fb = p; - } - - /* - Consolidate other non-mmapped chunks as they arrive. - */ - - else if (!chunk_is_mmapped(p)) { - set_anychunks(av); - - nextchunk = next_chunkinfo(p); - if (nextchunk) - nextsize = chunksize(nextchunk); - else - nextsize = 0;/* gcc doesn't notice that it's only used if (nextchunk)*/ - - /* consolidate backward */ - if (UNLIKELY(!prev_inuse(p))) { - prevchunk = prev_chunkinfo(p); - prevsize = chunksize(prevchunk); -#ifdef DNMALLOC_CHECKS - if (inuse(prevchunk)) { - fprintf(stderr, "Dnmalloc error: trying to unlink an inuse chunk: %p (chunk: %p)\n This is definitely a bug, please report it to dnmalloc@fort-knox.org.\n", prevchunk, chunk(prevchunk)); - abort(); - } -#else - assert(!inuse(prevchunk)); -#endif - size += prevsize; - unlink(prevchunk, bck, fwd); - set_head(p, size | PREV_INUSE); - hashtable_skiprm(prevchunk,p); - /* This chunk no longer exists in any form: release the chunkinfoptr - */ - freecilst_add(p); - p = prevchunk; - } - - if (nextchunk) { - if (nextchunk != av->top) { - /* get and clear inuse bit */ - clear_previnuse(nextchunk); - - /* consolidate forward */ - if (!inuse(nextchunk)) { - /* if mmap is used instead of sbrk, we may have a - * chunk with !nextchunk->fd && !nextchunk->bk - */ - if (nextchunk->fd && nextchunk->fd) - { - unlink(nextchunk, bck, fwd); - size += nextsize; - set_head(p, size | PREV_INUSE); - hashtable_skiprm(p, nextchunk); - freecilst_add (nextchunk); - } - } - - set_head(p, size | PREV_INUSE); - next = next_chunkinfo(p); - if (next) - next->prev_size = size; - - /* - Place the chunk in unsorted chunk list. Chunks are - not placed into regular bins until after they have - been given one chance to be used in malloc. - */ - - bck = unsorted_chunks(av); - fwd = bck->fd; - p->bk = bck; - p->fd = fwd; - bck->fd = p; - fwd->bk = p; - - nextchunk = next_chunkinfo(p); - if (nextchunk) - nextchunk->prev_size = chunksize(p); - - check_free_chunk(p); - } - - /* - If the chunk borders the current high end of memory, - consolidate into top - */ - - else { - size += nextsize; - set_head(p, size | PREV_INUSE); - hashtable_remove(chunk(av->top)); - freecilst_add(av->top); - av->top = p; - check_chunk(p); - } - } /* if (nextchunk) */ - - /* - If freeing a large space, consolidate possibly-surrounding - chunks. Then, if the total unused topmost memory exceeds trim - threshold, ask malloc_trim to reduce top. - - Unless max_fast is 0, we don't know if there are fastbins - bordering top, so we cannot tell for sure whether threshold - has been reached unless fastbins are consolidated. But we - don't want to consolidate on each free. As a compromise, - consolidation is performed if FASTBIN_CONSOLIDATION_THRESHOLD - is reached. - */ - - if (UNLIKELY((CHUNK_SIZE_T)(size) >= FASTBIN_CONSOLIDATION_THRESHOLD)) { - if (have_fastchunks(av)) - malloc_consolidate(av); - -#ifndef MORECORE_CANNOT_TRIM - if ((CHUNK_SIZE_T)(chunksize(av->top)) >= - (CHUNK_SIZE_T)(av->trim_threshold)) - { - if (morecore32bit(av)) - { -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Calling systrim from free()\n"); -#endif - sYSTRIm(av->top_pad, av); -#ifdef DNMALLOC_DEBUG - fprintf(stderr, "Systrim done\n"); -#endif - } - } -#endif - } - - } - /* - If the chunk was allocated via mmap, release via munmap() - Note that if HAVE_MMAP is false but chunk_is_mmapped is - true, then user must have overwritten memory. There's nothing - we can do to catch this error unless DEBUG is set, in which case - check_inuse_chunk (above) will have triggered error. - */ - - else { -#if PARANOIA > 0 - int ret; -#endif - INTERNAL_SIZE_T offset = (INTERNAL_SIZE_T) p->hash_next; - av->n_mmaps--; - av->mmapped_mem -= (size + offset); -#if PARANOIA > 0 - ret = munmap((char*) chunk(p) - offset, size + offset); -#else - munmap((char*) chunk(p) - offset, size + offset); -#endif - hashtable_remove_mmapped(chunk(p)); - freecilst_add(p); - /* munmap returns non-zero on failure */ - assert(ret == 0); - } - } -} - -/* - ------------------------- malloc_consolidate ------------------------- - - malloc_consolidate is a specialized version of free() that tears - down chunks held in fastbins. Free itself cannot be used for this - purpose since, among other things, it might place chunks back onto - fastbins. So, instead, we need to use a minor variant of the same - code. - - Also, because this routine needs to be called the first time through - malloc anyway, it turns out to be the perfect place to trigger - initialization code. -*/ - -#if __STD_C -static void malloc_consolidate(mstate av) -#else -static void malloc_consolidate(av) mstate av; -#endif -{ - mfastbinptr* fb; /* current fastbin being consolidated */ - mfastbinptr* maxfb; /* last fastbin (for loop control) */ - chunkinfoptr p; /* current chunk being consolidated */ - chunkinfoptr nextp; /* next chunk to consolidate */ - chunkinfoptr prevp; - chunkinfoptr unsorted_bin; /* bin header */ - chunkinfoptr first_unsorted; /* chunk to link to */ - - /* These have same use as in free() */ - chunkinfoptr nextchunk; - INTERNAL_SIZE_T size; - INTERNAL_SIZE_T nextsize; - INTERNAL_SIZE_T prevsize; - chunkinfoptr bck; - chunkinfoptr fwd; - chunkinfoptr next; - - /* - If max_fast is 0, we know that av hasn't - yet been initialized, in which case do so below - */ - if (av && av->max_fast != 0) { - - clear_fastchunks(av); - - unsorted_bin = unsorted_chunks(av); - - /* - Remove each chunk from fast bin and consolidate it, placing it - then in unsorted bin. Among other reasons for doing this, - placing in unsorted bin avoids needing to calculate actual bins - until malloc is sure that chunks aren't immediately going to be - reused anyway. - */ - - maxfb = &(av->fastbins[fastbin_index(av->max_fast)]); - fb = &(av->fastbins[0]); - do { - if ( UNLIKELY((p = *fb) != 0)) { - *fb = 0; - do { - check_inuse_chunk(p); - nextp = p->fd; - - /* - * Slightly streamlined version of consolidation code in free() - */ - - size = chunksize(p); - nextchunk = next_chunkinfo(p); - - /* gcc doesn't notice that it's only used if (nextchunk) */ - if (nextchunk) - nextsize = chunksize(nextchunk); - else - nextsize = 0; - - if (!prev_inuse(p)) { - prevp = prev_chunkinfo(p); - prevsize = chunksize(prevp); - size += prevsize; -#ifdef DNMALLOC_CHECKS - if (inuse(prevp)) { - fprintf(stderr, "Dnmalloc error: trying to unlink an inuse chunk (2): %p (chunk: %p)\n This is definitely a bug, please report it to dnmalloc@fort-knox.org.\n", prevp, chunk(prevp)); - abort(); - } -#else - assert(!inuse(prevp)); -#endif - unlink(prevp, bck, fwd); - set_head(p, size | PREV_INUSE); - hashtable_skiprm(prevp,p); - freecilst_add(p); - p=prevp; - } - - if (nextchunk) { - if (nextchunk != av->top) { - - clear_previnuse(nextchunk); - - /* if mmap is used instead of sbrk, we may have a - * chunk with !nextchunk->fd && !nextchunk->bk - */ - if (!inuse(nextchunk)) { - if( nextchunk->fd && nextchunk->bk) { - size += nextsize; - unlink(nextchunk, bck, fwd); - set_head(p, size | PREV_INUSE); - hashtable_skiprm(p,nextchunk); - freecilst_add(nextchunk); - } - } - - first_unsorted = unsorted_bin->fd; - unsorted_bin->fd = p; - first_unsorted->bk = p; - - set_head(p, size | PREV_INUSE); - p->bk = unsorted_bin; - p->fd = first_unsorted; - next = next_chunkinfo(p); - if (next) - next->prev_size = size; - - - } - - else if (nextchunk == av->top) { - size += nextsize; - set_head(p, size | PREV_INUSE); - hashtable_remove(chunk(av->top)); - freecilst_add(av->top); - av->top = p; - } - } /* if (nextchunk) */ - - } while ( (p = nextp) != 0); - - } - } while (fb++ != maxfb); - } - else { - /* Initialize dnmalloc */ - dnmalloc_init(); - malloc_init_state(get_malloc_state()); - check_malloc_state(); - } -} - -/* - ------------------------------ realloc ------------------------------ -*/ - - -#if __STD_C -DL_STATIC Void_t* rEALLOc(Void_t* oldmem, size_t bytes) -#else -DL_STATIC Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes; -#endif -{ - mstate av = get_malloc_state(); - - INTERNAL_SIZE_T nb; /* padded request size */ - - chunkinfoptr oldp; /* chunk corresponding to oldmem */ - INTERNAL_SIZE_T oldsize; /* its size */ - - chunkinfoptr newp; /* chunk to return */ - INTERNAL_SIZE_T newsize; /* its size */ - Void_t* newmem; /* corresponding user mem */ - - chunkinfoptr next; /* next contiguous chunk after oldp */ - - chunkinfoptr remainder; /* extra space at end of newp */ - CHUNK_SIZE_T remainder_size; /* its size */ - - chunkinfoptr bck; /* misc temp for linking */ - chunkinfoptr fwd; /* misc temp for linking */ - - CHUNK_SIZE_T copysize; /* bytes to copy */ - unsigned int ncopies; /* INTERNAL_SIZE_T words to copy */ - INTERNAL_SIZE_T* s; /* copy source */ - INTERNAL_SIZE_T* d; /* copy destination */ - - -#ifdef REALLOC_ZERO_BYTES_FREES - if (UNLIKELY(bytes == 0)) { - fREe(oldmem); - return 0; - } -#endif - - if (UNLIKELY(!av || av->max_fast == 0)) { - malloc_consolidate(av); - av = get_malloc_state(); - } - - /* realloc of null is supposed to be same as malloc */ - if (UNLIKELY(oldmem == 0)) - return mALLOc(bytes); - - checked_request2size(bytes, nb); - - oldp = hashtable_lookup(oldmem); - - if (UNLIKELY(!oldp || !inuse(oldp))){ - /* attempt to either realloc memory not managed by us - * or memory that is not in use - */ -#ifdef DNMALLOC_CHECKS - if (oldp) { - fprintf(stderr, "Attempt to free memory not in use\n"); - abort(); - } else { - fprintf(stderr, "Attempt to free memory not allocated\n"); - abort(); - } -#endif - assert(oldp && inuse(oldp)); - return 0; - } - - VALGRIND_FREELIKE_BLOCK(oldmem, 0); - guard_check(av->guard_stored, oldp); - - oldsize = chunksize(oldp); - - check_inuse_chunk(oldp); - - if (!chunk_is_mmapped(oldp)) { - - if (UNLIKELY((CHUNK_SIZE_T)(oldsize) >= (CHUNK_SIZE_T)(nb))) { - /* already big enough; split below */ - newp = oldp; - newsize = oldsize; - } - - else { - next = next_chunkinfo(oldp); - if (next) - next->prev_size = oldsize; - /* Try to expand forward into top */ - if (next && next == av->top && - (CHUNK_SIZE_T)(newsize = oldsize + chunksize(next)) >= - (CHUNK_SIZE_T)(nb + MINSIZE)) { - set_head_size(oldp, nb); - hashtable_remove(chunk(av->top)); - av->top->chunk = chunk_at_offset(chunk(oldp), nb); - set_head(av->top, (newsize - nb) | PREV_INUSE); - /* av->top->chunk has been moved move in hashtable */ - hashtable_insert(oldp, av->top); - guard_set(av->guard_stored, oldp, bytes, nb); - VALGRIND_MALLOCLIKE_BLOCK(chunk(oldp), bytes, 0, 0); - return chunk(oldp); - } - - /* Try to expand forward into next chunk; split off remainder below */ - else if (next && next != av->top && - !inuse(next) && - (CHUNK_SIZE_T)(newsize = oldsize + chunksize(next)) >= - (CHUNK_SIZE_T)(nb)) { - newp = oldp; - unlink(next, bck, fwd); - hashtable_remove(chunk(next)); - freecilst_add(next); - next = next_chunkinfo(oldp); - if (next) - next->prev_size = newsize; - } - - /* allocate, copy, free */ - else { - - newmem = mALLOc(nb - MALLOC_ALIGN_MASK); - if (newmem == 0) - return 0; /* propagate failure */ - - newp = hashtable_lookup(newmem); - newsize = chunksize(newp); - - - /* next = next_chunkinfo(oldp); *//* 'next' never used rw 19.05.2008 */ - /* - Avoid copy if newp is next chunk after oldp. - */ - if (UNLIKELY(is_next_chunk(oldp, newp))) { - newsize += oldsize; - set_head_size(oldp, newsize); - hashtable_skiprm(oldp, newp); - freecilst_add(newp); - newp = oldp; - } - else { - /* - Unroll copy of <= 40 bytes (80 if 8byte sizes) - We know that contents have an even number of - INTERNAL_SIZE_T-sized words; minimally 4 (2 on amd64). - */ - - VALGRIND_MALLOCLIKE_BLOCK(chunk(oldp), chunksize(oldp), 0, 0); - - copysize = oldsize; - s = (INTERNAL_SIZE_T*)(oldmem); - d = (INTERNAL_SIZE_T*)(newmem); - ncopies = copysize / sizeof(INTERNAL_SIZE_T); - assert(ncopies >= 2); - - if (ncopies > 10) - MALLOC_COPY(d, s, copysize); - - else { - *(d+0) = *(s+0); - *(d+1) = *(s+1); - if (ncopies > 2) { - *(d+2) = *(s+2); - *(d+3) = *(s+3); - if (ncopies > 4) { - *(d+4) = *(s+4); - *(d+5) = *(s+5); - if (ncopies > 6) { - *(d+6) = *(s+6); - *(d+7) = *(s+7); - if (ncopies > 8) { - *(d+8) = *(s+8); - *(d+9) = *(s+9); - } - } - } - } - } - - fREe(oldmem); - check_inuse_chunk(newp); - guard_set(av->guard_stored, newp, bytes, nb); - return chunk(newp); - } - } - } - - /* If possible, free extra space in old or extended chunk */ - - assert((CHUNK_SIZE_T)(newsize) >= (CHUNK_SIZE_T)(nb)); - - remainder_size = newsize - nb; - - if (remainder_size >= MINSIZE) { /* split remainder */ - remainder = cireg_getfree(); - remainder->chunk = chunk_at_offset(chunk(newp), nb); - set_head_size(newp, nb); - set_head(remainder, remainder_size | PREV_INUSE | INUSE); - remainder->prev_size = nb; - hashtable_insert(newp, remainder); - /* Mark remainder as inuse so free() won't complain */ - set_all_inuse(remainder); - guard_set(av->guard_stored, remainder, 0, remainder_size); - VALGRIND_MALLOCLIKE_BLOCK(chunk(remainder), remainder_size, 0, 0); - fREe(chunk(remainder)); - } - else { /* not enough extra to split off */ - set_head_size(newp, newsize); - set_all_inuse(newp); - } - - check_inuse_chunk(newp); - guard_set(av->guard_stored, newp, bytes, nb); - VALGRIND_MALLOCLIKE_BLOCK(chunk(newp), bytes, 0, 0); - return chunk(newp); - } - - /* - Handle mmap cases - */ - - else { - -#if HAVE_MREMAP - INTERNAL_SIZE_T offset = (INTERNAL_SIZE_T) oldp->hash_next; - size_t pagemask = av->pagesize - 1; - char *cp; - CHUNK_SIZE_T sum; - - - /* Note the extra SIZE_SZ overhead */ - /* newsize = (nb + offset + SIZE_SZ + pagemask) & ~pagemask; */ - newsize = (nb + offset + pagemask) & ~pagemask; - - /* don't need to remap if still within same page */ - if (oldsize == newsize - offset) - { - guard_set(av->guard_stored, oldp, bytes, nb); - VALGRIND_FREELIKE_BLOCK(oldmem, 0); - VALGRIND_MALLOCLIKE_BLOCK(oldmem, bytes, 0, 0); - return oldmem; - } - - cp = (char*)mremap((char*)chunk(oldp) - offset, oldsize + offset, newsize, 1); - - if (cp != (char*)MORECORE_FAILURE) { - - hashtable_remove_mmapped(chunk(oldp)); - - oldp->chunk = (mchunkptr)(cp + offset); - set_head(oldp, (newsize - offset)|IS_MMAPPED|INUSE); - - hashtable_add(oldp); - - assert(aligned_OK(chunk(oldp))); /* rw fix: newp -> oldp */ - assert(( ((INTERNAL_SIZE_T) oldp->hash_next) == offset)); - - /* update statistics */ - sum = av->mmapped_mem += newsize - oldsize; - if (sum > (CHUNK_SIZE_T)(av->max_mmapped_mem)) - av->max_mmapped_mem = sum; - sum += av->sbrked_mem; - if (sum > (CHUNK_SIZE_T)(av->max_total_mem)) - av->max_total_mem = sum; - - guard_set(av->guard_stored, oldp, bytes, nb); - VALGRIND_FREELIKE_BLOCK(oldmem, 0); - VALGRIND_MALLOCLIKE_BLOCK(chunk(oldp), bytes, 0, 0); - return chunk(oldp); - } -#endif /* have MREMAP */ - - /* Note the extra SIZE_SZ overhead. */ - if ((CHUNK_SIZE_T)(oldsize) >= (CHUNK_SIZE_T)(nb + SIZE_SZ)) - newmem = oldmem; /* do nothing */ - else { - /* Must alloc, copy, free. */ - newmem = mALLOc(nb - MALLOC_ALIGN_MASK); - if (newmem != 0) { - MALLOC_COPY(newmem, oldmem, oldsize); - fREe(oldmem); - } - } - VALGRIND_MALLOCLIKE_BLOCK(newmem, bytes, 0, 0); - guard_set(av->guard_stored, mem2chunk(newmem), bytes, nb); - return newmem; - } -} - -/* - ---------------------------posix_memalign ---------------------------- -*/ - -#if __STD_C -DL_STATIC int posix_mEMALIGn(Void_t** memptr, size_t alignment, size_t bytes) -#else -DL_STATIC int posix_mEMALIGn(memptr, alignment, bytes) Void_t** memptr; size_t alignment; size_t bytes; -#endif -{ - mstate av; - - if (alignment % sizeof(void *) != 0) - return EINVAL; - if ((alignment & (alignment - 1)) != 0) - return EINVAL; - - av = get_malloc_state(); - if (!av || av->max_fast == 0) malloc_consolidate(av); - *memptr = mEMALIGn(alignment, bytes); - - return (*memptr != NULL ? 0 : ENOMEM); -} - -/* - ------------------------------ memalign ------------------------------ -*/ - -#if __STD_C -DL_STATIC Void_t* mEMALIGn(size_t alignment, size_t bytes) -#else -DL_STATIC Void_t* mEMALIGn(alignment, bytes) size_t alignment; size_t bytes; -#endif -{ - INTERNAL_SIZE_T nb; /* padded request size */ - char* m; /* memory returned by malloc call */ - chunkinfoptr p; /* corresponding chunk */ - char* brk; /* alignment point within p */ - chunkinfoptr newp; /* chunk to return */ - INTERNAL_SIZE_T newsize; /* its size */ - INTERNAL_SIZE_T leadsize; /* leading space before alignment point */ - chunkinfoptr remainder; /* spare room at end to split off */ - CHUNK_SIZE_T remainder_size; /* its size */ - INTERNAL_SIZE_T size; -#if PARANOIA > 2 - mstate av; -#endif - - /* If need less alignment than we give anyway, just relay to malloc */ - - if (UNLIKELY(alignment <= MALLOC_ALIGNMENT)) return mALLOc(bytes); - - /* Otherwise, ensure that it is at least a minimum chunk size */ - - if (alignment < MINSIZE) alignment = MINSIZE; - - /* Make sure alignment is power of 2 (in case MINSIZE is not). */ - if (UNLIKELY((alignment & (alignment - 1)) != 0)) { - size_t a = MALLOC_ALIGNMENT * 2; - while ((CHUNK_SIZE_T)a < (CHUNK_SIZE_T)alignment) a <<= 1; - alignment = a; - } - - checked_request2size(bytes, nb); - - /* - Strategy: find a spot within that chunk that meets the alignment - request, and then possibly free the leading and trailing space. - */ - - - /* Call malloc with worst case padding to hit alignment. */ - - m = (char*)(mALLOc(nb + alignment + MINSIZE)); - - if (m == 0) return 0; /* propagate failure */ - -#if PARANOIA > 2 - av = get_malloc_state(); -#endif - - p = hashtable_lookup((mchunkptr) m); - - if ((((PTR_UINT)(m)) % alignment) != 0) { /* misaligned */ - - /* - Find an aligned spot inside chunk. Since we need to give back - leading space in a chunk of at least MINSIZE, if the first - calculation places us at a spot with less than MINSIZE leader, - we can move to the next aligned spot -- we've allocated enough - total room so that this is always possible. - */ - - brk = (char*) ((PTR_UINT)(((PTR_UINT)(m + alignment - 1)) & - -((signed long) alignment))); - if ((CHUNK_SIZE_T)(brk - (char*)(chunk(p))) < MINSIZE) - brk += alignment; - - newp = cireg_getfree(); - newp->chunk = (mchunkptr)brk; - leadsize = brk - (char*)(chunk(p)); - newsize = chunksize(p) - leadsize; - - /* For mmapped chunks, just adjust offset */ - if (UNLIKELY(chunk_is_mmapped(p))) { - newp->hash_next = (chunkinfoptr) (((INTERNAL_SIZE_T) p->hash_next) + leadsize); - set_head(newp, newsize|IS_MMAPPED|INUSE); - hashtable_remove_mmapped(chunk(p)); - freecilst_add(p); - hashtable_add(newp); - guard_set(av->guard_stored, newp, bytes, nb); - return chunk(newp); - } - - /* Otherwise, give back leader, use the rest */ - set_head(newp, newsize | PREV_INUSE | INUSE); - set_head_size(p, leadsize); - set_all_inuse(newp); - hashtable_add(newp); /* 20.05.2008 rw */ - guard_set(av->guard_stored, p, 0, leadsize); - fREe(chunk(p)); - p = newp; - - assert (newsize >= nb && - (((PTR_UINT)(chunk(p))) % alignment) == 0); - } - - /* Also give back spare room at the end */ - if (!chunk_is_mmapped(p)) { - size = chunksize(p); - if ((CHUNK_SIZE_T)(size) > (CHUNK_SIZE_T)(nb + MINSIZE)) { - remainder = cireg_getfree(); - remainder_size = size - nb; - remainder->chunk = chunk_at_offset(chunk(p), nb); - set_head(remainder, remainder_size | PREV_INUSE | INUSE); - set_head_size(p, nb); - hashtable_add(remainder); /* 20.05.2008 rw */ - guard_set(av->guard_stored, remainder, 0, remainder_size); - fREe(chunk(remainder)); - } - } - - check_inuse_chunk(p); - guard_set(av->guard_stored, p, bytes, nb); - return chunk(p); -} - -/* - ------------------------------ calloc ------------------------------ -*/ - -#if __STD_C -DL_STATIC Void_t* cALLOc(size_t n_elements, size_t elem_size) -#else -DL_STATIC Void_t* cALLOc(n_elements, elem_size) size_t n_elements; size_t elem_size; -#endif -{ - chunkinfoptr p; - CHUNK_SIZE_T clearsize; - CHUNK_SIZE_T nclears; - INTERNAL_SIZE_T* d; - Void_t* mem; - - - mem = mALLOc(n_elements * elem_size); - - if (mem != 0) { - p = hashtable_lookup(mem); - - if (!chunk_is_mmapped(p)) - { - /* - Unroll clear of <= 40 bytes (80 if 8byte sizes) - We know that contents have an even number of - INTERNAL_SIZE_T-sized words; minimally 4 (2 on amd64). - */ - - d = (INTERNAL_SIZE_T*)mem; - clearsize = chunksize(p); - nclears = clearsize / sizeof(INTERNAL_SIZE_T); - assert(nclears >= 2); - - if (nclears > 10) { - MALLOC_ZERO(d, clearsize); - } - - else { - *(d+0) = 0; - *(d+1) = 0; - if (nclears > 2) { - *(d+2) = 0; - *(d+3) = 0; - if (nclears > 4) { - *(d+4) = 0; - *(d+5) = 0; - if (nclears > 6) { - *(d+6) = 0; - *(d+7) = 0; - if (nclears > 8) { - *(d+8) = 0; - *(d+9) = 0; - } - } - } - } - } - } -#if ! MMAP_CLEARS - else - { - d = (INTERNAL_SIZE_T*)mem; - clearsize = chunksize(p); - MALLOC_ZERO(d, clearsize); - } -#endif - /* Set guard again, since we just cleared it - */ - guard_set(get_malloc_state()->guard_stored, p, (n_elements * elem_size), p->size); - } - - return mem; -} - -/* - ------------------------------ valloc ------------------------------ -*/ - -#if __STD_C -DL_STATIC Void_t* vALLOc(size_t bytes) -#else -DL_STATIC Void_t* vALLOc(bytes) size_t bytes; -#endif -{ - /* Ensure initialization */ - mstate av = get_malloc_state(); - if (!av || av->max_fast == 0) { - malloc_consolidate(av); - av = get_malloc_state(); - } - return mEMALIGn(av->pagesize, bytes); -} - -/* - ------------------------------ pvalloc ------------------------------ -*/ - - -#if __STD_C -DL_STATIC Void_t* pVALLOc(size_t bytes) -#else -DL_STATIC Void_t* pVALLOc(bytes) size_t bytes; -#endif -{ - mstate av = get_malloc_state(); - size_t pagesz; - - /* Ensure initialization */ - if (!av || av->max_fast == 0) { - malloc_consolidate(av); - av = get_malloc_state(); - } - pagesz = av->pagesize; - return mEMALIGn(pagesz, (bytes + pagesz - 1) & ~(pagesz - 1)); -} - - -/* - ------------------------------ malloc_trim ------------------------------ -*/ - -#if __STD_C -DL_STATIC int mTRIm(size_t pad) -#else -DL_STATIC int mTRIm(pad) size_t pad; -#endif -{ - mstate av = get_malloc_state(); - /* Ensure initialization/consolidation */ - malloc_consolidate(av); - av = get_malloc_state(); -#ifndef MORECORE_CANNOT_TRIM - if (morecore32bit(av)) - return sYSTRIm(pad, av); - else - return 0; -#else - return 0; -#endif -} - - - -/* - ------------------------- malloc_usable_size ------------------------- -*/ - -#if __STD_C -DL_STATIC size_t mUSABLe(Void_t* mem) -#else -DL_STATIC size_t mUSABLe(mem) Void_t* mem; -#endif -{ - chunkinfoptr p; - if (mem != 0) { - p = hashtable_lookup(mem); - if (p && inuse(p)) return chunksize(p); - } - return 0; -} - -/* - ------------------------------ mallinfo ------------------------------ -*/ - -DL_STATIC struct mallinfo2 mALLINFo2() -{ - mstate av = get_malloc_state(); - static struct mallinfo2 mi; - unsigned int i; - mbinptr b; - chunkinfoptr p; - INTERNAL_SIZE_T avail; - INTERNAL_SIZE_T fastavail; - int nblocks; - int nfastblocks; - - /* Ensure initialization */ - if (!av || av->top == 0) { - malloc_consolidate(av); - av = get_malloc_state(); - } - check_malloc_state(); - - if (!av || av->top == 0) { - return mi; - } - - /* Account for top */ - avail = chunksize(av->top); - nblocks = 1; /* top always exists */ - - /* traverse fastbins */ - nfastblocks = 0; - fastavail = 0; - - for (i = 0; i < NFASTBINS; ++i) { - for (p = av->fastbins[i]; p != 0; p = p->fd) { - ++nfastblocks; - fastavail += chunksize(p); - } - } - - avail += fastavail; - - /* traverse regular bins */ - for (i = 1; i < NBINS; ++i) { - b = bin_at(av, i); - for (p = last(b); p != b; p = p->bk) { - ++nblocks; - avail += chunksize(p); - } - } - - mi.smblks = nfastblocks; - mi.ordblks = nblocks; - mi.fordblks = avail; - mi.uordblks = av->sbrked_mem - avail; - mi.arena = av->sbrked_mem; - mi.hblks = av->n_mmaps; - mi.hblkhd = av->mmapped_mem; - mi.fsmblks = fastavail; - mi.keepcost = chunksize(av->top); - mi.usmblks = av->max_total_mem; - return mi; -} - -/* - ------------------------------ malloc_stats ------------------------------ -*/ - -DL_STATIC void mSTATs() -{ - struct mallinfo2 mi = mALLINFo2(); - - fprintf(stderr, "hashtable = %10lu MB\n", - (CHUNK_SIZE_T)(HASHTABLESIZE / (1024*1024))); - fprintf(stderr, "max system bytes = %10lu\n", - (CHUNK_SIZE_T)(mi.usmblks)); - fprintf(stderr, "system bytes = %10lu (%10lu sbrked, %10lu mmaped)\n", - (CHUNK_SIZE_T)(mi.arena + mi.hblkhd), - (CHUNK_SIZE_T)(mi.arena), - (CHUNK_SIZE_T)(mi.hblkhd)); - fprintf(stderr, "in use bytes = %10lu\n", - (CHUNK_SIZE_T)(mi.uordblks + mi.hblkhd)); -} - - -/* - ------------------------------ mallopt ------------------------------ -*/ - -#if __STD_C -DL_STATIC int mALLOPt(int param_number, int value) -#else -DL_STATIC int mALLOPt(param_number, value) int param_number; int value; -#endif -{ - mstate av = get_malloc_state(); - /* Ensure initialization/consolidation */ - malloc_consolidate(av); - av = get_malloc_state(); - - switch(param_number) { - case M_MXFAST: - if (value >= 0 && value <= MAX_FAST_SIZE) { - set_max_fast(av, value); - return 1; - } - else - return 0; - - case M_TRIM_THRESHOLD: - av->trim_threshold = value; - return 1; - - case M_TOP_PAD: - av->top_pad = value; - return 1; - - case M_MMAP_THRESHOLD: - av->mmap_threshold = value; - return 1; - - case M_MMAP_MAX: - if (value != 0) - return 0; - av->n_mmaps_max = value; - return 1; - - default: - return 0; - } -} - - -/* $OpenBSD: arc4random.c,v 1.19 2008/06/04 00:50:23 djm Exp $ */ - -/* - * Copyright (c) 1996, David Mazieres - * Copyright (c) 2008, Damien Miller - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * Arc4 random number generator for OpenBSD. - * - * This code is derived from section 17.1 of Applied Cryptography, - * second edition, which describes a stream cipher allegedly - * compatible with RSA Labs "RC4" cipher (the actual description of - * which is a trade secret). The same algorithm is used as a stream - * cipher called "arcfour" in Tatu Ylonen's ssh package. - * - * Here the stream cipher has been modified always to include the time - * when initializing the state. That makes it impossible to - * regenerate the same random sequence twice, so this can't be used - * for encryption, but will generate good random numbers. - * - * RC4 is a registered trademark of RSA Laboratories. - */ - -/* Moved u_int8_t -> unsigned char (portability) - * Eliminated unneeded functions, added read from /dev/urandom taken from: - $MirOS: contrib/code/Snippets/arc4random.c,v 1.3 2008-03-04 22:53:14 tg Exp $ - * Modified by Robert Connolly from OpenBSD lib/libc/crypt/arc4random.c v1.11. - * This is arc4random(3) using urandom. - */ - -#include -#include -#include -#include -#include - -struct arc4_stream { - unsigned char i; - unsigned char j; - unsigned char s[256]; -}; - -static int rs_initialized; -static struct arc4_stream rs; -static pid_t arc4_stir_pid; -static int arc4_count; - -static unsigned char arc4_getbyte(void); - -static void -arc4_init(void) -{ - int n; - - for (n = 0; n < 256; n++) - rs.s[n] = n; - rs.i = 0; - rs.j = 0; -} - -static inline void -arc4_addrandom(unsigned char *dat, int datlen) -{ - int n; - unsigned char si; - - rs.i--; - for (n = 0; n < 256; n++) { - rs.i = (rs.i + 1); - si = rs.s[rs.i]; - rs.j = (rs.j + si + dat[n % datlen]); - rs.s[rs.i] = rs.s[rs.j]; - rs.s[rs.j] = si; - } - rs.j = rs.i; -} - -#ifdef HAVE_SCHED_H -#include -#endif - -static void -arc4_stir(void) -{ - int i; - struct { - struct timeval tv1; - struct timeval tv2; - unsigned char rnd[(128 - 2*sizeof(struct timeval)) / sizeof(unsigned char)]; - } rdat; -#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) - ssize_t sz = 0; - int fd; -#endif - - gettimeofday(&rdat.tv1, NULL); - - - if (!rs_initialized) { - arc4_init(); - rs_initialized = 1; - } - -#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) - -#ifdef HAVE_SCHED_YIELD - /* Yield the processor to introduce some random delay. */ - (void) sched_yield(); -#endif - - /* - * Pthread problem in multithreaded code on *BSD. - */ - fd = open("/dev/urandom", O_RDONLY); - if (fd != -1) { - sz = (size_t)read(fd, rdat.rnd, sizeof (rdat.rnd)); - /* - * gcc complains if we ignore the return value of read(), and - * the llvm/clang analyzer complains if we don't use it... - */ - if (sz > (-256)) /* always true */ - close(fd); - } - /* - if (sz > sizeof (rdat.rnd)) - sz = 0; - */ - #endif - - arc4_stir_pid = getpid(); - gettimeofday(&rdat.tv2, NULL); - - arc4_addrandom((void *)&rdat, sizeof(rdat)); - - /* - * Discard early keystream, as per recommendations in: - * http://www.wisdom.weizmann.ac.il/~itsik/RC4/Papers/Rc4_ksa.ps - */ - for (i = 0; i < 256; i++) - (void)arc4_getbyte(); - arc4_count = 1600000; -} - -static unsigned char -arc4_getbyte(void) -{ - unsigned char si, sj; - - rs.i = (rs.i + 1); - si = rs.s[rs.i]; - rs.j = (rs.j + si); - sj = rs.s[rs.j]; - rs.s[rs.i] = sj; - rs.s[rs.j] = si; - return (rs.s[(si + sj) & 0xff]); -} - - - /* Changed to return char* */ -static char * -dnmalloc_arc4random(void) -{ - static char val[4]; - - /* We only call this once, hence no need for locking. */ - - /* _ARC4_LOCK(); */ - arc4_count -= 4; - if (arc4_count <= 0 || !rs_initialized || arc4_stir_pid != getpid()) - arc4_stir(); - - val[0] = (char) arc4_getbyte(); - val[1] = (char) arc4_getbyte(); - val[2] = (char) arc4_getbyte(); - val[3] = (char) arc4_getbyte(); - - arc4_stir(); - /* _ARC4_UNLOCK(); */ - return val; -} - -#else -int dnmalloc_pthread_init() { return 0; } -#endif /* ! USE_SYSTEM_MALLOC */ Index: trunk/src/exepack.c =================================================================== --- trunk/src/exepack.c (revision 591) +++ trunk/src/exepack.c (revision 1) @@ -84,5 +84,4 @@ { int file; - long result; unsigned long i = argc; /* dummy use of argc to fix compiler warning */ @@ -130,5 +129,4 @@ out_len = (unsigned long) programlen_compressed_0; len = (unsigned long) programlen_0; - in_len = len; outbuf = program_0; @@ -262,15 +260,11 @@ } - result = (long) write(file, inbuf, in_len); - if (result < 0 || in_len != (lzo_uint) result) + write(file, inbuf, in_len); + +#if defined(__linux__) + + if ( 0 != fstat(file, &sbuf)) { return (5); - } - -#if defined(__linux__) - - if ( 0 != fstat(file, &sbuf)) - { - return (6); } @@ -282,5 +276,5 @@ if ( 0 != fstat(file, &fbuf)) { - return (7); + return (6); } @@ -294,5 +288,5 @@ { close ( file ); - return ( 8 ); + return ( 6 ); } @@ -318,5 +312,5 @@ fcntl (file, F_SETFD, FD_CLOEXEC); execve (pname, argv, environ); - return (9); + return (8); } #endif @@ -331,5 +325,5 @@ execve (fname, argv, environ); unlink (fname); - return (10); + return (9); } else if (i == 0) Index: trunk/src/exepack_fill.c =================================================================== --- trunk/src/exepack_fill.c (revision 591) +++ trunk/src/exepack_fill.c (revision 1) @@ -169,5 +169,5 @@ { FILE * fd; - unsigned long clen; + long clen; char * data; struct stat sbuf; @@ -222,6 +222,5 @@ return (-1); - if (clen != fread (data, 1, clen, fd)) - return (-1); + fread (data, 1, clen, fd); fclose (fd); @@ -338,5 +337,5 @@ return (8); } - status = replaceData (data, clen, "CONTAINER", (char *) outbuf, out_len); + status = replaceData (data, clen, "CONTAINER", outbuf, out_len); if (status < 0) { Index: trunk/src/kern_head.c =================================================================== --- trunk/src/kern_head.c (revision 1) +++ trunk/src/kern_head.c (revision 1) @@ -0,0 +1,907 @@ +/* + * need to #define SH_USE_KERN + * + */ +#define SH_SYSCALL_CODE + +#include "config.h" + +#ifdef HOST_IS_I86LINUX +#define SH_IDT_TABLE +#endif + +#include +#include + +#if defined(SH_USE_KERN) + +#undef _ +#define _(string) string +#undef N_ +#define N_(string) string + +void usage(int flag) +{ + printf("\n"); + printf("Usage: kern_head [-v | --verbose]\n"); + printf(" kern_head [-h | --help]\n"); + printf("\n"); + /* + * printf(" You need superuser privileges to use this program,\n"); + * printf(" because only the superuser can read from /dev/kmem.\n"); + * printf("\n"); + */ + exit(flag); +} + +#if defined(HOST_IS_LINUX) + + +#include +#include +#include +#include +#include +#include +#include +#include + +/* number of system calls */ +#define SH_MAXCALLS 512 + +#include "kern_head.h" + +static int verbose = 0; + +typedef struct _smap_entry { +#ifdef SH_SYSCALL_CODE + unsigned int code[2]; /* 8 bytes */ +#endif + unsigned long addr; + char name[64]; +} smap_entry; + +union { + unsigned long addr_sys_call_table; + unsigned char str_sys_call_table[sizeof(unsigned long)]; +} sh_sys_call; + +#define SYS_CODE_SIZE 1024 + +static unsigned long addr_system_call; +static unsigned char system_call_code[SYS_CODE_SIZE]; + +int read_kcode (unsigned long addr, unsigned char * buf, int len) +{ + int fd; + + if (addr == 0UL) + { + perror("read_kcode: invalid input"); + return -1; + } + + fd = open ("/dev/kmem", O_RDONLY); + if (fd < 0) + { + perror("read_kcode: open"); + return -1; + } + if (lseek(fd, addr, SEEK_SET) == (off_t) (-1)) + { + perror("read_kcode: lseek"); + return -1; + } + if (read(fd, buf, len) < 0) + { + perror("read_kcode: read"); + return -1; + } + return 0; +} + +int get_dispatch (int * qq) +{ + int i; + + if (addr_system_call == 0L || sh_sys_call.addr_sys_call_table == 0L) + { + fprintf(stderr, "get_dispatch: invalid data\n"); + return -1; + } + + if (0 != read_kcode (addr_system_call, system_call_code, SYS_CODE_SIZE)) + { + fprintf(stderr, "get_dispatch: could not read system_call code\n"); + return -1; + } + + for (i = 0; i < (SYS_CODE_SIZE - 4); ++i) + { + if (system_call_code[i] == sh_sys_call.str_sys_call_table[0] && + system_call_code[i+1] == sh_sys_call.str_sys_call_table[1] && + system_call_code[i+2] == sh_sys_call.str_sys_call_table[2] && + system_call_code[i+3] == sh_sys_call.str_sys_call_table[3]) + { + /* + fprintf(stderr, "INFO: get_dispatch: found sys_call_table in "\ + "system_call code at %d\n", i); + */ + *qq = i; + return 0; + } + } + fprintf(stderr, + "get_dispatch: did not find sys_call_table in system_call code\n"); + fprintf(stderr, + "** This indicates that either your System.map does not match\n"); + fprintf(stderr, + "** the currently running kernel, or that your System.map does\n"); + fprintf(stderr, + "** not provide the required information, and thus use of\n"); + fprintf(stderr, + "** the --with-kcheck option is not possible\n"); + return -1; +} + +unsigned long get_symbol_from_systemmap (char * systemmap, + char * symbol, char flag) +{ + FILE * fp; + char buf[512], addr[16], * p; + unsigned long retval = 0; + + fp = fopen (systemmap, "r"); + + if (!fp) + { + fprintf(stderr, "error opening <%s>\n", systemmap); + perror("get_symbol_from_systemmap: fopen"); + return -1; + } + while (fgets(buf, 512, fp) != NULL) + { + if (buf[9] != flag) + continue; + + p = strchr(buf, '\n'); + if (p != NULL) + *p = '\0'; + + if (0 != strcmp(&buf[11], symbol)) + continue; + + addr[0] = '0'; addr[1] = 'x'; addr[2] = '\0'; + strncat(&addr[2], buf, 8); + + retval = strtoul(addr, NULL, 0); + if (retval == ULONG_MAX) + { + perror("get_symbol_from_systemmap"); + return -1; + } + } + fclose(fp); + return retval; +} + + +/* returns the number N of entries in syscall table + * (0 .. N-1) with valid syscalls + */ +int fill_smap(smap_entry * sh_smap, int num) +{ + FILE * fp; + char buf[512], addr[16], name[128]; + int i, j, count = 0, maxcall = 0; + + fp = fopen (SYSTEMMAP, "r"); + + if (!fp) + { + perror("fill_smap: fopen"); + fprintf(stderr, "fill_smap: error opening <%s>\n", SYSTEMMAP); + return -1; + } + + /* initialize + */ + sh_sys_call.addr_sys_call_table = 0L; + + while (fgets(buf, 512, fp) != NULL) + { + + if ( ( (buf[9] == 'D') || (buf[9] == 'd') || + (buf[9] == 'R') || (buf[9] == 'r')) && + 0 == strncmp("sys_call_table", &buf[11], 14)) + { + printf("/* found sys_call_table */\n"); + /* --- copy symbol address --- + */ + addr[0] = '0'; addr[1] = 'x'; addr[2] = '\0'; + strncat(&addr[2], buf, 8); + addr[10] = '\0'; + sh_sys_call.addr_sys_call_table = strtoul(addr, NULL, 0); + if (sh_sys_call.addr_sys_call_table == ULONG_MAX) + { + perror("fill_smap"); + return -1; + } + else + { + printf("#define SH_SYS_CALL_TABLE %s\n", addr); + } + } + + if (buf[9] != 'T') + continue; + + if (0 == strncmp("system_call", &buf[11], 11)) + { + printf("/* found system_call */\n"); + /* --- copy symbol address --- + */ + addr[0] = '0'; addr[1] = 'x'; addr[2] = '\0'; + strncat(&addr[2], buf, 8); + addr[10] = '\0'; + addr_system_call = strtoul(addr, NULL, 0); + if (addr_system_call == ULONG_MAX) + { + perror("fill_smap"); + return -1; + } + } + + + if ( (buf[11]!='s' || buf[12]!='y' || buf[13]!='s' || buf[14]!='_') && + (buf[11]!='o' || buf[12]!='l' || buf[13]!='d' || buf[14]!='_')) + continue; + + for (i = 0; i < num; ++i) + { + for (j = 0; j < 128; ++j) + { + if (buf[11+j] == '\n' || buf[11+j] == '\0') + { + name[j] = '\0'; + break; + } + name[j] = buf[11+j]; + } + + + if (0 == strcmp(name, sh_smap[i].name)) + { + + /* --- copy symbol address --- + */ + addr[0] = '0'; addr[1] = 'x'; addr[2] = '\0'; + strncat(&addr[2], buf, 8); + addr[10] = '\0'; + sh_smap[i].addr = strtoul(addr, NULL, 0); + if (sh_smap[i].addr == ULONG_MAX) + { + perror("fill_smap"); + return -1; + } + ++count; + if (i > maxcall) maxcall = i; + /* printf("maxcall = %d\n", maxcall); */ + /* break; */ + } + } + } + fclose(fp); + if ((count > 0) && (maxcall > 0)) + return maxcall+1; + else + return count; +} + + +struct inode_operations { + int (*create) (int *,int *,int); + int * (*lookup) (int *,int *); + int (*link) (int *,int *,int *); + int (*unlink) (int *,int *); + int (*symlink) (int *,int *,const char *); + int (*mkdir) (int *,int *,int); + int (*rmdir) (int *,int *); + int (*mknod) (int *,int *,int,int); + int (*rename) (int *, int *, + int *, int *); + int (*readlink) (int *, char *,int); + int (*follow_link) (int *, int *); + void (*truncate) (int *); + int (*permission) (int *, int); + int (*revalidate) (int *); + /* + int (*setattr) (int *, int *); + int (*getattr) (int *, int *); + int (*setxattr) (int *, const char *, void *, size_t, int); + ssize_t (*getxattr) (int *, const char *, void *, size_t); + ssize_t (*listxattr) (int *, char *, size_t); + int (*removexattr) (int *, const char *); + */ +}; + +struct file_operations { + int (*create) (int *,int *,int); +}; + +struct proc_dir_entry { + unsigned short low_ino; + unsigned short namelen; + const char * name; + mode_t mode; + nlink_t nlink; + uid_t uid; + gid_t gid; + unsigned long size; + struct inode_operations * proc_iops; + struct file_operations * proc_fops; + /* + get_info_t *get_info; + struct module *owner; + struct proc_dir_entry *next, *parent, *subdir; + void *data; + read_proc_t *read_proc; + write_proc_t *write_proc; + atomic_t count; + int deleted; + */ +}; + + + +int main(int argc, char * argv[]) +{ + int i, count, maxcall, qq; + int which = 4; + smap_entry sh_smap[SH_MAXCALLS]; + struct utsname utbuf; + char *p = NULL; + + unsigned long proc_root; + unsigned long proc_root_iops; + unsigned long proc_root_lookup; + + unsigned long addr_ni_syscall = 0; + + if (argc > 1) + { + if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0) + usage(EXIT_SUCCESS); + else if (strcmp(argv[1], "-v") == 0 || + strcmp(argv[1], "--verbose") == 0) + verbose = 1; + } + + if (0 != uname(&utbuf)) + { + perror("kern_head: uname"); + exit (EXIT_FAILURE); + } + + if (strncmp(utbuf.release, SH_KERNEL_VERSION, 3) != 0) + { + fprintf(stderr, "kern_head: current kernel version %s does not match\n", + utbuf.release); + fprintf(stderr, "kern_head: %s from config.h\n", SH_KERNEL_VERSION); + fprintf(stderr, "kern_head: continuing with %s\n", SH_KERNEL_VERSION); + + p = SH_KERNEL_VERSION; + } else { + p = utbuf.release; + } + + if (strncmp(p, "2.2", 3) == 0) + which = 2; + else if (strncmp(p, "2.4", 3) == 0) + which = 4; + else if (strncmp(p, "2.6", 3) == 0) + which = 6; + else + { + fprintf(stderr, "kern_head: kernel %s not supported\n", p); + exit (EXIT_FAILURE); + } + + + if (utbuf.machine[0] != 'i' || utbuf.machine[2] != '8' || + utbuf.machine[3] != '6') + { + fprintf(stderr, "kern_head: machine %s not supported\n", utbuf.machine); + exit (EXIT_FAILURE); + } + + if (0 != getuid()) + { + fprintf(stderr, "\n"); + + fprintf(stderr, "NOTE: kern_head: must run as 'root' (need to read from /dev/kmem)\n"); + fprintf(stderr, " If you get this message, then proceed as follows:\n"); + fprintf(stderr, " $ su\n"); + fprintf(stderr, " $ ./kern_head > sh_ks.h\n"); + fprintf(stderr, " $ exit\n"); + fprintf(stderr, " $ make\n\n"); + exit (EXIT_FAILURE); + } + + printf("#ifndef SH_KERN_CALLS_H\n"); + printf("#define SH_KERN_CALLS_H\n\n"); + + printf("\n/* Kernel %s, machine %s -- use table %s */\n\n", + p, utbuf.machine, + (which == 2) ? "callz_2p2" : "callz_2p4"); + + + /* initiate the system call table + */ + for (i = 0; i < SH_MAXCALLS; ++i) + { + if (which == 2) + { + if (callz_2p2[i] == NULL) + break; + strcpy(sh_smap[i].name, callz_2p2[i]); + } + else + { + if (callz_2p4[i] == NULL) + break; + strcpy(sh_smap[i].name, callz_2p4[i]); + } + sh_smap[i].addr = 0UL; + } + + if (which == 6) /* fix syscall map for 2.6 */ + { + strcpy(sh_smap[0].name, "sys_restart_syscall"); + strcpy(sh_smap[180].name, "sys_pread64"); + strcpy(sh_smap[181].name, "sys_pwrite64"); + } + count = i; + + /* get the actual number of the highest syscalls and use no more. + * get sys_call_table and system_call + */ + maxcall = fill_smap(sh_smap, count); + if ( maxcall < 0) + { + printf("#endif\n"); + fprintf(stderr, "kern_head: fill_smap failed\n"); + exit (EXIT_FAILURE); + } + if (addr_system_call == 0L) + { + printf("#endif\n"); + fprintf(stderr, + "kern_head: address of system_call not found in System.map\n"); + fprintf(stderr, + "** This indicates that your System.map does not provide\n"); + fprintf(stderr, + "** the required information, and thus use of the\n"); + fprintf(stderr, + "** --with-kcheck option is not possible\n"); + exit (EXIT_FAILURE); + } + + for (i = 0; i < maxcall; ++i) + { + if (0 == strcmp(sh_smap[i].name, "sys_ni_syscall")) + { + addr_ni_syscall = sh_smap[i].addr; + break; + } + } + if (which < 6) + { + maxcall = (maxcall > 256) ? 256 : maxcall; + } + + for (i = 0; i < maxcall; ++i) + { + if (sh_smap[i].addr == 0UL) + { + if (verbose > 0) + fprintf(stderr, "** unknown syscall **: [%s]\n", sh_smap[i].name); + strcpy(sh_smap[i].name, "sys_ni_syscall"); + sh_smap[i].addr = addr_ni_syscall; + } + } + + + /* get the location of the syscall table address within system_call + */ + if ( get_dispatch (&qq) < 0) + { + printf("#endif\n"); + fprintf(stderr, "kern_head: get_dispatch failed\n"); + exit (EXIT_FAILURE); + } + + if (qq <= 252) + printf("#define SYS_CALL_LOC %d\n", qq); + else + { + printf("#endif\n"); + fprintf(stderr, "kern_head: SYS_CALL_LOC (%d) too large\n", qq); + exit(EXIT_FAILURE); + } + printf("#define SH_SYS_CALL_ADDR %#lx\n\n", addr_system_call); + + printf("static unsigned char system_call_code[256] = { 0 };\n"); + + printf("#define SH_MAXCALLS %d\n\n", maxcall); + +#ifdef SH_IDT_TABLE + printf("static unsigned char idt_table[2048] = { 0 };\n"); +#endif + + printf("typedef struct _sh_syscall_t {\n"); +#ifdef SH_SYSCALL_CODE + printf(" unsigned int code[2]; /* 8 bytes */\n"); +#endif + printf(" unsigned long addr;\n"); + printf(" char * name;\n"); + printf("} sh_syscall_t;\n\n"); + + printf("static sh_syscall_t sh_syscalls[] = {\n"); + + for (i = 0; i < maxcall; ++i) + { +#ifdef SH_SYSCALL_CODE + printf(" /* %03d */ { { 0, 0 }, 0, N_(%c%s%c) },\n", + i, '"', sh_smap[i].name, '"'); +#else + printf(" /* %03d */ { 0, N_(%c%s%c) },\n", + i, '"', sh_smap[i].name, '"'); +#endif + } +#ifdef SH_SYSCALL_CODE + printf(" /* eof */ { { 0x00000000, 0x00000000 }, 0x00000000, NULL }\n"); +#else + printf(" /* eof */ { 0x00000000, NULL }\n"); +#endif + printf("};\n\n"); + + + /* get proc addresses + */ + proc_root = get_symbol_from_systemmap (SYSTEMMAP, + "proc_root", 'D'); + if (proc_root == 0) + { + proc_root = get_symbol_from_systemmap (SYSTEMMAP, + "proc_root", 'd'); + } + if (proc_root == 0) + { + proc_root = get_symbol_from_systemmap (SYSTEMMAP, + "proc_root", 'R'); + } + if (proc_root != 0) { + printf("#define PROC_ROOT_LOC %#lx\n\n", proc_root); + } + + proc_root_lookup = get_symbol_from_systemmap (SYSTEMMAP, + "proc_root_lookup", 't'); + if (proc_root_lookup == 0) + { + proc_root_lookup = get_symbol_from_systemmap (SYSTEMMAP, + "proc_root_lookup", 'T'); + } + if (proc_root_lookup != 0) { + printf("#define PROC_ROOT_LOOKUP_LOC %#lx\n\n", proc_root_lookup); + } + + proc_root_iops = get_symbol_from_systemmap (SYSTEMMAP, + "proc_root_inode_operations", + 'd'); + if (proc_root_iops == 0) + { + proc_root_iops = get_symbol_from_systemmap (SYSTEMMAP, + "proc_root_inode_operations", + 'D'); + } + if (proc_root_iops == 0) + { + proc_root_iops = get_symbol_from_systemmap (SYSTEMMAP, + "proc_root_inode_operations", + 'R'); + } + if (proc_root_iops != 0) { + printf("#define PROC_ROOT_IOPS_LOC %#lx\n\n", proc_root_iops); + } + + printf("#endif\n"); + + exit (EXIT_SUCCESS); +} + +/* if defined(HOST_IS_LINUX) */ +#endif + +/************************************************************ + * + * + * FreeBSD Implementation + * + ************************************************************/ + +#if defined(HOST_IS_FREEBSD) || defined(__OpenBSD__) + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef __FreeBSD__ +#include +#endif + +#include + +#ifndef SYS_MAXSYSCALL +#define SYS_MAXSYSCALL 512 +#endif + +/* number of system calls */ +#define SH_MAXCALLS 512 +#include "kern_head.h" +static int verbose = 0; + +#ifdef __OpenBSD__ +struct proc; +struct sysent { + short sy_narg; + short sy_argsize; + int (*sy_call)(struct proc *, void *, register_t *); +}; +#endif + +typedef struct _smap_entry { + unsigned int code[2]; /* 8 bytes */ + unsigned long addr; + char name[64]; +} smap_entry; + +union { + unsigned long addr_sys_call_table; + unsigned char str_sys_call_table[sizeof(unsigned long)]; +} sh_sys_call; + +struct nlist sys_list[SYS_MAXSYSCALL+1]; + +struct nlist list[2]; + + +int main(int argc, char * argv[]) +{ + int i, count, which; + smap_entry sh_smap[SYS_MAXSYSCALL]; + struct utsname utbuf; + char errbuf[_POSIX2_LINE_MAX]; + + struct sysent sy; + unsigned long offset = 0L; + kvm_t *kd; + + list[0].n_name = "_sysent"; + list[1].n_name = NULL; + + if (argc > 1) + { + if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0) + usage(EXIT_SUCCESS); + else if (strcmp(argv[1], "-v") == 0 || + strcmp(argv[1], "--verbose") == 0) + verbose = 1; + } + + if (0 != uname(&utbuf)) + { + perror("kern_head: uname"); + exit (EXIT_FAILURE); + } + + if (utbuf.release[0] == '4') + which = 4; + else if (utbuf.release[0] == '5') + which = 5; + else + { + fprintf(stderr, "kern_head: kernel %s not supported\n", utbuf.release); + exit (EXIT_FAILURE); + } + + if (utbuf.machine[0] != 'i' || utbuf.machine[2] != '8' || + utbuf.machine[3] != '6') + { + fprintf(stderr, "kern_head: machine %s not supported\n", utbuf.machine); + exit (EXIT_FAILURE); + } + + if (0 != getuid()) + { + fprintf(stderr, "\n"); + fprintf(stderr, "NOTE: kern_head: must run as 'root' "); + fprintf(stderr, "(need to read from /dev/kmem)\n"); + fprintf(stderr, " If you get this message, then proceed "); + fprintf(stderr, "as follows:\n"); + fprintf(stderr, " $ su\n"); + fprintf(stderr, " $ ./kern_head > sh_ks.h\n"); + fprintf(stderr, " $ exit\n"); + fprintf(stderr, " $ make\n\n"); + exit (EXIT_FAILURE); + } + + kd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, errbuf); + if (!kd) + { + fprintf(stderr, "check_sysent: kvm_openfiles: %s\n", errbuf); + exit(EXIT_FAILURE); + } + + i = kvm_nlist(kd, list); + if (i == -1) + { + fprintf(stderr, "check_sysent: kvm_nlist: %s\n", kvm_geterr(kd)); + exit(EXIT_FAILURE); + } + + if (which == 4) + printf("\n/* Kernel %s, machine %s -- use table %s */\n\n", + utbuf.release, utbuf.machine, "callz_fbsd"); + if (which == 5) + printf("\n/* Kernel %s, machine %s -- use table %s */\n\n", + utbuf.release, utbuf.machine, "callz_fbsd5"); + + i = 0; + if (which == 4) { + while ((callz_fbsd[i] != NULL) && (i < SYS_MAXSYSCALL)) + { + sys_list[i].n_name = callz_fbsd[i]; + /* fprintf(stderr, "sys_list[%d] = %s\n", i, sys_list[i].n_name); */ + ++i; + } + if ((utbuf.release[1] == '.') && (utbuf.release[2] == '1') && + (utbuf.release[3] == '0')) + { + sys_list[336].n_name = callz_fbsd[290]; /* sendfile -> nosys */ + } + } else { + while ((callz_fbsd5[i] != NULL) && (i < SYS_MAXSYSCALL)) + { + sys_list[i].n_name = callz_fbsd5[i]; + /* fprintf(stderr, "sys_list[%d] = %s\n", i, sys_list[i].n_name); */ + ++i; + } + } + count = i; + sys_list[i].n_name = NULL; + + i = kvm_nlist(kd, sys_list); + if (i == -1) + { + fprintf(stderr, "check_sysent: kvm_nlist: %s\n", kvm_geterr(kd)); + /* exit(EXIT_FAILURE); */ + } + else if (i != 0 && verbose != 0) + { + fprintf(stderr, "check_sysent: kvm_nlist: %d out of %d invalid.\n", + i, count); + fprintf(stderr, " Probably callz_fbsd in kern_head.c\n"); + fprintf(stderr, " is not for your kernel version.\n"); + fprintf(stderr, " (No reason to worry, kcheck will "\ + "work anyway)\n\n"); + } + + for (i = 0; i < count /* SYS_MAXSYSCALL */; i++) + { + if (NULL == sys_list[i].n_name) + break; + if (!sys_list[i].n_value && 0 != strcmp(sys_list[i].n_name, "_nosys") + && verbose != 0) + { + fprintf(stderr,"check_sysent: not found: slot %03d [%s]\n", + i, sys_list[i].n_name); + /* exit(EXIT_FAILURE); */ + } + offset = list[0].n_value + (i*sizeof(struct sysent)); + if (kvm_read(kd, offset, &sy, sizeof(struct sysent)) < 0) + { + fprintf(stderr,"check_sysent: kvm_read: %s\n", kvm_geterr(kd)); + exit(EXIT_FAILURE); + } + + if (verbose > 0) + fprintf(stderr, "(kvm_nlist) %#lx %#lx (sysent[%03d]) %03d [%s]\n", + (unsigned long) sys_list[i].n_value, + (unsigned long) sy.sy_call, + i, i, sys_list[i].n_name); + + if((unsigned long)sy.sy_call != sys_list[i].n_value && + sys_list[i].n_value != 0 && + 0 != strcmp(sys_list[i].n_name, "_nosys") && + (unsigned long)sy.sy_call != sys_list[290].n_value) + { + fprintf(stderr, + "WARNING: (kvm_nlist) %#lx != %#lx (sysent[%03d]) %03d [%s]\n", + (unsigned long) sys_list[i].n_value, + (unsigned long) sy.sy_call, + i, i, sys_list[i].n_name); + } + sh_smap[i].addr = (unsigned long) sy.sy_call; + strncpy(sh_smap[i].name, sys_list[i].n_name, 64); + if(kvm_read(kd, (unsigned int) sy.sy_call, &(sh_smap[i].code[0]), + 2 * sizeof(unsigned int)) < 0) + { + fprintf(stderr,"check_sysent: kvm_read: %s\n", kvm_geterr(kd)); + exit(EXIT_FAILURE); + } + } + + if(kvm_close(kd) < 0) + { + fprintf(stderr,"check_sysent: kvm_nlist: %s\n", kvm_geterr(kd)); + exit(EXIT_FAILURE); + } + + printf("#ifndef SH_KERN_CALLS_H\n"); + printf("#define SH_KERN_CALLS_H\n\n"); + + printf("#define SH_MAXCALLS %d\n\n", count); + + printf("typedef struct _sh_syscall_t {\n"); + printf(" unsigned int code[2]; /* 8 bytes */\n"); + printf(" unsigned long addr;\n"); + printf(" char * name;\n"); + printf("} sh_syscall_t;\n\n"); + + printf("static sh_syscall_t sh_syscalls[] = {\n"); + for (i = 0; i < count; ++i) { + printf(" /* %03d */ {{ 0x%-8.8x, 0x%-8.8x }, 0x%-8.8lx, N_(%c%s%c) },\n", + i, sh_smap[i].code[0], sh_smap[i].code[1], + sh_smap[i].addr, '"', sh_smap[i].name, '"'); + } + printf(" /* eof */ { { 0x00000000, 0x00000000 }, 0x00000000, NULL }\n"); + printf("};\n\n"); + printf("#endif\n"); + return 0; +} +/* if defined(HOST_IS_FREEBSD) */ +#endif + +/* #if defined(SH_USE_KERN) */ +#else + +#include +#include + +int main() +{ + printf("#ifndef SH_KERN_CALLS_H\n"); + printf("#define SH_KERN_CALLS_H\n\n"); + + printf("/* Dummy header. */\n\n"); + + printf("typedef struct _sh_syscall_t {\n"); + printf(" unsigned long addr;\n"); + printf(" char * name;\n"); + printf("} sh_syscall_t;\n\n"); + + printf("#endif\n"); + + return (EXIT_SUCCESS); +} + +/* #ifdef SH_USE_KERN */ +#endif Index: trunk/src/make-tests.sh =================================================================== --- trunk/src/make-tests.sh (revision 591) +++ (revision ) @@ -1,75 +1,0 @@ -#!/bin/sh - -# Auto generate single AllTests file for CuTest. -# Searches through all *.c files in the current directory. -# Prints to stdout. -# Author: Asim Jalis -# Date: 01/08/2003 - -# Modified to return non-zero if any test has failed -# Rainer Wichmann, 29. Jan 2006 -# ...and to print to stderr if any test has failed -# Rainer Wichmann, 31. Jan 2006 - -if test $# -eq 0 ; then FILES=*.c ; else FILES=$* ; fi - -echo ' - -/* This is auto-generated code. Edit at your own peril. */ - -#include "config.h" -#include -#include "CuTest.h" -' - -cat $FILES | grep '^void Test' | - sed -e 's/(.*$//' \ - -e 's/$/(CuTest*);/' \ - -e 's/^/extern /' - -echo \ -' - -int RunAllTests(void) -{ - CuString *output = CuStringNew(); - CuSuite* suite = CuSuiteNew(); - -' -cat $FILES | grep '^void Test' | - sed -e 's/^void //' \ - -e 's/(.*$//' \ - -e 's/^/ SUITE_ADD_TEST(suite, /' \ - -e 's/$/);/' - -echo \ -' - CuSuiteRun(suite); - CuSuiteSummary(suite, output); - CuSuiteDetails(suite, output); - if (suite->failCount > 0) - fprintf(stderr, "%s%c", output->buffer, 0x0A); - else - fprintf(stdout, "%s%c", output->buffer, 0x0A); - return suite->failCount; -} - -int main(void) -{ -#if !defined(USE_SYSTEM_MALLOC) - typedef void assert_handler_tp(const char * error, const char *file, int line); - extern assert_handler_tp *dnmalloc_set_handler(assert_handler_tp *new); - extern void safe_fatal (const char * details, const char *f, int l); -#endif -#if !defined(USE_SYSTEM_MALLOC) && defined(USE_MALLOC_LOCK) - extern int dnmalloc_pthread_init(void); - dnmalloc_pthread_init(); -#endif -#if !defined(USE_SYSTEM_MALLOC) - (void) dnmalloc_set_handler(safe_fatal); -#endif - int retval; - retval = RunAllTests(); - return (retval == 0) ? 0 : 1; -} -' Index: trunk/src/minilzo.c =================================================================== --- trunk/src/minilzo.c (revision 591) +++ trunk/src/minilzo.c (revision 1) @@ -82,8 +82,12 @@ #else # include -# if defined(__STDC__) +# if defined(STDC_HEADERS) # include # include +# endif +# if defined(HAVE_STDDEF_H) # include +# endif +# if defined(HAVE_MEMORY_H) # include # endif @@ -2395,6 +2399,6 @@ # endif # if (LZO_TEST_DECOMPRESS_OVERRUN_INPUT >= 2) -# define NEED_IP(x, y) \ - if ( ((y > 0) && (x > (LZO_UINT_MAX - y))) || ((lzo_uint)(ip_end - ip) < (lzo_uint)((x)+(y))) ) goto input_overrun +# define NEED_IP(x) \ + if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x)) goto input_overrun # endif #endif @@ -2406,6 +2410,6 @@ # if (LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT >= 2) # undef TEST_OP -# define NEED_OP(x,y) \ - if ( ((y > 0) && (x > (LZO_UINT_MAX - y))) || ((lzo_uint)(op_end - op) < (lzo_uint)((x)+(y))) ) goto output_overrun +# define NEED_OP(x) \ + if ((lzo_uint)(op_end - op) < (lzo_uint)(x)) goto output_overrun # endif #endif @@ -2435,12 +2439,10 @@ # define HAVE_NEED_IP #else - /* # define NEED_IP(x) ((void) 0) */ -#error "no need_ip" +# define NEED_IP(x) ((void) 0) #endif #if defined(NEED_OP) # define HAVE_NEED_OP #else - /* # define NEED_OP(x) ((void) 0) */ -#error "no need_op" +# define NEED_OP(x) ((void) 0) #endif @@ -2511,5 +2513,5 @@ if (t < 4) goto match_next; - assert(t > 0); NEED_OP(t, 0); NEED_IP(t, 1); + assert(t > 0); NEED_OP(t); NEED_IP(t+1); do *op++ = *ip++; while (--t > 0); goto first_literal_run; @@ -2523,14 +2525,14 @@ if (t == 0) { - NEED_IP(1, 0); + NEED_IP(1); while (*ip == 0) { t += 255; ip++; - NEED_IP(1, 0); + NEED_IP(1); } t += 15 + *ip++; } - assert(t > 0); NEED_OP(t,3); NEED_IP(t,4); + assert(t > 0); NEED_OP(t+3); NEED_IP(t+4); #if defined(LZO_UNALIGNED_OK_4) || defined(LZO_ALIGNED_OK_4) #if !defined(LZO_UNALIGNED_OK_4) @@ -2589,5 +2591,5 @@ m_pos -= *ip++ << 2; #endif - TEST_LOOKBEHIND(m_pos,out); NEED_OP(3,0); + TEST_LOOKBEHIND(m_pos,out); NEED_OP(3); *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos; #endif @@ -2646,5 +2648,5 @@ t = (t >> 5) - 1; #endif - TEST_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t,(3-1)); + TEST_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t+3-1); goto copy_match; #endif @@ -2655,10 +2657,10 @@ if (t == 0) { - NEED_IP(1,0); + NEED_IP(1); while (*ip == 0) { t += 255; ip++; - NEED_IP(1,0); + NEED_IP(1); } t += 31 + *ip++; @@ -2699,10 +2701,10 @@ if (t == 0) { - NEED_IP(1,0); + NEED_IP(1); while (*ip == 0) { t += 255; ip++; - NEED_IP(1,0); + NEED_IP(1); } t += 7 + *ip++; @@ -2747,5 +2749,5 @@ m_off = 1 + (t >> 2) + (*ip++ << 2); #endif - NEED_OP(2,0); + NEED_OP(2); t = 2; COPY_DICT(t,m_off) #else @@ -2759,5 +2761,5 @@ m_pos -= *ip++ << 2; #endif - TEST_LOOKBEHIND(m_pos,out); NEED_OP(2,0); + TEST_LOOKBEHIND(m_pos,out); NEED_OP(2); *op++ = *m_pos++; *op++ = *m_pos; #endif @@ -2767,10 +2769,10 @@ #if defined(COPY_DICT) - NEED_OP(t,(3-1)); + NEED_OP(t+3-1); t += 3-1; COPY_DICT(t,m_off) #else - TEST_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t,(3-1)); + TEST_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t+3-1); #if defined(LZO_UNALIGNED_OK_4) || defined(LZO_ALIGNED_OK_4) #if !defined(LZO_UNALIGNED_OK_4) @@ -2810,5 +2812,5 @@ match_next: - assert(t > 0); NEED_OP(t,0); NEED_IP(t,1); + assert(t > 0); NEED_OP(t); NEED_IP(t+1); do *op++ = *ip++; while (--t > 0); t = *ip++; Index: trunk/src/rijndael-alg-fst.c =================================================================== --- trunk/src/rijndael-alg-fst.c (revision 591) +++ trunk/src/rijndael-alg-fst.c (revision 1) @@ -1,1235 +1,280 @@ -/* $NetBSD: rijndael-alg-fst.c,v 1.7 2005/12/11 12:20:52 christos Exp $ */ -/* $KAME: rijndael-alg-fst.c,v 1.10 2003/07/15 10:47:16 itojun Exp $ */ +/* + * rijndael-alg-fst.c v2.3 April '2000 + * + * Optimised ANSI C code + * + * authors: v1.0: Antoon Bosselaers + * v2.0: Vincent Rijmen + * v2.3: Paulo Barreto + * + * This code is placed in the public domain. + */ + +#include "config_xor.h" + +#include +#include + +#ifdef SH_ENCRYPT + +#include "rijndael-alg-fst.h" + +#include "rijndael-boxes-fst.h" + +int rijndaelKeySched(word8 k[MAXKC][4], word8 W[MAXROUNDS+1][4][4], int ROUNDS) { + /* Calculate the necessary round keys + * The number of calculations depends on keyBits and blockBits + */ + int j, r, t, rconpointer = 0; + word8 tk[MAXKC][4]; + int KC = ROUNDS - 6; + + for (j = KC-1; j >= 0; j--) { + *((word32*)tk[j]) = *((word32*)k[j]); + } + r = 0; + t = 0; + /* copy values into round key array */ + for (j = 0; (j < KC) && (r < ROUNDS + 1); ) { + for (; (j < KC) && (t < 4); j++, t++) { + *((word32*)W[r][t]) = *((word32*)tk[j]); + } + if (t == 4) { + r++; + t = 0; + } + } + + while (r < ROUNDS + 1) { /* while not enough round key material calculated */ + /* calculate new values */ + tk[0][0] ^= S[tk[KC-1][1]]; + tk[0][1] ^= S[tk[KC-1][2]]; + tk[0][2] ^= S[tk[KC-1][3]]; + tk[0][3] ^= S[tk[KC-1][0]]; + tk[0][0] ^= rcon[rconpointer++]; + + if (KC != 8) { + for (j = 1; j < KC; j++) { + *((word32*)tk[j]) ^= *((word32*)tk[j-1]); + } + } else { + for (j = 1; j < KC/2; j++) { + *((word32*)tk[j]) ^= *((word32*)tk[j-1]); + } + tk[KC/2][0] ^= S[tk[KC/2 - 1][0]]; + tk[KC/2][1] ^= S[tk[KC/2 - 1][1]]; + tk[KC/2][2] ^= S[tk[KC/2 - 1][2]]; + tk[KC/2][3] ^= S[tk[KC/2 - 1][3]]; + for (j = KC/2 + 1; j < KC; j++) { + *((word32*)tk[j]) ^= *((word32*)tk[j-1]); + } + } + /* copy values into round key array */ + for (j = 0; (j < KC) && (r < ROUNDS + 1); ) { + for (; (j < KC) && (t < 4); j++, t++) { + *((word32*)W[r][t]) = *((word32*)tk[j]); + } + if (t == 4) { + r++; + t = 0; + } + } + } + return 0; +} + +int rijndaelKeyEncToDec(word8 W[MAXROUNDS+1][4][4], int ROUNDS) { + int r; + word8 *w; + + for (r = 1; r < ROUNDS; r++) { + w = W[r][0]; + *((word32*)w) = + *((word32*)U1[w[0]]) + ^ *((word32*)U2[w[1]]) + ^ *((word32*)U3[w[2]]) + ^ *((word32*)U4[w[3]]); + + w = W[r][1]; + *((word32*)w) = + *((word32*)U1[w[0]]) + ^ *((word32*)U2[w[1]]) + ^ *((word32*)U3[w[2]]) + ^ *((word32*)U4[w[3]]); + + w = W[r][2]; + *((word32*)w) = + *((word32*)U1[w[0]]) + ^ *((word32*)U2[w[1]]) + ^ *((word32*)U3[w[2]]) + ^ *((word32*)U4[w[3]]); + + w = W[r][3]; + *((word32*)w) = + *((word32*)U1[w[0]]) + ^ *((word32*)U2[w[1]]) + ^ *((word32*)U3[w[2]]) + ^ *((word32*)U4[w[3]]); + } + return 0; +} + /** - * rijndael-alg-fst.c - * - * @version 3.0 (December 2000) - * - * Optimised ANSI C code for the Rijndael cipher (now AES) - * - * @author Vincent Rijmen - * @author Antoon Bosselaers - * @author Paulo Barreto - * - * This code is hereby placed in the public domain. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * Encrypt a single block. */ - -#include "config_xor.h" - -#include -#include - -#ifdef SH_ENCRYPT - -typedef unsigned char u8; -#if defined(HAVE_INT_32) -typedef unsigned int u32; -#elif defined(HAVE_LONG_32) -typedef unsigned long u32; -#elif defined(HAVE_SHORT_32) -typedef unsigned short u32; -#else -#error "No 32 bit integer type found" +int rijndaelEncrypt(word8 a[16], word8 b[16], word8 rk[MAXROUNDS+1][4][4], int ROUNDS) { + int r; + word8 temp[4][4]; + + *((word32*)temp[0]) = *((word32*)(a )) ^ *((word32*)rk[0][0]); + *((word32*)temp[1]) = *((word32*)(a+ 4)) ^ *((word32*)rk[0][1]); + *((word32*)temp[2]) = *((word32*)(a+ 8)) ^ *((word32*)rk[0][2]); + *((word32*)temp[3]) = *((word32*)(a+12)) ^ *((word32*)rk[0][3]); + *((word32*)(b )) = *((word32*)T1[temp[0][0]]) + ^ *((word32*)T2[temp[1][1]]) + ^ *((word32*)T3[temp[2][2]]) + ^ *((word32*)T4[temp[3][3]]); + *((word32*)(b + 4)) = *((word32*)T1[temp[1][0]]) + ^ *((word32*)T2[temp[2][1]]) + ^ *((word32*)T3[temp[3][2]]) + ^ *((word32*)T4[temp[0][3]]); + *((word32*)(b + 8)) = *((word32*)T1[temp[2][0]]) + ^ *((word32*)T2[temp[3][1]]) + ^ *((word32*)T3[temp[0][2]]) + ^ *((word32*)T4[temp[1][3]]); + *((word32*)(b +12)) = *((word32*)T1[temp[3][0]]) + ^ *((word32*)T2[temp[0][1]]) + ^ *((word32*)T3[temp[1][2]]) + ^ *((word32*)T4[temp[2][3]]); + for (r = 1; r < ROUNDS-1; r++) { + *((word32*)temp[0]) = *((word32*)(b )) ^ *((word32*)rk[r][0]); + *((word32*)temp[1]) = *((word32*)(b+ 4)) ^ *((word32*)rk[r][1]); + *((word32*)temp[2]) = *((word32*)(b+ 8)) ^ *((word32*)rk[r][2]); + *((word32*)temp[3]) = *((word32*)(b+12)) ^ *((word32*)rk[r][3]); + + *((word32*)(b )) = *((word32*)T1[temp[0][0]]) + ^ *((word32*)T2[temp[1][1]]) + ^ *((word32*)T3[temp[2][2]]) + ^ *((word32*)T4[temp[3][3]]); + *((word32*)(b + 4)) = *((word32*)T1[temp[1][0]]) + ^ *((word32*)T2[temp[2][1]]) + ^ *((word32*)T3[temp[3][2]]) + ^ *((word32*)T4[temp[0][3]]); + *((word32*)(b + 8)) = *((word32*)T1[temp[2][0]]) + ^ *((word32*)T2[temp[3][1]]) + ^ *((word32*)T3[temp[0][2]]) + ^ *((word32*)T4[temp[1][3]]); + *((word32*)(b +12)) = *((word32*)T1[temp[3][0]]) + ^ *((word32*)T2[temp[0][1]]) + ^ *((word32*)T3[temp[1][2]]) + ^ *((word32*)T4[temp[2][3]]); + } + /* last round is special */ + *((word32*)temp[0]) = *((word32*)(b )) ^ *((word32*)rk[ROUNDS-1][0]); + *((word32*)temp[1]) = *((word32*)(b+ 4)) ^ *((word32*)rk[ROUNDS-1][1]); + *((word32*)temp[2]) = *((word32*)(b+ 8)) ^ *((word32*)rk[ROUNDS-1][2]); + *((word32*)temp[3]) = *((word32*)(b+12)) ^ *((word32*)rk[ROUNDS-1][3]); + b[ 0] = T1[temp[0][0]][1]; + b[ 1] = T1[temp[1][1]][1]; + b[ 2] = T1[temp[2][2]][1]; + b[ 3] = T1[temp[3][3]][1]; + b[ 4] = T1[temp[1][0]][1]; + b[ 5] = T1[temp[2][1]][1]; + b[ 6] = T1[temp[3][2]][1]; + b[ 7] = T1[temp[0][3]][1]; + b[ 8] = T1[temp[2][0]][1]; + b[ 9] = T1[temp[3][1]][1]; + b[10] = T1[temp[0][2]][1]; + b[11] = T1[temp[1][3]][1]; + b[12] = T1[temp[3][0]][1]; + b[13] = T1[temp[0][1]][1]; + b[14] = T1[temp[1][2]][1]; + b[15] = T1[temp[2][3]][1]; + *((word32*)(b )) ^= *((word32*)rk[ROUNDS][0]); + *((word32*)(b+ 4)) ^= *((word32*)rk[ROUNDS][1]); + *((word32*)(b+ 8)) ^= *((word32*)rk[ROUNDS][2]); + *((word32*)(b+12)) ^= *((word32*)rk[ROUNDS][3]); + + return 0; +} + +/** + * Decrypt a single block. + */ +int rijndaelDecrypt(word8 a[16], word8 b[16], word8 rk[MAXROUNDS+1][4][4], int ROUNDS) { + int r; + word8 temp[4][4]; + + *((word32*)temp[0]) = *((word32*)(a )) ^ *((word32*)rk[ROUNDS][0]); + *((word32*)temp[1]) = *((word32*)(a+ 4)) ^ *((word32*)rk[ROUNDS][1]); + *((word32*)temp[2]) = *((word32*)(a+ 8)) ^ *((word32*)rk[ROUNDS][2]); + *((word32*)temp[3]) = *((word32*)(a+12)) ^ *((word32*)rk[ROUNDS][3]); + + *((word32*)(b )) = *((word32*)T5[temp[0][0]]) + ^ *((word32*)T6[temp[3][1]]) + ^ *((word32*)T7[temp[2][2]]) + ^ *((word32*)T8[temp[1][3]]); + *((word32*)(b+ 4)) = *((word32*)T5[temp[1][0]]) + ^ *((word32*)T6[temp[0][1]]) + ^ *((word32*)T7[temp[3][2]]) + ^ *((word32*)T8[temp[2][3]]); + *((word32*)(b+ 8)) = *((word32*)T5[temp[2][0]]) + ^ *((word32*)T6[temp[1][1]]) + ^ *((word32*)T7[temp[0][2]]) + ^ *((word32*)T8[temp[3][3]]); + *((word32*)(b+12)) = *((word32*)T5[temp[3][0]]) + ^ *((word32*)T6[temp[2][1]]) + ^ *((word32*)T7[temp[1][2]]) + ^ *((word32*)T8[temp[0][3]]); + for (r = ROUNDS-1; r > 1; r--) { + *((word32*)temp[0]) = *((word32*)(b )) ^ *((word32*)rk[r][0]); + *((word32*)temp[1]) = *((word32*)(b+ 4)) ^ *((word32*)rk[r][1]); + *((word32*)temp[2]) = *((word32*)(b+ 8)) ^ *((word32*)rk[r][2]); + *((word32*)temp[3]) = *((word32*)(b+12)) ^ *((word32*)rk[r][3]); + *((word32*)(b )) = *((word32*)T5[temp[0][0]]) + ^ *((word32*)T6[temp[3][1]]) + ^ *((word32*)T7[temp[2][2]]) + ^ *((word32*)T8[temp[1][3]]); + *((word32*)(b+ 4)) = *((word32*)T5[temp[1][0]]) + ^ *((word32*)T6[temp[0][1]]) + ^ *((word32*)T7[temp[3][2]]) + ^ *((word32*)T8[temp[2][3]]); + *((word32*)(b+ 8)) = *((word32*)T5[temp[2][0]]) + ^ *((word32*)T6[temp[1][1]]) + ^ *((word32*)T7[temp[0][2]]) + ^ *((word32*)T8[temp[3][3]]); + *((word32*)(b+12)) = *((word32*)T5[temp[3][0]]) + ^ *((word32*)T6[temp[2][1]]) + ^ *((word32*)T7[temp[1][2]]) + ^ *((word32*)T8[temp[0][3]]); + } + /* last round is special */ + *((word32*)temp[0]) = *((word32*)(b )) ^ *((word32*)rk[1][0]); + *((word32*)temp[1]) = *((word32*)(b+ 4)) ^ *((word32*)rk[1][1]); + *((word32*)temp[2]) = *((word32*)(b+ 8)) ^ *((word32*)rk[1][2]); + *((word32*)temp[3]) = *((word32*)(b+12)) ^ *((word32*)rk[1][3]); + b[ 0] = S5[temp[0][0]]; + b[ 1] = S5[temp[3][1]]; + b[ 2] = S5[temp[2][2]]; + b[ 3] = S5[temp[1][3]]; + b[ 4] = S5[temp[1][0]]; + b[ 5] = S5[temp[0][1]]; + b[ 6] = S5[temp[3][2]]; + b[ 7] = S5[temp[2][3]]; + b[ 8] = S5[temp[2][0]]; + b[ 9] = S5[temp[1][1]]; + b[10] = S5[temp[0][2]]; + b[11] = S5[temp[3][3]]; + b[12] = S5[temp[3][0]]; + b[13] = S5[temp[2][1]]; + b[14] = S5[temp[1][2]]; + b[15] = S5[temp[0][3]]; + *((word32*)(b )) ^= *((word32*)rk[0][0]); + *((word32*)(b+ 4)) ^= *((word32*)rk[0][1]); + *((word32*)(b+ 8)) ^= *((word32*)rk[0][2]); + *((word32*)(b+12)) ^= *((word32*)rk[0][3]); + + return 0; +} + #endif - -#include "rijndael-alg-fst.h" - -#define FULL_UNROLL 1 -/* -Te0[x] = S [x].[02, 01, 01, 03]; -Te1[x] = S [x].[03, 02, 01, 01]; -Te2[x] = S [x].[01, 03, 02, 01]; -Te3[x] = S [x].[01, 01, 03, 02]; -Te4[x] = S [x].[01, 01, 01, 01]; - -Td0[x] = Si[x].[0e, 09, 0d, 0b]; -Td1[x] = Si[x].[0b, 0e, 09, 0d]; -Td2[x] = Si[x].[0d, 0b, 0e, 09]; -Td3[x] = Si[x].[09, 0d, 0b, 0e]; -Td4[x] = Si[x].[01, 01, 01, 01]; -*/ - -static const u32 Te0[256] = { - 0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU, - 0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U, - 0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU, - 0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU, - 0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U, - 0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU, - 0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU, - 0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU, - 0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU, - 0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU, - 0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U, - 0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU, - 0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU, - 0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U, - 0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU, - 0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU, - 0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU, - 0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU, - 0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU, - 0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U, - 0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU, - 0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU, - 0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU, - 0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU, - 0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U, - 0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U, - 0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U, - 0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U, - 0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU, - 0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U, - 0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U, - 0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU, - 0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU, - 0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U, - 0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U, - 0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U, - 0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU, - 0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U, - 0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU, - 0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U, - 0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU, - 0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U, - 0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U, - 0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU, - 0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U, - 0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U, - 0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U, - 0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U, - 0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U, - 0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U, - 0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U, - 0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U, - 0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU, - 0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U, - 0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U, - 0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U, - 0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U, - 0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U, - 0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U, - 0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU, - 0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U, - 0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U, - 0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U, - 0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU, -}; -static const u32 Te1[256] = { - 0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU, - 0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U, - 0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU, - 0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U, - 0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU, - 0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U, - 0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU, - 0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U, - 0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U, - 0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU, - 0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U, - 0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U, - 0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U, - 0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU, - 0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U, - 0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U, - 0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU, - 0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U, - 0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U, - 0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U, - 0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU, - 0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU, - 0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U, - 0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU, - 0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU, - 0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U, - 0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU, - 0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U, - 0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU, - 0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U, - 0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U, - 0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U, - 0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU, - 0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U, - 0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU, - 0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U, - 0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU, - 0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U, - 0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U, - 0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU, - 0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU, - 0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU, - 0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U, - 0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U, - 0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU, - 0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U, - 0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU, - 0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U, - 0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU, - 0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U, - 0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU, - 0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU, - 0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U, - 0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU, - 0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U, - 0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU, - 0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U, - 0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U, - 0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U, - 0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU, - 0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU, - 0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U, - 0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU, - 0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U, -}; -static const u32 Te2[256] = { - 0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU, - 0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U, - 0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU, - 0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U, - 0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU, - 0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U, - 0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU, - 0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U, - 0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U, - 0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU, - 0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U, - 0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U, - 0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U, - 0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU, - 0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U, - 0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U, - 0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU, - 0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U, - 0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U, - 0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U, - 0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU, - 0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU, - 0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U, - 0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU, - 0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU, - 0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U, - 0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU, - 0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U, - 0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU, - 0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U, - 0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U, - 0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U, - 0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU, - 0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U, - 0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU, - 0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U, - 0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU, - 0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U, - 0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U, - 0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU, - 0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU, - 0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU, - 0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U, - 0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U, - 0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU, - 0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U, - 0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU, - 0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U, - 0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU, - 0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U, - 0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU, - 0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU, - 0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U, - 0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU, - 0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U, - 0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU, - 0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U, - 0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U, - 0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U, - 0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU, - 0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU, - 0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U, - 0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU, - 0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U, -}; -static const u32 Te3[256] = { - - 0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U, - 0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U, - 0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U, - 0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU, - 0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU, - 0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU, - 0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U, - 0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU, - 0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU, - 0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U, - 0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U, - 0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU, - 0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU, - 0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU, - 0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU, - 0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU, - 0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U, - 0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU, - 0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU, - 0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U, - 0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U, - 0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U, - 0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U, - 0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U, - 0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU, - 0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U, - 0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU, - 0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU, - 0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U, - 0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U, - 0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U, - 0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU, - 0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U, - 0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU, - 0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU, - 0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U, - 0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U, - 0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU, - 0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U, - 0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU, - 0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U, - 0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U, - 0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U, - 0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U, - 0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU, - 0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U, - 0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU, - 0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U, - 0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU, - 0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U, - 0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU, - 0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU, - 0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU, - 0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU, - 0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U, - 0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U, - 0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U, - 0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U, - 0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U, - 0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U, - 0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU, - 0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U, - 0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU, - 0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU, -}; -static const u32 Te4[256] = { - 0x63636363U, 0x7c7c7c7cU, 0x77777777U, 0x7b7b7b7bU, - 0xf2f2f2f2U, 0x6b6b6b6bU, 0x6f6f6f6fU, 0xc5c5c5c5U, - 0x30303030U, 0x01010101U, 0x67676767U, 0x2b2b2b2bU, - 0xfefefefeU, 0xd7d7d7d7U, 0xababababU, 0x76767676U, - 0xcacacacaU, 0x82828282U, 0xc9c9c9c9U, 0x7d7d7d7dU, - 0xfafafafaU, 0x59595959U, 0x47474747U, 0xf0f0f0f0U, - 0xadadadadU, 0xd4d4d4d4U, 0xa2a2a2a2U, 0xafafafafU, - 0x9c9c9c9cU, 0xa4a4a4a4U, 0x72727272U, 0xc0c0c0c0U, - 0xb7b7b7b7U, 0xfdfdfdfdU, 0x93939393U, 0x26262626U, - 0x36363636U, 0x3f3f3f3fU, 0xf7f7f7f7U, 0xccccccccU, - 0x34343434U, 0xa5a5a5a5U, 0xe5e5e5e5U, 0xf1f1f1f1U, - 0x71717171U, 0xd8d8d8d8U, 0x31313131U, 0x15151515U, - 0x04040404U, 0xc7c7c7c7U, 0x23232323U, 0xc3c3c3c3U, - 0x18181818U, 0x96969696U, 0x05050505U, 0x9a9a9a9aU, - 0x07070707U, 0x12121212U, 0x80808080U, 0xe2e2e2e2U, - 0xebebebebU, 0x27272727U, 0xb2b2b2b2U, 0x75757575U, - 0x09090909U, 0x83838383U, 0x2c2c2c2cU, 0x1a1a1a1aU, - 0x1b1b1b1bU, 0x6e6e6e6eU, 0x5a5a5a5aU, 0xa0a0a0a0U, - 0x52525252U, 0x3b3b3b3bU, 0xd6d6d6d6U, 0xb3b3b3b3U, - 0x29292929U, 0xe3e3e3e3U, 0x2f2f2f2fU, 0x84848484U, - 0x53535353U, 0xd1d1d1d1U, 0x00000000U, 0xededededU, - 0x20202020U, 0xfcfcfcfcU, 0xb1b1b1b1U, 0x5b5b5b5bU, - 0x6a6a6a6aU, 0xcbcbcbcbU, 0xbebebebeU, 0x39393939U, - 0x4a4a4a4aU, 0x4c4c4c4cU, 0x58585858U, 0xcfcfcfcfU, - 0xd0d0d0d0U, 0xefefefefU, 0xaaaaaaaaU, 0xfbfbfbfbU, - 0x43434343U, 0x4d4d4d4dU, 0x33333333U, 0x85858585U, - 0x45454545U, 0xf9f9f9f9U, 0x02020202U, 0x7f7f7f7fU, - 0x50505050U, 0x3c3c3c3cU, 0x9f9f9f9fU, 0xa8a8a8a8U, - 0x51515151U, 0xa3a3a3a3U, 0x40404040U, 0x8f8f8f8fU, - 0x92929292U, 0x9d9d9d9dU, 0x38383838U, 0xf5f5f5f5U, - 0xbcbcbcbcU, 0xb6b6b6b6U, 0xdadadadaU, 0x21212121U, - 0x10101010U, 0xffffffffU, 0xf3f3f3f3U, 0xd2d2d2d2U, - 0xcdcdcdcdU, 0x0c0c0c0cU, 0x13131313U, 0xececececU, - 0x5f5f5f5fU, 0x97979797U, 0x44444444U, 0x17171717U, - 0xc4c4c4c4U, 0xa7a7a7a7U, 0x7e7e7e7eU, 0x3d3d3d3dU, - 0x64646464U, 0x5d5d5d5dU, 0x19191919U, 0x73737373U, - 0x60606060U, 0x81818181U, 0x4f4f4f4fU, 0xdcdcdcdcU, - 0x22222222U, 0x2a2a2a2aU, 0x90909090U, 0x88888888U, - 0x46464646U, 0xeeeeeeeeU, 0xb8b8b8b8U, 0x14141414U, - 0xdedededeU, 0x5e5e5e5eU, 0x0b0b0b0bU, 0xdbdbdbdbU, - 0xe0e0e0e0U, 0x32323232U, 0x3a3a3a3aU, 0x0a0a0a0aU, - 0x49494949U, 0x06060606U, 0x24242424U, 0x5c5c5c5cU, - 0xc2c2c2c2U, 0xd3d3d3d3U, 0xacacacacU, 0x62626262U, - 0x91919191U, 0x95959595U, 0xe4e4e4e4U, 0x79797979U, - 0xe7e7e7e7U, 0xc8c8c8c8U, 0x37373737U, 0x6d6d6d6dU, - 0x8d8d8d8dU, 0xd5d5d5d5U, 0x4e4e4e4eU, 0xa9a9a9a9U, - 0x6c6c6c6cU, 0x56565656U, 0xf4f4f4f4U, 0xeaeaeaeaU, - 0x65656565U, 0x7a7a7a7aU, 0xaeaeaeaeU, 0x08080808U, - 0xbabababaU, 0x78787878U, 0x25252525U, 0x2e2e2e2eU, - 0x1c1c1c1cU, 0xa6a6a6a6U, 0xb4b4b4b4U, 0xc6c6c6c6U, - 0xe8e8e8e8U, 0xddddddddU, 0x74747474U, 0x1f1f1f1fU, - 0x4b4b4b4bU, 0xbdbdbdbdU, 0x8b8b8b8bU, 0x8a8a8a8aU, - 0x70707070U, 0x3e3e3e3eU, 0xb5b5b5b5U, 0x66666666U, - 0x48484848U, 0x03030303U, 0xf6f6f6f6U, 0x0e0e0e0eU, - 0x61616161U, 0x35353535U, 0x57575757U, 0xb9b9b9b9U, - 0x86868686U, 0xc1c1c1c1U, 0x1d1d1d1dU, 0x9e9e9e9eU, - 0xe1e1e1e1U, 0xf8f8f8f8U, 0x98989898U, 0x11111111U, - 0x69696969U, 0xd9d9d9d9U, 0x8e8e8e8eU, 0x94949494U, - 0x9b9b9b9bU, 0x1e1e1e1eU, 0x87878787U, 0xe9e9e9e9U, - 0xcecececeU, 0x55555555U, 0x28282828U, 0xdfdfdfdfU, - 0x8c8c8c8cU, 0xa1a1a1a1U, 0x89898989U, 0x0d0d0d0dU, - 0xbfbfbfbfU, 0xe6e6e6e6U, 0x42424242U, 0x68686868U, - 0x41414141U, 0x99999999U, 0x2d2d2d2dU, 0x0f0f0f0fU, - 0xb0b0b0b0U, 0x54545454U, 0xbbbbbbbbU, 0x16161616U, -}; -static const u32 Td0[256] = { - 0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U, - 0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U, - 0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U, - 0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU, - 0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U, - 0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U, - 0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU, - 0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U, - 0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU, - 0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U, - 0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U, - 0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U, - 0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U, - 0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU, - 0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U, - 0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU, - 0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U, - 0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU, - 0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U, - 0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U, - 0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U, - 0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU, - 0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U, - 0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU, - 0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U, - 0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU, - 0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U, - 0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU, - 0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU, - 0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U, - 0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU, - 0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U, - 0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU, - 0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U, - 0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U, - 0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U, - 0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU, - 0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U, - 0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U, - 0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU, - 0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U, - 0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U, - 0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U, - 0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U, - 0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U, - 0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU, - 0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U, - 0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U, - 0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U, - 0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U, - 0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U, - 0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU, - 0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU, - 0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU, - 0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU, - 0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U, - 0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U, - 0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU, - 0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU, - 0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U, - 0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU, - 0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U, - 0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U, - 0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U, -}; -static const u32 Td1[256] = { - 0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU, - 0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U, - 0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU, - 0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U, - 0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U, - 0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U, - 0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U, - 0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U, - 0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U, - 0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU, - 0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU, - 0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU, - 0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U, - 0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU, - 0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U, - 0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U, - 0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U, - 0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU, - 0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU, - 0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U, - 0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU, - 0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U, - 0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU, - 0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU, - 0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U, - 0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U, - 0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U, - 0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU, - 0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U, - 0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU, - 0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U, - 0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U, - 0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U, - 0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU, - 0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U, - 0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U, - 0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U, - 0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U, - 0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U, - 0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U, - 0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU, - 0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU, - 0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U, - 0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU, - 0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U, - 0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU, - 0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU, - 0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U, - 0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU, - 0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U, - 0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U, - 0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U, - 0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U, - 0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U, - 0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U, - 0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U, - 0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU, - 0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U, - 0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U, - 0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU, - 0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U, - 0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U, - 0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U, - 0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U, -}; -static const u32 Td2[256] = { - 0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U, - 0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U, - 0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U, - 0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U, - 0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU, - 0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U, - 0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U, - 0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U, - 0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U, - 0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU, - 0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U, - 0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U, - 0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU, - 0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U, - 0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U, - 0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U, - 0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U, - 0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U, - 0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U, - 0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU, - - 0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U, - 0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U, - 0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U, - 0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U, - 0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U, - 0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU, - 0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU, - 0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U, - 0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU, - 0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U, - 0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU, - 0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU, - 0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU, - 0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU, - 0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U, - 0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U, - 0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U, - 0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U, - 0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U, - 0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U, - 0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U, - 0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU, - 0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU, - 0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U, - 0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U, - 0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU, - 0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU, - 0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U, - 0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U, - 0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U, - 0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U, - 0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U, - 0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U, - 0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U, - 0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU, - 0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U, - 0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U, - 0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U, - 0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U, - 0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U, - 0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U, - 0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU, - 0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U, - 0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U, -}; -static const u32 Td3[256] = { - 0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU, - 0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU, - 0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U, - 0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U, - 0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU, - 0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU, - 0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U, - 0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU, - 0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U, - 0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU, - 0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U, - 0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U, - 0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U, - 0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U, - 0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U, - 0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU, - 0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU, - 0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U, - 0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U, - 0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU, - 0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU, - 0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U, - 0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U, - 0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U, - 0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U, - 0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU, - 0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U, - 0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U, - 0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU, - 0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU, - 0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U, - 0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U, - 0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U, - 0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU, - 0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U, - 0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U, - 0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U, - 0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U, - 0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U, - 0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U, - 0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U, - 0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU, - 0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U, - 0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U, - 0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU, - 0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU, - 0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U, - 0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU, - 0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U, - 0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U, - 0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U, - 0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U, - 0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U, - 0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U, - 0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU, - 0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU, - 0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU, - 0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU, - 0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U, - 0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U, - 0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U, - 0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU, - 0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U, - 0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U, -}; -static const u32 Td4[256] = { - 0x52525252U, 0x09090909U, 0x6a6a6a6aU, 0xd5d5d5d5U, - 0x30303030U, 0x36363636U, 0xa5a5a5a5U, 0x38383838U, - 0xbfbfbfbfU, 0x40404040U, 0xa3a3a3a3U, 0x9e9e9e9eU, - 0x81818181U, 0xf3f3f3f3U, 0xd7d7d7d7U, 0xfbfbfbfbU, - 0x7c7c7c7cU, 0xe3e3e3e3U, 0x39393939U, 0x82828282U, - 0x9b9b9b9bU, 0x2f2f2f2fU, 0xffffffffU, 0x87878787U, - 0x34343434U, 0x8e8e8e8eU, 0x43434343U, 0x44444444U, - 0xc4c4c4c4U, 0xdedededeU, 0xe9e9e9e9U, 0xcbcbcbcbU, - 0x54545454U, 0x7b7b7b7bU, 0x94949494U, 0x32323232U, - 0xa6a6a6a6U, 0xc2c2c2c2U, 0x23232323U, 0x3d3d3d3dU, - 0xeeeeeeeeU, 0x4c4c4c4cU, 0x95959595U, 0x0b0b0b0bU, - 0x42424242U, 0xfafafafaU, 0xc3c3c3c3U, 0x4e4e4e4eU, - 0x08080808U, 0x2e2e2e2eU, 0xa1a1a1a1U, 0x66666666U, - 0x28282828U, 0xd9d9d9d9U, 0x24242424U, 0xb2b2b2b2U, - 0x76767676U, 0x5b5b5b5bU, 0xa2a2a2a2U, 0x49494949U, - 0x6d6d6d6dU, 0x8b8b8b8bU, 0xd1d1d1d1U, 0x25252525U, - 0x72727272U, 0xf8f8f8f8U, 0xf6f6f6f6U, 0x64646464U, - 0x86868686U, 0x68686868U, 0x98989898U, 0x16161616U, - 0xd4d4d4d4U, 0xa4a4a4a4U, 0x5c5c5c5cU, 0xccccccccU, - 0x5d5d5d5dU, 0x65656565U, 0xb6b6b6b6U, 0x92929292U, - 0x6c6c6c6cU, 0x70707070U, 0x48484848U, 0x50505050U, - 0xfdfdfdfdU, 0xededededU, 0xb9b9b9b9U, 0xdadadadaU, - 0x5e5e5e5eU, 0x15151515U, 0x46464646U, 0x57575757U, - 0xa7a7a7a7U, 0x8d8d8d8dU, 0x9d9d9d9dU, 0x84848484U, - 0x90909090U, 0xd8d8d8d8U, 0xababababU, 0x00000000U, - 0x8c8c8c8cU, 0xbcbcbcbcU, 0xd3d3d3d3U, 0x0a0a0a0aU, - 0xf7f7f7f7U, 0xe4e4e4e4U, 0x58585858U, 0x05050505U, - 0xb8b8b8b8U, 0xb3b3b3b3U, 0x45454545U, 0x06060606U, - 0xd0d0d0d0U, 0x2c2c2c2cU, 0x1e1e1e1eU, 0x8f8f8f8fU, - 0xcacacacaU, 0x3f3f3f3fU, 0x0f0f0f0fU, 0x02020202U, - 0xc1c1c1c1U, 0xafafafafU, 0xbdbdbdbdU, 0x03030303U, - 0x01010101U, 0x13131313U, 0x8a8a8a8aU, 0x6b6b6b6bU, - 0x3a3a3a3aU, 0x91919191U, 0x11111111U, 0x41414141U, - 0x4f4f4f4fU, 0x67676767U, 0xdcdcdcdcU, 0xeaeaeaeaU, - 0x97979797U, 0xf2f2f2f2U, 0xcfcfcfcfU, 0xcecececeU, - 0xf0f0f0f0U, 0xb4b4b4b4U, 0xe6e6e6e6U, 0x73737373U, - 0x96969696U, 0xacacacacU, 0x74747474U, 0x22222222U, - 0xe7e7e7e7U, 0xadadadadU, 0x35353535U, 0x85858585U, - 0xe2e2e2e2U, 0xf9f9f9f9U, 0x37373737U, 0xe8e8e8e8U, - 0x1c1c1c1cU, 0x75757575U, 0xdfdfdfdfU, 0x6e6e6e6eU, - 0x47474747U, 0xf1f1f1f1U, 0x1a1a1a1aU, 0x71717171U, - 0x1d1d1d1dU, 0x29292929U, 0xc5c5c5c5U, 0x89898989U, - 0x6f6f6f6fU, 0xb7b7b7b7U, 0x62626262U, 0x0e0e0e0eU, - 0xaaaaaaaaU, 0x18181818U, 0xbebebebeU, 0x1b1b1b1bU, - 0xfcfcfcfcU, 0x56565656U, 0x3e3e3e3eU, 0x4b4b4b4bU, - 0xc6c6c6c6U, 0xd2d2d2d2U, 0x79797979U, 0x20202020U, - 0x9a9a9a9aU, 0xdbdbdbdbU, 0xc0c0c0c0U, 0xfefefefeU, - 0x78787878U, 0xcdcdcdcdU, 0x5a5a5a5aU, 0xf4f4f4f4U, - 0x1f1f1f1fU, 0xddddddddU, 0xa8a8a8a8U, 0x33333333U, - 0x88888888U, 0x07070707U, 0xc7c7c7c7U, 0x31313131U, - 0xb1b1b1b1U, 0x12121212U, 0x10101010U, 0x59595959U, - 0x27272727U, 0x80808080U, 0xececececU, 0x5f5f5f5fU, - 0x60606060U, 0x51515151U, 0x7f7f7f7fU, 0xa9a9a9a9U, - 0x19191919U, 0xb5b5b5b5U, 0x4a4a4a4aU, 0x0d0d0d0dU, - 0x2d2d2d2dU, 0xe5e5e5e5U, 0x7a7a7a7aU, 0x9f9f9f9fU, - 0x93939393U, 0xc9c9c9c9U, 0x9c9c9c9cU, 0xefefefefU, - 0xa0a0a0a0U, 0xe0e0e0e0U, 0x3b3b3b3bU, 0x4d4d4d4dU, - 0xaeaeaeaeU, 0x2a2a2a2aU, 0xf5f5f5f5U, 0xb0b0b0b0U, - 0xc8c8c8c8U, 0xebebebebU, 0xbbbbbbbbU, 0x3c3c3c3cU, - 0x83838383U, 0x53535353U, 0x99999999U, 0x61616161U, - 0x17171717U, 0x2b2b2b2bU, 0x04040404U, 0x7e7e7e7eU, - 0xbabababaU, 0x77777777U, 0xd6d6d6d6U, 0x26262626U, - 0xe1e1e1e1U, 0x69696969U, 0x14141414U, 0x63636363U, - 0x55555555U, 0x21212121U, 0x0c0c0c0cU, 0x7d7d7d7dU, -}; -static const u32 rcon[] = { - 0x01000000, 0x02000000, 0x04000000, 0x08000000, - 0x10000000, 0x20000000, 0x40000000, 0x80000000, - 0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */ -}; - - -#ifdef _MSC_VER -#define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00) -#define GETU32(p) SWAP(*((u32 *)(p))) -#define PUTU32(ct, st) { *((u32 *)(ct)) = SWAP((st)); } -#else -#define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] << 8) ^ ((u32)(pt)[3])) -#define PUTU32(ct, st) { (ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); (ct)[2] = (u8)((st) >> 8); (ct)[3] = (u8)(st); } -#endif - -/** - * Expand the cipher key into the encryption key schedule. - * - * @return the number of rounds for the given cipher key size. - */ -int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits) { - int i = 0; - u32 temp; - - rk[0] = GETU32(cipherKey ); - rk[1] = GETU32(cipherKey + 4); - rk[2] = GETU32(cipherKey + 8); - rk[3] = GETU32(cipherKey + 12); - if (keyBits == 128) { - for (;;) { - temp = rk[3]; - rk[4] = rk[0] ^ - (Te4[(temp >> 16) & 0xff] & 0xff000000) ^ - (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^ - (Te4[(temp ) & 0xff] & 0x0000ff00) ^ - (Te4[(temp >> 24) ] & 0x000000ff) ^ - rcon[i]; - rk[5] = rk[1] ^ rk[4]; - rk[6] = rk[2] ^ rk[5]; - rk[7] = rk[3] ^ rk[6]; - if (++i == 10) { - return 10; - } - rk += 4; - } - } - rk[4] = GETU32(cipherKey + 16); - rk[5] = GETU32(cipherKey + 20); - if (keyBits == 192) { - for (;;) { - temp = rk[ 5]; - rk[ 6] = rk[ 0] ^ - (Te4[(temp >> 16) & 0xff] & 0xff000000) ^ - (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^ - (Te4[(temp ) & 0xff] & 0x0000ff00) ^ - (Te4[(temp >> 24) ] & 0x000000ff) ^ - rcon[i]; - rk[ 7] = rk[ 1] ^ rk[ 6]; - rk[ 8] = rk[ 2] ^ rk[ 7]; - rk[ 9] = rk[ 3] ^ rk[ 8]; - if (++i == 8) { - return 12; - } - rk[10] = rk[ 4] ^ rk[ 9]; - rk[11] = rk[ 5] ^ rk[10]; - rk += 6; - } - } - rk[6] = GETU32(cipherKey + 24); - rk[7] = GETU32(cipherKey + 28); - if (keyBits == 256) { - for (;;) { - temp = rk[ 7]; - rk[ 8] = rk[ 0] ^ - (Te4[(temp >> 16) & 0xff] & 0xff000000) ^ - (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^ - (Te4[(temp ) & 0xff] & 0x0000ff00) ^ - (Te4[(temp >> 24) ] & 0x000000ff) ^ - rcon[i]; - rk[ 9] = rk[ 1] ^ rk[ 8]; - rk[10] = rk[ 2] ^ rk[ 9]; - rk[11] = rk[ 3] ^ rk[10]; - if (++i == 7) { - return 14; - } - temp = rk[11]; - rk[12] = rk[ 4] ^ - (Te4[(temp >> 24) ] & 0xff000000) ^ - (Te4[(temp >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(temp >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(temp ) & 0xff] & 0x000000ff); - rk[13] = rk[ 5] ^ rk[12]; - rk[14] = rk[ 6] ^ rk[13]; - rk[15] = rk[ 7] ^ rk[14]; - - rk += 8; - } - } - return 0; -} - -/** - * Expand the cipher key into the decryption key schedule. - * - * @return the number of rounds for the given cipher key size. - */ -int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits) { - int Nr, i, j; - u32 temp; - - /* expand the cipher key: */ - Nr = rijndaelKeySetupEnc(rk, cipherKey, keyBits); - /* invert the order of the round keys: */ - for (i = 0, j = 4*Nr; i < j; i += 4, j -= 4) { - temp = rk[i ]; rk[i ] = rk[j ]; rk[j ] = temp; - temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp; - temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp; - temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp; - } - /* apply the inverse MixColumn transform to all round keys but the first and the last: */ - for (i = 1; i < Nr; i++) { - rk += 4; - rk[0] = - Td0[Te4[(rk[0] >> 24) ] & 0xff] ^ - Td1[Te4[(rk[0] >> 16) & 0xff] & 0xff] ^ - Td2[Te4[(rk[0] >> 8) & 0xff] & 0xff] ^ - Td3[Te4[(rk[0] ) & 0xff] & 0xff]; - rk[1] = - Td0[Te4[(rk[1] >> 24) ] & 0xff] ^ - Td1[Te4[(rk[1] >> 16) & 0xff] & 0xff] ^ - Td2[Te4[(rk[1] >> 8) & 0xff] & 0xff] ^ - Td3[Te4[(rk[1] ) & 0xff] & 0xff]; - rk[2] = - Td0[Te4[(rk[2] >> 24) ] & 0xff] ^ - Td1[Te4[(rk[2] >> 16) & 0xff] & 0xff] ^ - Td2[Te4[(rk[2] >> 8) & 0xff] & 0xff] ^ - Td3[Te4[(rk[2] ) & 0xff] & 0xff]; - rk[3] = - Td0[Te4[(rk[3] >> 24) ] & 0xff] ^ - Td1[Te4[(rk[3] >> 16) & 0xff] & 0xff] ^ - Td2[Te4[(rk[3] >> 8) & 0xff] & 0xff] ^ - Td3[Te4[(rk[3] ) & 0xff] & 0xff]; - } - return Nr; -} - -void rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16], u8 ct[16]) { - u32 s0, s1, s2, s3, t0, t1, t2, t3; -#ifndef FULL_UNROLL - int r; -#endif /* ?FULL_UNROLL */ - - /* - * map byte array block to cipher state - * and add initial round key: - */ - s0 = GETU32(pt ) ^ rk[0]; - s1 = GETU32(pt + 4) ^ rk[1]; - s2 = GETU32(pt + 8) ^ rk[2]; - s3 = GETU32(pt + 12) ^ rk[3]; -#ifdef FULL_UNROLL - /* round 1: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[ 4]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[ 5]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[ 6]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[ 7]; - /* round 2: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[ 8]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[ 9]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[10]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[11]; - /* round 3: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[12]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[13]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[14]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[15]; - /* round 4: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[16]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[17]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[18]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[19]; - /* round 5: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[20]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[21]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[22]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[23]; - /* round 6: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[24]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[25]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[26]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[27]; - /* round 7: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[28]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[29]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[30]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[31]; - /* round 8: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[32]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[33]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[34]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[35]; - /* round 9: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[36]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[37]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39]; - if (Nr > 10) { - /* round 10: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[41]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[42]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[43]; - /* round 11: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[44]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[45]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[46]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[47]; - if (Nr > 12) { - /* round 12: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[48]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[49]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[50]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[51]; - /* round 13: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[52]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[53]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[54]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[55]; - } - } - rk += Nr << 2; -#else /* !FULL_UNROLL */ - /* - * Nr - 1 full rounds: - */ - r = Nr >> 1; - for (;;) { - t0 = - Te0[(s0 >> 24) ] ^ - Te1[(s1 >> 16) & 0xff] ^ - Te2[(s2 >> 8) & 0xff] ^ - Te3[(s3 ) & 0xff] ^ - rk[4]; - t1 = - Te0[(s1 >> 24) ] ^ - Te1[(s2 >> 16) & 0xff] ^ - Te2[(s3 >> 8) & 0xff] ^ - Te3[(s0 ) & 0xff] ^ - rk[5]; - t2 = - Te0[(s2 >> 24) ] ^ - Te1[(s3 >> 16) & 0xff] ^ - Te2[(s0 >> 8) & 0xff] ^ - Te3[(s1 ) & 0xff] ^ - rk[6]; - t3 = - Te0[(s3 >> 24) ] ^ - Te1[(s0 >> 16) & 0xff] ^ - Te2[(s1 >> 8) & 0xff] ^ - Te3[(s2 ) & 0xff] ^ - rk[7]; - - rk += 8; - if (--r == 0) { - break; - } - - s0 = - Te0[(t0 >> 24) ] ^ - Te1[(t1 >> 16) & 0xff] ^ - Te2[(t2 >> 8) & 0xff] ^ - Te3[(t3 ) & 0xff] ^ - rk[0]; - s1 = - Te0[(t1 >> 24) ] ^ - Te1[(t2 >> 16) & 0xff] ^ - Te2[(t3 >> 8) & 0xff] ^ - Te3[(t0 ) & 0xff] ^ - rk[1]; - s2 = - Te0[(t2 >> 24) ] ^ - Te1[(t3 >> 16) & 0xff] ^ - Te2[(t0 >> 8) & 0xff] ^ - Te3[(t1 ) & 0xff] ^ - rk[2]; - s3 = - Te0[(t3 >> 24) ] ^ - Te1[(t0 >> 16) & 0xff] ^ - Te2[(t1 >> 8) & 0xff] ^ - Te3[(t2 ) & 0xff] ^ - rk[3]; - } -#endif /* ?FULL_UNROLL */ - /* - * apply last round and - * map cipher state to byte array block: - */ - s0 = - (Te4[(t0 >> 24) ] & 0xff000000) ^ - (Te4[(t1 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(t2 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(t3 ) & 0xff] & 0x000000ff) ^ - rk[0]; - PUTU32(ct , s0); - s1 = - (Te4[(t1 >> 24) ] & 0xff000000) ^ - (Te4[(t2 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(t3 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(t0 ) & 0xff] & 0x000000ff) ^ - rk[1]; - PUTU32(ct + 4, s1); - s2 = - (Te4[(t2 >> 24) ] & 0xff000000) ^ - (Te4[(t3 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(t0 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(t1 ) & 0xff] & 0x000000ff) ^ - rk[2]; - PUTU32(ct + 8, s2); - s3 = - (Te4[(t3 >> 24) ] & 0xff000000) ^ - (Te4[(t0 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(t1 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(t2 ) & 0xff] & 0x000000ff) ^ - rk[3]; - PUTU32(ct + 12, s3); -} - -void rijndaelDecrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 ct[16], u8 pt[16]) { - u32 s0, s1, s2, s3, t0, t1, t2, t3; -#ifndef FULL_UNROLL - int r; -#endif /* ?FULL_UNROLL */ - - /* - * map byte array block to cipher state - * and add initial round key: - */ - s0 = GETU32(ct ) ^ rk[0]; - s1 = GETU32(ct + 4) ^ rk[1]; - s2 = GETU32(ct + 8) ^ rk[2]; - s3 = GETU32(ct + 12) ^ rk[3]; -#ifdef FULL_UNROLL - /* round 1: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[ 4]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[ 5]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[ 6]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[ 7]; - /* round 2: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[ 8]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[ 9]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[10]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[11]; - /* round 3: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[12]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[13]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[14]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[15]; - /* round 4: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[16]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[17]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[18]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[19]; - /* round 5: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[20]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[21]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[22]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[23]; - /* round 6: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[24]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[25]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[26]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[27]; - /* round 7: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[28]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[29]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[30]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[31]; - /* round 8: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[32]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[33]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[34]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[35]; - /* round 9: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[36]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[37]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[38]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[39]; - if (Nr > 10) { - /* round 10: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[40]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[41]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[42]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[43]; - /* round 11: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[44]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[45]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[46]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[47]; - if (Nr > 12) { - /* round 12: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[48]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[49]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[50]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[51]; - /* round 13: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[52]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[53]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[54]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[55]; - } - } - rk += Nr << 2; -#else /* !FULL_UNROLL */ - /* - * Nr - 1 full rounds: - */ - r = Nr >> 1; - for (;;) { - t0 = - Td0[(s0 >> 24) ] ^ - Td1[(s3 >> 16) & 0xff] ^ - Td2[(s2 >> 8) & 0xff] ^ - Td3[(s1 ) & 0xff] ^ - rk[4]; - t1 = - Td0[(s1 >> 24) ] ^ - Td1[(s0 >> 16) & 0xff] ^ - Td2[(s3 >> 8) & 0xff] ^ - Td3[(s2 ) & 0xff] ^ - rk[5]; - t2 = - Td0[(s2 >> 24) ] ^ - Td1[(s1 >> 16) & 0xff] ^ - Td2[(s0 >> 8) & 0xff] ^ - Td3[(s3 ) & 0xff] ^ - rk[6]; - t3 = - Td0[(s3 >> 24) ] ^ - Td1[(s2 >> 16) & 0xff] ^ - Td2[(s1 >> 8) & 0xff] ^ - Td3[(s0 ) & 0xff] ^ - rk[7]; - - rk += 8; - if (--r == 0) { - break; - } - - s0 = - Td0[(t0 >> 24) ] ^ - Td1[(t3 >> 16) & 0xff] ^ - Td2[(t2 >> 8) & 0xff] ^ - Td3[(t1 ) & 0xff] ^ - rk[0]; - s1 = - Td0[(t1 >> 24) ] ^ - Td1[(t0 >> 16) & 0xff] ^ - Td2[(t3 >> 8) & 0xff] ^ - Td3[(t2 ) & 0xff] ^ - rk[1]; - s2 = - Td0[(t2 >> 24) ] ^ - Td1[(t1 >> 16) & 0xff] ^ - Td2[(t0 >> 8) & 0xff] ^ - Td3[(t3 ) & 0xff] ^ - rk[2]; - s3 = - Td0[(t3 >> 24) ] ^ - Td1[(t2 >> 16) & 0xff] ^ - Td2[(t1 >> 8) & 0xff] ^ - Td3[(t0 ) & 0xff] ^ - rk[3]; - } -#endif /* ?FULL_UNROLL */ - /* - * apply last round and - * map cipher state to byte array block: - */ - s0 = - (Td4[(t0 >> 24) ] & 0xff000000) ^ - (Td4[(t3 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(t2 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(t1 ) & 0xff] & 0x000000ff) ^ - rk[0]; - PUTU32(pt , s0); - s1 = - (Td4[(t1 >> 24) ] & 0xff000000) ^ - (Td4[(t0 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(t3 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(t2 ) & 0xff] & 0x000000ff) ^ - rk[1]; - PUTU32(pt + 4, s1); - s2 = - (Td4[(t2 >> 24) ] & 0xff000000) ^ - (Td4[(t1 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(t0 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(t3 ) & 0xff] & 0x000000ff) ^ - rk[2]; - PUTU32(pt + 8, s2); - s3 = - (Td4[(t3 >> 24) ] & 0xff000000) ^ - (Td4[(t2 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(t1 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(t0 ) & 0xff] & 0x000000ff) ^ - rk[3]; - PUTU32(pt + 12, s3); -} - -#endif Index: trunk/src/rijndael-api-fst.c =================================================================== --- trunk/src/rijndael-api-fst.c (revision 591) +++ trunk/src/rijndael-api-fst.c (revision 1) @@ -1,408 +1,319 @@ -/* $NetBSD: rijndael-api-fst.c,v 1.24 2011/05/14 16:46:55 jmmv Exp $ */ - -/** - * rijndael-api-fst.c +/* + * rijndael-api-fst.c v2.3 April '2000 * - * @version 2.9 (December 2000) + * Optimised ANSI C code * - * Optimised ANSI C code for the Rijndael cipher (now AES) + * authors: v1.0: Antoon Bosselaers + * v2.0: Vincent Rijmen + * v2.1: Vincent Rijmen + * v2.2: Vincent Rijmen + * v2.3: Paulo Barreto + * v2.4: Vincent Rijmen * - * @author Vincent Rijmen - * @author Antoon Bosselaers - * @author Paulo Barreto - * - * This code is hereby placed in the public domain. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Acknowledgements: - * - * We are deeply indebted to the following people for their bug reports, - * fixes, and improvement suggestions to this implementation. Though we - * tried to list all contributions, we apologise in advance for any - * missing reference. - * - * Andrew Bales - * Markus Friedl - * John Skodon + * This code is placed in the public domain. */ + #include "config_xor.h" +#include +#include #include #include - #ifdef SH_ENCRYPT +#include "rijndael-alg-fst.h" #include "rijndael-api-fst.h" -static void xor16(u8 *d, const u8 *a, const u8* b) -{ - size_t i; - - for (i = 0; i < 4; i++) { - *d++ = *a++ ^ *b++; - *d++ = *a++ ^ *b++; - *d++ = *a++ ^ *b++; - *d++ = *a++ ^ *b++; - } +int makeKey(keyInstance *key, RIJ_BYTE direction, int keyLen, char *keyMaterial) { + word8 k[MAXKC][4]; + int i; + char *keyMat; + + if (key == NULL) { + return BAD_KEY_INSTANCE; + } + + if ((direction == DIR_ENCRYPT) || (direction == DIR_DECRYPT)) { + key->direction = direction; + } else { + return BAD_KEY_DIR; + } + + if ((keyLen == 128) || (keyLen == 192) || (keyLen == 256)) { + key->keyLen = keyLen; + } else { + return BAD_KEY_MAT; + } + + if (keyMaterial != NULL) { + strncpy(key->keyMaterial, keyMaterial, keyLen/4); + } + + key->ROUNDS = keyLen/32 + 6; + + /* initialize key schedule: */ + keyMat = key->keyMaterial; +#ifndef BINARY_KEY_MATERIAL + for (i = 0; i < key->keyLen/8; i++) { + int t, j; + + t = *keyMat++; + if ((t >= '0') && (t <= '9')) j = (t - '0') << 4; + else if ((t >= 'a') && (t <= 'f')) j = (t - 'a' + 10) << 4; + else if ((t >= 'A') && (t <= 'F')) j = (t - 'A' + 10) << 4; + else return BAD_KEY_MAT; + + t = *keyMat++; + if ((t >= '0') && (t <= '9')) j ^= (t - '0'); + else if ((t >= 'a') && (t <= 'f')) j ^= (t - 'a' + 10); + else if ((t >= 'A') && (t <= 'F')) j ^= (t - 'A' + 10); + else return BAD_KEY_MAT; + + k[i >> 2][i & 3] = (word8)j; + } +#else + for (i = 0; i < key->keyLen/8; i++) { + k[i >> 2][i & 3] = (word8)keyMat[i]; + } +#endif /* ?BINARY_KEY_MATERIAL */ + rijndaelKeySched(k, key->keySched, key->ROUNDS); + if (direction == DIR_DECRYPT) { + rijndaelKeyEncToDec(key->keySched, key->ROUNDS); + } + + return TRUE; } -int -rijndael_makeKey(keyInstance *key, BYTE direction, int keyLen, - const char *keyMaterial) -{ - u8 cipherKey[RIJNDAEL_MAXKB]; - int i; - - if (key == NULL) { - return BAD_KEY_INSTANCE; - } - - if ((direction == DIR_ENCRYPT) || (direction == DIR_DECRYPT)) { - key->direction = direction; - } else { - return BAD_KEY_DIR; - } - - if ((keyLen == 128) || (keyLen == 192) || (keyLen == 256)) { - key->keyLen = keyLen; - } else { - return BAD_KEY_MAT; - } - - if (keyMaterial != NULL) { - char temp[RIJNDAEL_MAX_KEY_SIZE]; - for (i = 0; i < key->keyLen/8; i++) { - int t, j; - - t = *keyMaterial++; - if ((t >= '0') && (t <= '9')) j = (t - '0') << 4; - else if ((t >= 'a') && (t <= 'f')) j = (t - 'a' + 10) << 4; - else if ((t >= 'A') && (t <= 'F')) j = (t - 'A' + 10) << 4; - else return BAD_KEY_MAT; - - t = *keyMaterial++; - if ((t >= '0') && (t <= '9')) j ^= (t - '0'); - else if ((t >= 'a') && (t <= 'f')) j ^= (t - 'a' + 10); - else if ((t >= 'A') && (t <= 'F')) j ^= (t - 'A' + 10); - else return BAD_KEY_MAT; - - temp[i] = (u8)j; - } - - /* memcpy(key->keyMaterial, keyMaterial, keyLen/8); */ - /* cppcheck-suppress uninitvar */ - memcpy(key->keyMaterial, temp, keyLen/8); - } - - /* initialize key schedule: */ - memcpy(cipherKey, key->keyMaterial, keyLen/8); - if (direction == DIR_ENCRYPT) { - key->Nr = rijndaelKeySetupEnc(key->rk, cipherKey, keyLen); - } else { - key->Nr = rijndaelKeySetupDec(key->rk, cipherKey, keyLen); - } - rijndaelKeySetupEnc(key->ek, cipherKey, keyLen); - return TRUE; +int cipherInit(cipherInstance *cipher, RIJ_BYTE mode, char *IV) { + if ((mode == MODE_ECB) || (mode == MODE_CBC) || (mode == MODE_CFB1)) { + cipher->mode = mode; + } else { + return BAD_CIPHER_MODE; + } + if (IV != NULL) { +#ifndef BINARY_KEY_MATERIAL + int i; + for (i = 0; i < MAX_IV_SIZE; i++) { + int t, j; + + t = IV[2*i]; + if ((t >= '0') && (t <= '9')) j = (t - '0') << 4; + else if ((t >= 'a') && (t <= 'f')) j = (t - 'a' + 10) << 4; + else if ((t >= 'A') && (t <= 'F')) j = (t - 'A' + 10) << 4; + else return BAD_CIPHER_INSTANCE; + + t = IV[2*i+1]; + if ((t >= '0') && (t <= '9')) j ^= (t - '0'); + else if ((t >= 'a') && (t <= 'f')) j ^= (t - 'a' + 10); + else if ((t >= 'A') && (t <= 'F')) j ^= (t - 'A' + 10); + else return BAD_CIPHER_INSTANCE; + + cipher->IV[i] = (word8)j; + } +#else + memcpy(cipher->IV, IV, MAX_IV_SIZE); +#endif /* ?BINARY_KEY_MATERIAL */ + } else { + memset(cipher->IV, 0, MAX_IV_SIZE); + } + return TRUE; } -int -rijndael_cipherInit(cipherInstance *cipher, BYTE mode, const char *IV) -{ - if ((mode == MODE_ECB) || (mode == MODE_CBC) || (mode == MODE_CFB1)) { - cipher->mode = mode; - } else { - return BAD_CIPHER_MODE; - } - if (IV != NULL) { - memcpy(cipher->IV, IV, RIJNDAEL_MAX_IV_SIZE); - } else { - memset(cipher->IV, 0, RIJNDAEL_MAX_IV_SIZE); - } - return TRUE; +int blockEncrypt(cipherInstance *cipher, keyInstance *key, + RIJ_BYTE *input, int inputLen, RIJ_BYTE *outBuffer) { + int i, k, numBlocks; + word8 block[16], iv[4][4]; + + if (cipher == NULL || + key == NULL || + key->direction == DIR_DECRYPT) { + return BAD_CIPHER_STATE; + } + if (input == NULL || inputLen <= 0) { + return 0; /* nothing to do */ + } + + numBlocks = inputLen/128; + + switch (cipher->mode) { + case MODE_ECB: + for (i = numBlocks; i > 0; i--) { + rijndaelEncrypt(input, outBuffer, key->keySched, key->ROUNDS); + input += 16; + outBuffer += 16; + } + break; + + case MODE_CBC: + /* fix the memory alignment for HP-UX 10.20 + * R. Wichmann Mon Jun 18 22:36:55 CEST 2001 + */ +#if STRICT_ALIGN + memcpy(iv, cipher->IV, 16); + ((word32*)block)[0] = ((word32*)iv)[0] ^ ((word32*)input)[0]; + ((word32*)block)[1] = ((word32*)iv)[1] ^ ((word32*)input)[1]; + ((word32*)block)[2] = ((word32*)iv)[2] ^ ((word32*)input)[2]; + ((word32*)block)[3] = ((word32*)iv)[3] ^ ((word32*)input)[3]; +#else /* !STRICT_ALIGN */ + ((word32*)block)[0] = ((word32*)cipher->IV)[0] ^ ((word32*)input)[0]; + ((word32*)block)[1] = ((word32*)cipher->IV)[1] ^ ((word32*)input)[1]; + ((word32*)block)[2] = ((word32*)cipher->IV)[2] ^ ((word32*)input)[2]; + ((word32*)block)[3] = ((word32*)cipher->IV)[3] ^ ((word32*)input)[3]; +#endif /* ?STRICT_ALIGN */ + rijndaelEncrypt(block, outBuffer, key->keySched, key->ROUNDS); + input += 16; + for (i = numBlocks - 1; i > 0; i--) { + ((word32*)block)[0] = ((word32*)outBuffer)[0] ^ ((word32*)input)[0]; + ((word32*)block)[1] = ((word32*)outBuffer)[1] ^ ((word32*)input)[1]; + ((word32*)block)[2] = ((word32*)outBuffer)[2] ^ ((word32*)input)[2]; + ((word32*)block)[3] = ((word32*)outBuffer)[3] ^ ((word32*)input)[3]; + outBuffer += 16; + rijndaelEncrypt(block, outBuffer, key->keySched, key->ROUNDS); + input += 16; + } + break; + + case MODE_CFB1: +#if STRICT_ALIGN + memcpy(iv, cipher->IV, 16); +#else /* !STRICT_ALIGN */ + *((word32*)iv[0]) = *((word32*)(cipher->IV )); + *((word32*)iv[1]) = *((word32*)(cipher->IV+ 4)); + *((word32*)iv[2]) = *((word32*)(cipher->IV+ 8)); + *((word32*)iv[3]) = *((word32*)(cipher->IV+12)); +#endif /* ?STRICT_ALIGN */ + for (i = numBlocks; i > 0; i--) { + for (k = 0; k < 128; k++) { + *((word32*) block ) = *((word32*)iv[0]); + *((word32*)(block+ 4)) = *((word32*)iv[1]); + *((word32*)(block+ 8)) = *((word32*)iv[2]); + *((word32*)(block+12)) = *((word32*)iv[3]); + rijndaelEncrypt(block, block, key->keySched, key->ROUNDS); + outBuffer[k/8] ^= (block[0] & 0x80) >> (k & 7); + iv[0][0] = (iv[0][0] << 1) | (iv[0][1] >> 7); + iv[0][1] = (iv[0][1] << 1) | (iv[0][2] >> 7); + iv[0][2] = (iv[0][2] << 1) | (iv[0][3] >> 7); + iv[0][3] = (iv[0][3] << 1) | (iv[1][0] >> 7); + iv[1][0] = (iv[1][0] << 1) | (iv[1][1] >> 7); + iv[1][1] = (iv[1][1] << 1) | (iv[1][2] >> 7); + iv[1][2] = (iv[1][2] << 1) | (iv[1][3] >> 7); + iv[1][3] = (iv[1][3] << 1) | (iv[2][0] >> 7); + iv[2][0] = (iv[2][0] << 1) | (iv[2][1] >> 7); + iv[2][1] = (iv[2][1] << 1) | (iv[2][2] >> 7); + iv[2][2] = (iv[2][2] << 1) | (iv[2][3] >> 7); + iv[2][3] = (iv[2][3] << 1) | (iv[3][0] >> 7); + iv[3][0] = (iv[3][0] << 1) | (iv[3][1] >> 7); + iv[3][1] = (iv[3][1] << 1) | (iv[3][2] >> 7); + iv[3][2] = (iv[3][2] << 1) | (iv[3][3] >> 7); + iv[3][3] = (iv[3][3] << 1) | ((outBuffer[k/8] >> (7-(k&7))) & 1); + } + } + break; + + default: + return BAD_CIPHER_STATE; + } + + return 128*numBlocks; } -int -rijndael_blockEncrypt(cipherInstance *cipher, keyInstance *key, - const BYTE *input, int inputLen, BYTE *outBuffer) -{ - int i, k, t, numBlocks; - u8 block[16], *iv; - - if (cipher == NULL || - key == NULL || - key->direction == DIR_DECRYPT) { - return BAD_CIPHER_STATE; - } - if (input == NULL || inputLen <= 0) { - return 0; /* nothing to do */ - } - - numBlocks = inputLen/128; - - switch (cipher->mode) { - case MODE_ECB: - for (i = numBlocks; i > 0; i--) { - rijndaelEncrypt(key->rk, key->Nr, input, outBuffer); - input += 16; - outBuffer += 16; - } - break; - - case MODE_CBC: - iv = (u8 *)cipher->IV; - for (i = numBlocks; i > 0; i--) { - xor16(block, input, iv); - rijndaelEncrypt(key->rk, key->Nr, block, outBuffer); - iv = outBuffer; - input += 16; - outBuffer += 16; - } - break; - - case MODE_CFB1: - iv = (u8 *)cipher->IV; - for (i = numBlocks; i > 0; i--) { - memcpy(outBuffer, input, 16); - for (k = 0; k < 128; k++) { - rijndaelEncrypt(key->ek, key->Nr, iv, block); - outBuffer[k >> 3] ^= - (block[0] & 0x80U) >> (k & 7); - for (t = 0; t < 15; t++) { - iv[t] = (iv[t] << 1) | (iv[t + 1] >> 7); - } - iv[15] = (iv[15] << 1) | - ((outBuffer[k >> 3] >> (7 - (k & 7))) & 1); - } - outBuffer += 16; - input += 16; - } - break; - - default: - return BAD_CIPHER_STATE; - } - - return 128 * numBlocks; +int blockDecrypt(cipherInstance *cipher, keyInstance *key, + RIJ_BYTE *input, int inputLen, RIJ_BYTE *outBuffer) { + int i, k, numBlocks; + word8 block[16], iv[4][4]; + + if (cipher == NULL || + key == NULL || + ((cipher->mode != MODE_CFB1) && (key->direction == DIR_ENCRYPT))) { + return BAD_CIPHER_STATE; + } + if (input == NULL || inputLen <= 0) { + return 0; /* nothing to do */ + } + + numBlocks = inputLen/128; + + switch (cipher->mode) { + case MODE_ECB: + for (i = numBlocks; i > 0; i--) { + rijndaelDecrypt(input, outBuffer, key->keySched, key->ROUNDS); + input += 16; + outBuffer += 16; + } + break; + + case MODE_CBC: +#if STRICT_ALIGN + memcpy(iv, cipher->IV, 16); +#else + *((word32*)iv[0]) = *((word32*)(cipher->IV )); + *((word32*)iv[1]) = *((word32*)(cipher->IV+ 4)); + *((word32*)iv[2]) = *((word32*)(cipher->IV+ 8)); + *((word32*)iv[3]) = *((word32*)(cipher->IV+12)); +#endif + for (i = numBlocks; i > 0; i--) { + rijndaelDecrypt(input, block, key->keySched, key->ROUNDS); + ((word32*)block)[0] ^= *((word32*)iv[0]); + ((word32*)block)[1] ^= *((word32*)iv[1]); + ((word32*)block)[2] ^= *((word32*)iv[2]); + ((word32*)block)[3] ^= *((word32*)iv[3]); +#if STRICT_ALIGN + memcpy(iv, input, 16); + memcpy(outBuffer, block, 16); +#else + *((word32*)iv[0]) = ((word32*)input)[0]; ((word32*)outBuffer)[0] = ((word32*)block)[0]; + *((word32*)iv[1]) = ((word32*)input)[1]; ((word32*)outBuffer)[1] = ((word32*)block)[1]; + *((word32*)iv[2]) = ((word32*)input)[2]; ((word32*)outBuffer)[2] = ((word32*)block)[2]; + *((word32*)iv[3]) = ((word32*)input)[3]; ((word32*)outBuffer)[3] = ((word32*)block)[3]; +#endif + input += 16; + outBuffer += 16; + } + break; + + case MODE_CFB1: +#if STRICT_ALIGN + memcpy(iv, cipher->IV, 16); +#else + *((word32*)iv[0]) = *((word32*)(cipher->IV)); + *((word32*)iv[1]) = *((word32*)(cipher->IV+ 4)); + *((word32*)iv[2]) = *((word32*)(cipher->IV+ 8)); + *((word32*)iv[3]) = *((word32*)(cipher->IV+12)); +#endif + for (i = numBlocks; i > 0; i--) { + for (k = 0; k < 128; k++) { + *((word32*) block ) = *((word32*)iv[0]); + *((word32*)(block+ 4)) = *((word32*)iv[1]); + *((word32*)(block+ 8)) = *((word32*)iv[2]); + *((word32*)(block+12)) = *((word32*)iv[3]); + rijndaelEncrypt(block, block, key->keySched, key->ROUNDS); + iv[0][0] = (iv[0][0] << 1) | (iv[0][1] >> 7); + iv[0][1] = (iv[0][1] << 1) | (iv[0][2] >> 7); + iv[0][2] = (iv[0][2] << 1) | (iv[0][3] >> 7); + iv[0][3] = (iv[0][3] << 1) | (iv[1][0] >> 7); + iv[1][0] = (iv[1][0] << 1) | (iv[1][1] >> 7); + iv[1][1] = (iv[1][1] << 1) | (iv[1][2] >> 7); + iv[1][2] = (iv[1][2] << 1) | (iv[1][3] >> 7); + iv[1][3] = (iv[1][3] << 1) | (iv[2][0] >> 7); + iv[2][0] = (iv[2][0] << 1) | (iv[2][1] >> 7); + iv[2][1] = (iv[2][1] << 1) | (iv[2][2] >> 7); + iv[2][2] = (iv[2][2] << 1) | (iv[2][3] >> 7); + iv[2][3] = (iv[2][3] << 1) | (iv[3][0] >> 7); + iv[3][0] = (iv[3][0] << 1) | (iv[3][1] >> 7); + iv[3][1] = (iv[3][1] << 1) | (iv[3][2] >> 7); + iv[3][2] = (iv[3][2] << 1) | (iv[3][3] >> 7); + iv[3][3] = (iv[3][3] << 1) | ((input[k/8] >> (7-(k&7))) & 1); + outBuffer[k/8] ^= (block[0] & 0x80) >> (k & 7); + } + } + break; + + default: + return BAD_CIPHER_STATE; + } + + return 128*numBlocks; } -/** - * Encrypt data partitioned in octets, using RFC 2040-like padding. - * - * @param input data to be encrypted (octet sequence) - * @param inputOctets input length in octets (not bits) - * @param outBuffer encrypted output data - * - * @return length in octets (not bits) of the encrypted output buffer. - */ -int -rijndael_padEncrypt(cipherInstance *cipher, keyInstance *key, - const BYTE *input, int inputOctets, BYTE *outBuffer) -{ - int i, numBlocks, padLen; - u8 block[16], *iv; - - if (cipher == NULL || - key == NULL || - key->direction == DIR_DECRYPT) { - return BAD_CIPHER_STATE; - } - if (input == NULL || inputOctets <= 0) { - return 0; /* nothing to do */ - } - - numBlocks = inputOctets / 16; - - switch (cipher->mode) { - case MODE_ECB: - for (i = numBlocks; i > 0; i--) { - rijndaelEncrypt(key->rk, key->Nr, input, outBuffer); - input += 16; - outBuffer += 16; - } - padLen = 16 - (inputOctets - 16*numBlocks); - memcpy(block, input, 16 - padLen); - memset(block + 16 - padLen, padLen, padLen); - rijndaelEncrypt(key->rk, key->Nr, block, outBuffer); - break; - - case MODE_CBC: - iv = (u8 *)cipher->IV; - for (i = numBlocks; i > 0; i--) { - xor16(block, input, iv); - rijndaelEncrypt(key->rk, key->Nr, block, outBuffer); - iv = outBuffer; - input += 16; - outBuffer += 16; - } - padLen = 16 - (inputOctets - 16*numBlocks); - for (i = 0; i < 16 - padLen; i++) { - block[i] = input[i] ^ iv[i]; - } - for (i = 16 - padLen; i < 16; i++) { - block[i] = (BYTE)padLen ^ iv[i]; - } - rijndaelEncrypt(key->rk, key->Nr, block, outBuffer); - break; - - default: - return BAD_CIPHER_STATE; - } - - return 16 * (numBlocks + 1); -} - -int -rijndael_blockDecrypt(cipherInstance *cipher, keyInstance *key, - const BYTE *input, int inputLen, BYTE *outBuffer) -{ - int i, k, t, numBlocks; - u8 block[16], *iv; - - if (cipher == NULL || - key == NULL || - (cipher->mode != MODE_CFB1 && key->direction == DIR_ENCRYPT)) { - return BAD_CIPHER_STATE; - } - if (input == NULL || inputLen <= 0) { - return 0; /* nothing to do */ - } - - numBlocks = inputLen/128; - - switch (cipher->mode) { - case MODE_ECB: - for (i = numBlocks; i > 0; i--) { - rijndaelDecrypt(key->rk, key->Nr, input, outBuffer); - input += 16; - outBuffer += 16; - } - break; - - case MODE_CBC: - iv = (u8 *)cipher->IV; - for (i = numBlocks; i > 0; i--) { - rijndaelDecrypt(key->rk, key->Nr, input, block); - xor16(block, block, iv); - if (numBlocks > 1) - memcpy(cipher->IV, input, 16); - memcpy(outBuffer, block, 16); - input += 16; - outBuffer += 16; - } - break; - - case MODE_CFB1: - iv = (u8 *)cipher->IV; - for (i = numBlocks; i > 0; i--) { - memcpy(outBuffer, input, 16); - for (k = 0; k < 128; k++) { - rijndaelEncrypt(key->ek, key->Nr, iv, block); - for (t = 0; t < 15; t++) { - iv[t] = (iv[t] << 1) | (iv[t + 1] >> 7); - } - iv[15] = (iv[15] << 1) | - ((input[k >> 3] >> (7 - (k & 7))) & 1); - outBuffer[k >> 3] ^= (block[0] & 0x80U) >> - (k & 7); - } - outBuffer += 16; - input += 16; - } - break; - - default: - return BAD_CIPHER_STATE; - } - - return 128 * numBlocks; -} - -int -rijndael_padDecrypt(cipherInstance *cipher, keyInstance *key, - const BYTE *input, int inputOctets, BYTE *outBuffer) -{ - int i, numBlocks, padLen; - u8 block[16], *iv; - - if (cipher == NULL || - key == NULL || - key->direction == DIR_ENCRYPT) { - return BAD_CIPHER_STATE; - } - if (input == NULL || inputOctets <= 0) { - return 0; /* nothing to do */ - } - if (inputOctets % 16 != 0) { - return BAD_DATA; - } - - numBlocks = inputOctets/16; - - switch (cipher->mode) { - case MODE_ECB: - /* all blocks but last */ - for (i = numBlocks - 1; i > 0; i--) { - rijndaelDecrypt(key->rk, key->Nr, input, outBuffer); - input += 16; - outBuffer += 16; - } - /* last block */ - rijndaelDecrypt(key->rk, key->Nr, input, block); - padLen = block[15]; - if (padLen >= 16) { - return BAD_DATA; - } - for (i = 16 - padLen; i < 16; i++) { - if (block[i] != padLen) { - return BAD_DATA; - } - } - memcpy(outBuffer, block, 16 - padLen); - break; - - case MODE_CBC: - iv = (u8 *)cipher->IV; - /* all blocks but last */ - for (i = numBlocks - 1; i > 0; i--) { - rijndaelDecrypt(key->rk, key->Nr, input, block); - xor16(block, block, iv); - memcpy(cipher->IV, input, 16); - memcpy(outBuffer, block, 16); - input += 16; - outBuffer += 16; - } - /* last block */ - rijndaelDecrypt(key->rk, key->Nr, input, block); - xor16(block, block, iv); - padLen = block[15]; - if (padLen <= 0 || padLen > 16) { - return BAD_DATA; - } - for (i = 16 - padLen; i < 16; i++) { - if (block[i] != padLen) { - return BAD_DATA; - } - } - memcpy(outBuffer, block, 16 - padLen); - break; - - default: - return BAD_CIPHER_STATE; - } - - return 16 * numBlocks - padLen; -} - #endif Index: trunk/src/samhain.c =================================================================== --- trunk/src/samhain.c (revision 591) +++ trunk/src/samhain.c (revision 1) @@ -34,8 +34,15 @@ #include + +#if TIME_WITH_SYS_TIME +#include +#include +#else #if HAVE_SYS_TIME_H #include -#endif +#else #include +#endif +#endif #ifdef HAVE_MEMORY_H @@ -56,21 +63,18 @@ #include "samhain.h" -#include "sh_pthread.h" +#include "sh_files.h" #include "sh_utils.h" #include "sh_error.h" #include "sh_unix.h" -#include "sh_files.h" #include "sh_getopt.h" #include "sh_readconf.h" #include "sh_hash.h" -#include "sh_dbIO.h" -#include "sh_restrict.h" - -#include "sh_nmail.h" + +#include "sh_mail.h" #include "sh_tiger.h" -#include "sh_sig.h" +#include "sh_gpg.h" #include "sh_mem.h" -#include "sh_xfer.h" +#include "sh_forward.h" #include "sh_tools.h" #include "sh_hash.h" @@ -82,5 +86,4 @@ #include "sh_ignore.h" #include "sh_prelink.h" -#include "sh_sem.h" #endif @@ -110,12 +113,8 @@ volatile int sh_global_suspend_flag; volatile int sig_fresh_trail; /* SIGIOT */ -volatile int sh_thread_pause_flag = S_FALSE; volatile int sig_config_read_again; /* SIGHUP */ volatile int sig_terminate; /* SIGQUIT */ volatile int sig_termfast; /* SIGTERM */ volatile int sig_force_check; /* SIGTTOU */ -volatile int sig_force_silent; /* SIGTSTP */ -volatile int sh_global_check_silent; -volatile int sh_load_delta_flag; long int eintr__result; char sh_sig_msg[SH_MINIBUF]; @@ -138,60 +137,4 @@ #endif -#ifdef HAVE_PTHREAD -struct gt { - size_t g_count; - char * g_glob; -}; - -pthread_key_t g_key; - -int sh_g_thread() -{ - struct gt * ptr = calloc(1,sizeof(struct gt)); - if (!ptr) - return -1; - ptr->g_count = 0; - ptr->g_glob = calloc(1, SH_MAX_GLOBS * (GLOB_LEN+1)); - if (!(ptr->g_glob)) - { - free(ptr); - return -1; - } - return pthread_setspecific(g_key, ptr); -} - -void sh_g_destroy(void * data) -{ - struct gt * ptr = (struct gt *) data; - free(ptr->g_glob); - free(ptr); - return; -} - -void sh_g_init(void) -{ -#if !defined(USE_SYSTEM_MALLOC) && defined(USE_MALLOC_LOCK) - extern int dnmalloc_pthread_init(void); - dnmalloc_pthread_init(); -#endif - - if (0 != pthread_key_create(&g_key, sh_g_destroy)) - { - perror("1"); - exit(EXIT_FAILURE); - } - - if (0 != sh_g_thread()) - { - perror("2"); - exit(EXIT_FAILURE); - } - return; -} -#define SH_G_INIT sh_g_init() -#else -#define SH_G_INIT ((void)0) -#endif - char * globber(const char * str) { @@ -199,24 +142,14 @@ size_t j; -#ifndef HAVE_PTHREAD + static size_t items = 0; static size_t count = 0; static char glob[SH_MAX_GLOBS * (GLOB_LEN+1)]; -#else - struct gt * ptr = pthread_getspecific(g_key); - size_t count; - char * glob; - - if (ptr) { - count = ptr->g_count; - glob = ptr->g_glob; - } else { + + if (str == NULL) return NULL; - } -#endif - - if (str != NULL) + else j = strlen(str); - else - return NULL; + + ++items; ASSERT((j <= GLOB_LEN), _("j <= GLOB_LEN")) @@ -230,4 +163,5 @@ { count = 0; + items = 0; } @@ -242,9 +176,5 @@ i = count; -#ifdef HAVE_PTHREAD - ptr->g_count = count + j + 1; -#else count = count + j + 1; -#endif return &glob[i]; } @@ -263,7 +193,4 @@ } -#else -/* not stealth */ -#define SH_G_INIT ((void)0) #endif @@ -311,7 +238,4 @@ ErrFlag[0] |= (1 << 11); #endif - - sh.delayload = 0; - #ifdef MKA_13 ErrFlag[0] |= (1 << 12); @@ -338,12 +262,5 @@ sig_termfast = 0; /* SIGTERM */ sig_force_check = 0; /* SIGTTOU */ - sig_force_silent = 0; /* SIGTSTP */ - sh_global_check_silent = 0; - sh_load_delta_flag = 0; - sh_sig_msg[4] = '\0'; - sh_sig_msg[3] = 'e'; - sh_sig_msg[2] = 'n'; - sh_sig_msg[1] = 'o'; - sh_sig_msg[0] = 'N'; + strcpy ( sh_sig_msg, _("None")); #ifdef MKB_01 @@ -380,8 +297,4 @@ #endif - sh.pid = (UINT64) getpid(); - - sh.outpath = NULL; - /* The flags. */ @@ -390,5 +303,4 @@ sh.flag.update = S_FALSE; sh.flag.opts = S_FALSE; - sh.flag.started = S_FALSE; if (is_samhainctl_init == S_FALSE) sh.flag.isdaemon = S_FALSE; @@ -406,5 +318,4 @@ sh.flag.hidefile = S_FALSE; sh.flag.loop = S_FALSE; - sh.flag.inotify = 0; #ifdef MKB_09 @@ -435,10 +346,6 @@ /* The stats. */ - sh.statistics.bytes_speed = 0; - sh.statistics.bytes_hashed = 0; - sh.statistics.files_report = 0; - sh.statistics.files_error = 0; - sh.statistics.files_nodir = 0; - + sh.statistics.bytes_speed = 0; + sh.statistics.bytes_hashed = 0; sh.statistics.mail_success = 0; sh.statistics.mail_failed = 0; @@ -475,5 +382,5 @@ */ (void) sl_strlcpy (sh.host.name, _("localhost"), SH_MINIBUF); - sh.host.system[0] = '\0'; /* flawfinder: ignore *//* ff bug */ + sh.host.system[0] = '\0'; sh.host.release[0] = '\0'; sh.host.machine[0] = '\0'; @@ -541,26 +448,14 @@ */ #if defined(SH_WITH_MAIL) - if (0 != strcmp (DEFAULT_MAILADDRESS, _("NULL"))) - { -#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_STRTOK_R) - char * saveptr; - (void) sl_strncpy(q, DEFAULT_MAILADDRESS, SH_PATHBUF); - p = strtok_r (q, ", \t", &saveptr); - if (p) - { - (void) sh_nmail_add_compiled_recipient (p); - while (NULL != (p = strtok_r (NULL, ", \t", &saveptr))) - (void) sh_nmail_add_compiled_recipient (p); - } -#else + if (0 == strcmp (DEFAULT_MAILADDRESS, _("NULL"))) + { (void) sl_strncpy(q, DEFAULT_MAILADDRESS, SH_PATHBUF); p = strtok (q, ", \t"); if (p) { - (void) sh_nmail_add_compiled_recipient (p); + (void) sh_mail_setaddress_int (p); while (NULL != (p = strtok (NULL, ", \t"))) - (void) sh_nmail_add_compiled_recipient (p); - } -#endif + (void) sh_mail_setaddress_int (p); + } } #endif @@ -647,54 +542,48 @@ sh.looptime = 60; -#ifdef SCREW_IT_UP - sh.sigtrap_max_duration = 500000; /* 500ms */ -#endif - /* The struct to hold privileged information. */ - skey = calloc(1,sizeof(sh_key_t)); - if (skey != NULL) - { - - skey->mlock_failed = S_FALSE; - skey->rngI = BAD; - /* properly initialized later - */ - skey->rng0[0] = 0x03; skey->rng0[1] = 0x09; skey->rng0[2] = 0x17; - skey->rng1[0] = 0x03; skey->rng1[1] = 0x09; skey->rng1[2] = 0x17; - skey->rng2[0] = 0x03; skey->rng2[1] = 0x09; skey->rng2[2] = 0x17; - - for (i = 0; i < KEY_BYT; ++i) - skey->poolv[i] = '\0'; - - skey->poolc = 0; - - skey->ErrFlag[0] = ErrFlag[0]; - ErrFlag[0] = 0; - skey->ErrFlag[1] = ErrFlag[1]; - ErrFlag[1] = 0; - - dez = &(TcpFlag[POS_TF-1][0]); - for (i = 0; i < PW_LEN; ++i) - { - skey->pw[i] = (char) (*dez); - (*dez) = '\0'; - ++dez; - } - - skey->sh_sockpass[0] = '\0'; - skey->sigkey_old[0] = '\0'; - skey->sigkey_new[0] = '\0'; - skey->mailkey_old[0] = '\0'; - skey->mailkey_new[0] = '\0'; - skey->crypt[0] = '\0'; /* flawfinder: ignore *//* ff bug */ - skey->session[0] = '\0'; - skey->vernam[0] = '\0'; - } - else + skey = (sh_key_t *) malloc (sizeof(sh_key_t)); + if (skey == NULL) { perror(_("sh_init")); _exit (EXIT_FAILURE); } + + skey->mlock_failed = SL_FALSE; + skey->rngI = BAD; + /* properly initialized later + */ + skey->rng0[0] = 0x03; skey->rng0[1] = 0x09; skey->rng0[2] = 0x17; + skey->rng1[0] = 0x03; skey->rng1[1] = 0x09; skey->rng1[2] = 0x17; + skey->rng2[0] = 0x03; skey->rng2[1] = 0x09; skey->rng2[2] = 0x17; + + for (i = 0; i < KEY_BYT; ++i) + skey->poolv[i] = '\0'; + + skey->poolc = 0; + + skey->ErrFlag[0] = ErrFlag[0]; + ErrFlag[0] = 0; + skey->ErrFlag[1] = ErrFlag[1]; + ErrFlag[1] = 0; + + dez = &(TcpFlag[POS_TF-1][0]); + for (i = 0; i < PW_LEN; ++i) + { + skey->pw[i] = (char) (*dez); + (*dez) = '\0'; + ++dez; + } + + skey->sh_sockpass[0] = '\0'; + skey->sigkey_old[0] = '\0'; + skey->sigkey_new[0] = '\0'; + skey->mailkey_old[0] = '\0'; + skey->mailkey_new[0] = '\0'; + skey->crypt[0] = '\0'; + skey->session[0] = '\0'; + skey->vernam[0] = '\0'; + sh_unix_memlock(); @@ -724,7 +613,8 @@ #endif #if defined(SH_WITH_SERVER) - extern int sh_socket_remove (void); - extern int sh_html_zero(); -#endif + extern int sh_socket_remove (); +#endif + + SL_ENTER(_("exit_handler")); #if defined(SH_WITH_SERVER) @@ -735,10 +625,7 @@ for (modnum = 0; modList[modnum].name != NULL; ++modnum) { - if (modList[modnum].initval == SH_MOD_ACTIVE) + if (modList[modnum].initval == GOOD) (void) modList[modnum].mod_cleanup(); } -#ifdef HAVE_PTHREAD - sh_pthread_cancel_all(); -#endif #endif @@ -748,5 +635,5 @@ if (sh.mailNum.alarm_last > 0) { - (void) sh_nmail_flush (); + (void) sh_mail_msg (NULL); } #endif @@ -755,8 +642,5 @@ */ #if defined(SH_WITH_SERVER) - /* zero out the status file at exit, such that the status - * of client becomes unknown in the beltane interface - */ - sh_html_zero(); + sh_forward_html_write(); #endif @@ -767,27 +651,10 @@ sh_files_deldirstack (); sh_files_delfilestack (); - sh_files_delglobstack (); sh_hash_hashdelete(); - sh_files_hle_reg (NULL); - (void) sh_ignore_clean (); - /* - * Only flush on exit if running as deamon. - * Otherwise we couldn't run another instance - * while the deamon is running (would leave the - * deamon with flushed ruleset). - */ - if (sh.flag.isdaemon == S_TRUE) - { - sh_audit_delete_all (); - } #endif #if defined(SH_WITH_SERVER) - sh_xfer_free_all (); -#endif -#if defined(SH_WITH_MAIL) - sh_nmail_free(); + sh_forward_free_all (); #endif delete_cache(); - sh_userid_destroy (); sh_mem_stat(); #endif @@ -799,19 +666,9 @@ /* --- Checksum of executable. --- */ - { - volatile int sig_store = sig_termfast; - - sig_termfast = 0; - (void) sh_unix_self_check(); - sig_termfast = sig_store; - } + (void) sh_unix_self_check(); /* --- Exit Message. --- */ - if (sh.flag.exit == EXIT_FAILURE && !strcmp(sh_sig_msg, _("None"))) - sl_strlcpy(sh_sig_msg, _("exit_failure"), SH_MINIBUF); - if (sh.flag.exit == EXIT_SUCCESS && !strcmp(sh_sig_msg, _("None"))) - sl_strlcpy(sh_sig_msg, _("exit_success"), SH_MINIBUF); sh_error_handle ((-1), FIL__, __LINE__, sh.flag.exit, MSG_EXIT_NORMAL, sh.prg_name, sh_sig_msg); @@ -823,14 +680,16 @@ /* --- Restrict error logging to stderr. --- */ +#ifdef WITH_MESSAGE_QUEUE close_ipc (); +#endif sh_error_only_stderr (S_TRUE); + /* --- Remove lock, delete critical information. --- */ (void) sh_unix_rm_lock_file (sh.srvlog.name); - if (sh.flag.isdaemon == S_TRUE) - (void) sh_unix_rm_pid_file (); + (void) sh_unix_rm_pid_file (); if (skey != NULL) - memset (skey, 0, sizeof(sh_key_t)); + memset (skey, (int) '\0', sizeof(sh_key_t)); /* --- Exit. --- @@ -854,38 +713,26 @@ #if defined(__linux__) || defined(sun) || defined(__sun) || defined(__sun__) #include -static pid_t * procdirSamhain (void) +static pid_t * procdirSamhain () { - pid_t * pidlist; + pid_t * pidlist = malloc(sizeof(pid_t) * 65535); struct dirent * d; DIR * dp; long ino; struct stat buf; - int i; + int i = 0; pid_t pid, mypid = getpid(); char * tail; char exef[128]; + for (i = 0; i < 65535; ++i) pidlist[i] = 0; + i = 0; + if (0 != stat(SH_INSTALL_PATH, &buf)) - { - return NULL; - } + return NULL; ino = (long) buf.st_ino; - if (NULL == (dp = opendir(_("/proc")))) - { - /* cppcheck-suppress resourceLeak */ - return NULL; - } - - SH_MUTEX_LOCK(mutex_readdir); - - pidlist = calloc(1, sizeof(pid_t) * 65535); - if (!pidlist) - goto unlock_and_out; - - for (i = 0; i < 65535; ++i) pidlist[i] = 0; - - i = 0; + if (NULL == (dp = opendir("/proc"))) + return NULL; while (NULL != (d = readdir(dp)) && i < 65535) { @@ -908,14 +755,9 @@ } } - - unlock_and_out: - ; - SH_MUTEX_UNLOCK(mutex_readdir); - closedir(dp); return pidlist; } #else -static pid_t * procdirSamhain (void) +static pid_t * procdirSamhain () { return NULL; @@ -966,7 +808,7 @@ if (!fp) { if (errno != ENOENT) perror(_("fopen")); return 0; } - if (NULL == fgets(line, sizeof(line), fp)) - { perror(_("fgets")); (void) sl_fclose(FIL__, __LINE__, fp); return 0; } - (void) sl_fclose(FIL__, __LINE__, fp); + if (NULL == fgets(line, 255, fp)) + { perror(_("fgets")); (void) fclose(fp); return 0; } + (void) fclose(fp); p = line; while (*p == ' ' || *p == '\f' || *p == '\n' || @@ -1016,17 +858,18 @@ pid_t * pidlist; int i; -#ifdef WCONTINUED - int wflags = WNOHANG|WUNTRACED|WCONTINUED; -#else - int wflags = WNOHANG|WUNTRACED; -#endif - - fullpath = strdup (SH_INSTALL_PATH); + + + fullpath = malloc(strlen(SH_INSTALL_PATH)+1); if (fullpath == NULL) - { perror(_("strdup")); exit (1); } - - argp[0] = strdup (SH_INSTALL_PATH); + { perror(_("malloc")); exit (1); } + else + strcpy(fullpath, SH_INSTALL_PATH); /* known to fit */ + + argp[0] = malloc(strlen(SH_INSTALL_PATH)+1); if (argp[0] == NULL) - { perror(_("strdup")); exit (1); } + { perror(_("malloc")); exit (1); } + else + strcpy(argp[0], SH_INSTALL_PATH); /* known to fit */ + for (times = 1; times < 32; ++times) argp[times] = NULL; @@ -1036,7 +879,9 @@ for (times = 2; times < res; ++times) { - argp[times-1] = strdup (argv[times]); + argp[times-1] = malloc(strlen(argv[times])+1); if (argp[times-1] == NULL) - { perror(_("strdup")); exit (1); } + { perror(_("malloc")); exit (1); } + else + strcpy(argp[times-1], argv[times]); /* known to fit */ } @@ -1054,9 +899,9 @@ exit (1); case 0: - if (0 != sl_close_fd (FIL__, __LINE__, 0)) + if (0 != close (0)) { _exit(4); } - (void) execv(fullpath, argp); /* flawfinder: ignore *//* wtf? */ + (void) execv(fullpath, argp); if (errno == EPERM) _exit(4); @@ -1066,6 +911,6 @@ default: times = 0; - while (times < 300) { - respid = waitpid(pid, &status, wflags); + while (times < 64) { + respid = waitpid(pid, &status, WNOHANG|WUNTRACED); if ((pid_t)-1 == respid) { @@ -1075,5 +920,4 @@ else if (pid == respid) { -#ifndef USE_UNO if (0 != WIFEXITED(status)) { @@ -1083,12 +927,9 @@ else exit (1); -#else - exit (1); -#endif } ++times; (void) retry_msleep(1, 0); } - exit (0); /* assume that it runs ok */ + exit (1); } } @@ -1100,8 +941,5 @@ pidlist = procdirSamhain (); if (pid == 0 && NULL == pidlist) /* pid file not found */ - { - free(fullpath); - return (0); - } + return (0); status = 0; @@ -1118,5 +956,4 @@ } } - free(fullpath); if (status == 7) return 0; @@ -1155,5 +992,5 @@ } } - free(fullpath); /* silence smatch false positive */ + exit (1); /* no exit handler installed yet */ /*@notreached@*/ @@ -1185,5 +1022,5 @@ /* Add a new schedule to the linked list of schedules */ -static sh_schedule_t * sh_set_schedule_int (const char * str, +static sh_schedule_t * sh_set_schedule_int (char * str, sh_schedule_t * FileSchedIn, /*@out@*/ int * status) @@ -1198,5 +1035,5 @@ FileSchedIn = NULL; *status = 0; - SL_RETURN(NULL, _("sh_set_schedule_int")); + return 0; } @@ -1209,7 +1046,5 @@ SL_RETURN(FileSchedIn , _("sh_set_schedule_int")); } - else { - FileSched->next = FileSchedIn; - } + FileSched->next = FileSchedIn; SL_RETURN(FileSched , _("sh_set_schedule_int")); } @@ -1217,5 +1052,5 @@ /* Add a new schedule to the linked list FileSchedOne */ -int sh_set_schedule_one (const char * str) +int sh_set_schedule_one (char * str) { int status; @@ -1226,5 +1061,5 @@ /* Add a new schedule to the linked list FileSchedTwo */ -int sh_set_schedule_two (const char * str) +int sh_set_schedule_two (char * str) { int status; @@ -1233,285 +1068,4 @@ } -static int sh_flag_silent = S_FALSE; - -int sh_set_silent_full (const char * str) -{ - int status = sh_util_flagval(str, &sh_flag_silent); - return status; -} - - -void do_reconf() -{ - int status, modnum; - - sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_RECONF); - - sh_thread_pause_flag = S_TRUE; - - for (modnum = 0; modList[modnum].name != NULL; ++modnum) - { - if (0 != (SH_MODFL_NEEDPAUSED & modList[modnum].flags) && - modList[modnum].initval == SH_MOD_THREAD) - { - int count = 50; - while (count && 0 == (SH_MODFL_ISPAUSED & modList[modnum].flags)) - retry_msleep(0, 100), --count; - } - } - -#if defined(WITH_EXTERNAL) - /* delete list of external tasks - */ - (void) sh_ext_cleanup(); -#endif -#if defined(SH_WITH_MAIL) - sh_nmail_free(); -#endif - - /* delete the file list, make all database - * entries visible (allignore = FALSE) - */ - (void) sh_files_deldirstack (); - (void) sh_files_delfilestack (); - (void) sh_files_delglobstack (); - (void) sh_ignore_clean (); - (void) hash_full_tree (); - sh_audit_delete_all (); - - -#if defined(SH_WITH_CLIENT) - reset_count_dev_server(); -#endif -#if defined(SH_WITH_CLIENT) || defined(SH_STANDALONE) - sh_restrict_purge (); - - - FileSchedOne = free_sched(FileSchedOne); - FileSchedTwo = free_sched(FileSchedTwo); - - for (modnum = 0; modList[modnum].name != NULL; ++modnum) - { - /* sh_thread_pause_flag is true, and we block in lock - * until check has returned, so we are sure check will - * not run until sh_thread_pause_flag is set to false - */ - /* if (modList[modnum].initval >= SH_MOD_ACTIVE) */ - (void) modList[modnum].mod_reconf(); - } -#endif - - reset_count_dev_console(); - reset_count_dev_time(); - - (void) sh_unix_maskreset(); - -#ifdef RELOAD_DATABASE - sh_hash_hashdelete(); - - if (0 != sl_strcmp(file_path('D', 'R'), _("REQ_FROM_SERVER"))) - { - char hashbuf[KEYBUF_SIZE]; - (void) sl_strlcpy(sh.data.hash, - sh_tiger_hash (file_path('D', 'R'), - TIGER_FILE, TIGER_NOLIM, - hashbuf, sizeof(hashbuf)), - KEY_LEN+1); - } -#endif - (void) sl_trust_purge_user(); - (void) sh_files_hle_reg (NULL); - (void) sh_prelink_run (NULL, NULL, 0, 0); - - /* -------------------------- - * --- READ CONFIGURATION --- - * -------------------------- - */ - (void) sh_readconf_read (); - sig_config_read_again = 0; - (void) sh_files_setrec(); - (void) sh_files_test_setup(); - sh_audit_commit (); - - if (0 != sh.flag.nice) - { -#ifdef HAVE_SETPRIORITY - setpriority(PRIO_PROCESS, 0, sh.flag.nice); -#else - nice(sh.flag.nice); -#endif - } - - if (sh.flag.checkSum == SH_CHECK_INIT) - { - sh.flag.isdaemon = S_FALSE; - sh.flag.loop = S_FALSE; - } - - - /* --- Initialize modules. --- - */ - TPT((0, FIL__, __LINE__, _("msg=\n"))); - for (modnum = 0; modList[modnum].name != NULL; ++modnum) - { - status = modList[modnum].mod_init(&(modList[modnum])); - - if (status < 0) - { - if (status == (-1)) { - sh_error_handle (SH_ERR_NOTICE, FIL__, __LINE__, - status, MSG_MOD_FAIL, - _(modList[modnum].name), - status+SH_MOD_OFFSET); - } else { - sh_error_handle ((-1), FIL__, __LINE__, - status, MSG_MOD_FAIL, - _(modList[modnum].name), - status+SH_MOD_OFFSET); - } - modList[modnum].initval = SH_MOD_FAILED; - } - else - { - sh_error_handle ((-1), FIL__, __LINE__, status, MSG_MOD_OK, - _(modList[modnum].name)); - modList[modnum].initval = status; - } - } - - /* module is properly set up now - */ - sh_thread_pause_flag = S_FALSE; - - return; -} - -static void check_signals (volatile int *flag_check_1, - volatile int * flag_check_2) -{ - if (sig_raised > 0) - { - - TPT((0, FIL__, __LINE__, _("msg=\n"))) - - if (sig_termfast == 1) /* SIGTERM */ - { - TPT((0, FIL__, __LINE__, _("msg=\n"))); - --sig_raised; --sig_urgent; - aud_exit (FIL__, __LINE__, EXIT_SUCCESS); - } - - if (sig_force_check == 1) /* SIGTTOU / SIGTSTP */ - { - TPT((0, FIL__, __LINE__, _("msg=\n"))); - *flag_check_1 = 1; *flag_check_2 = 1; - sig_force_check = 0; --sig_raised; - if (sig_force_silent) - { - sig_force_silent = 0; - sh_global_check_silent = (sh_flag_silent == S_FALSE) ? SH_SILENT_STD : SH_SILENT_FULL; - } - sh_sem_trylock(); - } - - if (sig_config_read_again == 1 && /* SIGHUP */ - sh_global_suspend_flag == 0) - { - TPT((0, FIL__, __LINE__, _("msg=\n"))); - do_reconf(); - --sig_raised; - } - - if (sig_fresh_trail == 1) /* SIGIOT */ - { - if (sh_global_suspend_flag == 0) - { - SH_MUTEX_LOCK(mutex_thread_nolog); - - /* Logfile access - */ -#ifdef SH_USE_XML - (void) sh_log_file (NULL, NULL); -#endif - TPT((0, FIL__, __LINE__, _("msg=\n"))); - sh_error_only_stderr (S_TRUE); - (void) sh_unix_rm_lock_file(sh.srvlog.name); - (void) retry_msleep(3, 0); - sh.flag.log_start = S_TRUE; - sh_error_only_stderr (S_FALSE); - sh_thread_pause_flag = S_FALSE; - sig_fresh_trail = 0; - --sig_raised; - SH_MUTEX_UNLOCK(mutex_thread_nolog); - } - } - - if (sig_terminate == 1) /* SIGQUIT */ - { - TPT((0, FIL__, __LINE__, _("msg=\n"))); - strncpy (sh_sig_msg, _("Quit"), 20); - --sig_raised; - aud_exit (FIL__, __LINE__, EXIT_SUCCESS); - } - - if (sig_debug_switch == 1) /* SIGUSR1 */ - { - TPT((0, FIL__, __LINE__, _("msg=\n"))); - sh_error_dbg_switch(); - sig_debug_switch = 0; - --sig_raised; - } - - if (sig_suspend_switch > 0) /* SIGUSR2 */ - { - TPT((0, FIL__, __LINE__, _("msg=\n"))); - if (sh_global_suspend_flag != 1) { - SH_MUTEX_LOCK_UNSAFE(mutex_thread_nolog); - sh_global_suspend_flag = 1; - sh_error_handle((-1), FIL__, __LINE__, 0, MSG_SUSPEND, - sh.prg_name); - } else { - sh_global_suspend_flag = 0; - SH_MUTEX_UNLOCK_UNSAFE(mutex_thread_nolog); - } - --sig_suspend_switch; - --sig_raised; --sig_urgent; - } - - if (sh_load_delta_flag > 0 && - sh_global_suspend_flag == 0) /* DELTA Command */ - { - if (0 == sh_dbIO_load_delta()) - { - --sh_load_delta_flag; --sig_raised; - } - } - - sig_raised = (sig_raised < 0) ? 0 : sig_raised; - sig_urgent = (sig_urgent < 0) ? 0 : sig_urgent; - TPT((0, FIL__, __LINE__, _("msg=\n"))); - } - return; -} - -void check_for_delta_db() -{ - /* Need to contact the server. - */ - if (sh_global_check_silent < SH_SILENT_FULL) - sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_CHECK_2); - - if (sig_raised > 0 && sh_load_delta_flag > 0) /* DELTA Command */ - { - /* There was a DELTA Command - */ - if (0 == sh_dbIO_load_delta()) - { - --sh_load_delta_flag; --sig_raised; - } - } - return; -} - #endif @@ -1521,15 +1075,11 @@ * *******************************************************/ -#if !defined(SH_CUTEST) int main(int argc, char * argv[]) -#else -int undef_main(int argc, char * argv[]) -#endif { #if defined(INET_SYSLOG) - extern int sh_xfer_create_syslog_socket (int flag); + extern int create_syslog_socket (int flag); #endif #if defined(SH_WITH_SERVER) - extern int sh_create_tcp_socket(void); + extern int sh_create_tcp_socket(); #endif @@ -1539,14 +1089,14 @@ float st_1, st_2; int status; - volatile long cct = 0; /* main loop iterations */ - - volatile int flag_check_1 = 0; - volatile int flag_check_2 = 0; + long cct = 0; /* main loop iterations */ + + int flag_check_1 = 0; + int flag_check_2 = 0; int check_done = 0; #endif - volatile time_t told; - volatile time_t tcurrent; + time_t told; + time_t tcurrent; size_t tzlen; char * tzptr; @@ -1554,23 +1104,10 @@ #if defined (SH_STEALTH_NOCL) - char command_line[256]; + char * command_line; int my_argc = 0; char * my_argv[32]; #endif -#if !defined(USE_SYSTEM_MALLOC) - typedef void assert_handler_tp(const char * error, const char *file, int line); - extern assert_handler_tp *dnmalloc_set_handler(assert_handler_tp *new); - (void) dnmalloc_set_handler(safe_fatal); -#endif - - SH_G_INIT; /* Must precede any use of _() */ - SL_ENTER(_("main")); - - /* --- Close all but first three file descriptors. --- - */ - sh_unix_closeall(3, -1, S_FALSE); /* at program start */ - if (argc >= 2 && 0 != getuid() && @@ -1673,15 +1210,10 @@ /* Save the timezone. */ - if (NULL != (tzptr = getenv("TZ"))) /* flawfinder: ignore */ + if ((tzptr = getenv("TZ")) != NULL) { tzlen = strlen(tzptr); - if (tzlen < 1024) - { - sh.timezone = calloc(1, tzlen + 1); - if (sh.timezone != NULL) - (void) sl_strlcpy (sh.timezone, tzptr, tzlen + 1); - } - else - sh.timezone = NULL; + sh.timezone = malloc (tzlen + 1); + if (sh.timezone != NULL) + (void) sl_strlcpy (sh.timezone, tzptr, tzlen + 1); } else @@ -1691,9 +1223,11 @@ /* -------- INIT -------- */ - sh_unix_ign_sigpipe(); /* Restrict error logging to stderr. */ sh_error_only_stderr (S_TRUE); + + BREAKEXIT(sh_derr); + (void) sh_derr(); /* Check that first three descriptors are open. @@ -1714,10 +1248,4 @@ #endif - /* --- First check for an attached debugger (after setting - sh.sigtrap_max_duration which has to be done before). --- - */ - BREAKEXIT(sh_derr); - (void) sh_derr(); - /* --- Get local hostname. --- */ @@ -1730,6 +1258,4 @@ #if !defined(SH_STEALTH_NOCL) - sh_argc_store = argc; - sh_argv_store = argv; (void) sh_getopt_get (argc, argv); #else @@ -1737,22 +1263,14 @@ strlen(argv[1]) > 0 && strlen(NOCL_CODE) > 0) { - if ( 0 == strcmp(argv[1], NOCL_CODE) ) - { -#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_STRTOK_R) - char * saveptr; -#endif + if ( 0 == strcmp(argv[1], NOCL_CODE) && + NULL != (command_line = (char *) SH_ALLOC(256 * sizeof(char)))) + { my_argv[0] = argv[0]; ++my_argc; command_line[0] = '\0'; - if (NULL != fgets (command_line, sizeof(command_line), stdin)) - command_line[sizeof(command_line)-1] = '\0'; - + (void*) fgets (command_line, 255, stdin); + command_line[255] = '\0'; do { -#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_STRTOK_R) my_argv[my_argc] = - strtok_r( (my_argc == 1) ? command_line : NULL, " \n", &saveptr); -#else - my_argv[my_argc] = - strtok( (my_argc == 1) ? command_line : NULL, " \n"); -#endif + strtok( (my_argc == 1) ? command_line : NULL, " \n"); if (my_argv[my_argc] != NULL) { ++my_argc; @@ -1761,9 +1279,6 @@ } } while (my_argc < 32); - - sh_argc_store = my_argc; - sh_argv_store = my_argv; - (void) sh_getopt_get (my_argc, my_argv); + SH_FREE (command_line); } else @@ -1776,4 +1291,9 @@ sh.flag.opts = S_FALSE; + + /* close all other files + */ + sh_unix_closeall(3, -1); /* after processing CL options */ + /* --- Get user info. --- @@ -1797,6 +1317,4 @@ BREAKEXIT(sh_readconf_read); (void) sh_readconf_read (); - - sh_calls_enable_sub(); #if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) @@ -1832,13 +1350,9 @@ } - /* --- load database; checksum of database - */ -#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) - if (0 == sh.delayload) - sh_hash_init_and_checksum(); -#endif - - /* --- initialize signal handling etc.; fork daemon - */ + /* initialize signal handling etc + */ + if (sh.flag.isdaemon == S_TRUE) + sh_error_only_stderr (BAD); + if (sh_unix_init(sh.flag.isdaemon) == -1) { @@ -1848,12 +1362,4 @@ } -#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) - if (sh.delayload) - { - sleep(sh.delayload); - sh_hash_init_and_checksum(); - } -#endif - /* --- drop privileges eventually --- */ @@ -1861,5 +1367,5 @@ sh_create_tcp_socket (); #if defined(INET_SYSLOG) - sh_xfer_create_syslog_socket (S_TRUE); + create_syslog_socket (S_TRUE); #endif SL_REQUIRE(sl_policy_get_real(DEFAULT_IDENT) == SL_ENONE, @@ -1883,5 +1389,29 @@ */ #if defined(INET_SYSLOG) && defined(SH_WITH_SERVER) - sh_xfer_create_syslog_socket (S_FALSE); + create_syslog_socket (S_FALSE); +#endif + + + /* checksum of database + */ +#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) + TPT((0, FIL__, __LINE__, _("msg=\n"))) + if (sh.flag.checkSum == SH_CHECK_CHECK) + { + if (0 == sl_strcmp(file_path('D', 'R'), _("REQ_FROM_SERVER"))) + { + /* fetch the file from server to get checksum + */ + sh_hash_init (); + /* sh_hash_hashdelete (); */ + } + else + { + (void) sl_strlcpy(sh.data.hash, + sh_tiger_hash (file_path('D', 'R'), + TIGER_FILE, 0), + KEY_LEN+1); + } + } #endif @@ -1890,6 +1420,4 @@ */ sh_error_only_stderr (S_FALSE); - - sh.flag.started = S_TRUE; /**************************************************** @@ -1901,7 +1429,9 @@ #if defined(SH_WITH_SERVER) && !defined(SH_WITH_CLIENT) -#if defined(WITH_GPG) - /* log startup */ - sh_sig_log_startup (); +#if (defined(WITH_GPG) || defined(WITH_PGP)) + /* do nothing -- we exit earlier if error + if (0 != sh_gpg_check_sign (1)) + aud_exit(FIL__, __LINE__, EXIT_FAILURE); + */ #else sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_1H, @@ -1924,7 +1454,10 @@ if (sh.flag.checkSum == SH_CHECK_CHECK) { -#if defined(WITH_GPG) - /* log startup */ - sh_sig_log_startup (); +#if (defined(WITH_GPG) || defined(WITH_PGP)) + /* do nothing -- we exit earlier if error + if (0 != sh_gpg_check_sign (2)) + aud_exit(FIL__, __LINE__, EXIT_FAILURE); + */ + ; #else sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_2H, @@ -1936,7 +1469,10 @@ else { -#if defined(WITH_GPG) - /* log startup */ - sh_sig_log_startup (); +#if (defined(WITH_GPG) || defined(WITH_PGP)) + /* do nothing -- we exit earlier if error + if (0 != sh_gpg_check_sign (1)) + aud_exit(FIL__, __LINE__, EXIT_FAILURE); + */ + ; #else sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_1H, @@ -1948,5 +1484,5 @@ - if ((skey == NULL) || (skey->mlock_failed == S_TRUE)) + if ((skey == NULL) || (skey->mlock_failed == SL_TRUE)) sh_error_handle ((-1), FIL__, __LINE__, EPERM, MSG_MLOCK); @@ -1970,10 +1506,10 @@ if (sh.flag.isserver == S_TRUE) { - sh_xfer_start_server(); + sh_receive(); TPT((0, FIL__, __LINE__, _("msg=\n"))) aud_exit (FIL__, __LINE__, EXIT_SUCCESS); } #else - sh_xfer_start_server(); + sh_receive(); TPT((0, FIL__, __LINE__, _("msg=\n"))) aud_exit (FIL__, __LINE__, EXIT_SUCCESS); @@ -1995,6 +1531,5 @@ for (modnum = 0; modList[modnum].name != NULL; ++modnum) { - status = modList[modnum].mod_init(&(modList[modnum])); - if ( status < 0 ) + if (0 != (status = modList[modnum].mod_init())) { if (status == (-1)) { @@ -2002,11 +1537,11 @@ MSG_MOD_FAIL, _(modList[modnum].name), - status+SH_MOD_OFFSET); + status); } else { sh_error_handle ((-1), FIL__, __LINE__, status, MSG_MOD_FAIL, _(modList[modnum].name), - status+SH_MOD_OFFSET); + status); } - modList[modnum].initval = SH_MOD_FAILED; + modList[modnum].initval = S_FALSE; } else @@ -2014,5 +1549,5 @@ sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_MOD_OK, _(modList[modnum].name)); - modList[modnum].initval = status; + modList[modnum].initval = S_TRUE; } } @@ -2022,5 +1557,5 @@ (void) sh_files_setrec(); (void) sh_files_test_setup(); - sh_audit_commit (); + /* -------- NICE LEVEL --------- @@ -2037,15 +1572,8 @@ } - /* -------- CREATE SEMAPHORE --------- - */ - sh_sem_open(); - /* -------- MAIN LOOP --------- */ - sh.statistics.bytes_speed = 0; - sh.statistics.bytes_hashed = 0; - sh.statistics.files_report = 0; - sh.statistics.files_error = 0; - sh.statistics.files_nodir = 0; + sh.statistics.bytes_speed = 0; + sh.statistics.bytes_hashed = 0; while (1 == 1) @@ -2059,16 +1587,192 @@ tcurrent = time (NULL); - do { - check_signals(&flag_check_1, &flag_check_2); - if (sh_global_suspend_flag == 1) + if (sig_raised > 0) + { + + TPT((0, FIL__, __LINE__, _("msg=\n"))) + + if (sig_termfast == 1) /* SIGTERM */ + { + TPT((0, FIL__, __LINE__, _("msg=\n"))); + /* strncpy (sh_sig_msg, _("SIGTERM"), 20); */ + --sig_raised; --sig_urgent; + aud_exit (FIL__, __LINE__, EXIT_SUCCESS); + } + + if (sig_force_check == 1) /* SIGTTOU */ + { + TPT((0, FIL__, __LINE__, _("msg=\n"))); + flag_check_1 = 1; + flag_check_2 = 1; + sig_force_check = 0; + --sig_raised; + } + + if (sig_config_read_again == 1) /* SIGHUP */ + { + TPT((0, FIL__, __LINE__, _("msg=\n"))) + sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_RECONF); + +#if defined(WITH_EXTERNAL) + /* delete list of external tasks + */ + (void) sh_ext_cleanup(); +#endif + /* delete the file list, make all database + * entries visible (allignore = FALSE) + */ + (void) sh_files_deldirstack (); + (void) sh_files_delfilestack (); + (void) sh_ignore_clean (); + (void) hash_full_tree (); + +#if defined(SH_WITH_CLIENT) + reset_count_dev_server(); +#endif +#if defined(SH_WITH_CLIENT) || defined(SH_STANDALONE) + + + FileSchedOne = free_sched(FileSchedOne); + FileSchedTwo = free_sched(FileSchedTwo); + + for (modnum = 0; modList[modnum].name != NULL; ++modnum) + { + if (modList[modnum].initval == GOOD) + (void) modList[modnum].mod_reconf(); + } +#endif + +#if defined(SH_WITH_MAIL) + reset_count_dev_mail(); +#endif + reset_count_dev_console(); + reset_count_dev_time(); + + (void) sh_unix_maskreset(); + + /* Should this be included ??? + * (i.e. should we reload the database ?) + */ +#ifdef RELOAD_DATABASE + sh_hash_hashdelete(); +#endif + (void) sl_trust_purge_user(); + (void) sh_files_hle_reg (NULL); + (void) sh_prelink_run (NULL, NULL, 0); + + /* -------------------------- + * --- READ CONFIGURATION --- + * -------------------------- + */ + (void) sh_readconf_read (); + sig_config_read_again = 0; + (void) sh_files_setrec(); + (void) sh_files_test_setup(); + if (0 != sh.flag.nice) + { +#ifdef HAVE_SETPRIORITY + setpriority(PRIO_PROCESS, 0, sh.flag.nice); +#else + nice(sh.flag.nice); +#endif + } + + if (sh.flag.checkSum == SH_CHECK_INIT) + { + sh.flag.isdaemon = S_FALSE; + sh.flag.loop = S_FALSE; + } + + /* --- Initialize modules. --- + */ + TPT((0, FIL__, __LINE__, _("msg=\n"))); + for (modnum = 0; modList[modnum].name != NULL; ++modnum) + { + if (0 != (status = modList[modnum].mod_init())) + { + if (status == (-1)) { + sh_error_handle (SH_ERR_NOTICE, FIL__, __LINE__, + status, MSG_MOD_FAIL, + _(modList[modnum].name), + status); + } else { + sh_error_handle ((-1), FIL__, __LINE__, + status, MSG_MOD_FAIL, + _(modList[modnum].name), + status); + } + modList[modnum].initval = S_FALSE; + } + else + { + sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_MOD_OK, + _(modList[modnum].name)); + modList[modnum].initval = S_TRUE; + } + } + + --sig_raised; + } + + if (sig_fresh_trail == 1) /* SIGIOT */ + { + /* Logfile access + */ +#ifdef SH_USE_XML + (void) sh_log_file (NULL, NULL); +#endif + TPT((0, FIL__, __LINE__, _("msg=\n"))); + sh_error_only_stderr (S_TRUE); + (void) sh_unix_rm_lock_file(sh.srvlog.name); + (void) retry_msleep(3, 0); + sh.flag.log_start = S_TRUE; + sh_error_only_stderr (S_FALSE); + sig_fresh_trail = 0; + --sig_raised; + } + + if (sig_terminate == 1) /* SIGQUIT */ + { + TPT((0, FIL__, __LINE__, _("msg=\n"))); + strncpy (sh_sig_msg, _("Quit"), 20); + --sig_raised; --sig_urgent; + aud_exit (FIL__, __LINE__, EXIT_SUCCESS); + } + + if (sig_debug_switch == 1) /* SIGUSR1 */ + { + TPT((0, FIL__, __LINE__, _("msg=\n"))); + sh_error_dbg_switch(); + sig_debug_switch = 0; + --sig_raised; + } + + if (sig_suspend_switch == 1) /* SIGUSR2 */ + { + TPT((0, FIL__, __LINE__, _("msg=\n"))); + if (sh_global_suspend_flag == 1) { + sh_global_suspend_flag = 0; + } else { + sh_error_handle((-1), FIL__, __LINE__, 0, MSG_SUSPEND, + sh.prg_name); + sh_global_suspend_flag = 1; + } + sig_suspend_switch = 0; + --sig_raised; --sig_urgent; + } + sig_raised = (sig_raised < 0) ? 0 : sig_raised; + sig_urgent = (sig_urgent < 0) ? 0 : sig_urgent; + TPT((0, FIL__, __LINE__, _("msg=\n"))); + } + + if (sh_global_suspend_flag == 1) + { (void) retry_msleep (1, 0); - } while (sh_global_suspend_flag == 1); + continue; + } /* see whether its time to check files */ - if (sh.flag.checkSum == SH_CHECK_INIT || - (sh.flag.inotify & SH_INOTIFY_DOSCAN) != 0 || - (sh.flag.checkSum == SH_CHECK_CHECK && - (sh.flag.isdaemon == S_FALSE && sh.flag.loop == S_FALSE))) + if (sh.flag.checkSum == SH_CHECK_INIT) { flag_check_1 = 1; @@ -2103,17 +1807,4 @@ (flag_check_1 == 1 || flag_check_2 == 1)) { - sh_sem_trylock(); - - /* Starting a check now, so make sure to fetch delta DB - * if there is one to download. - */ - check_for_delta_db(); - - SH_INOTIFY_IFUSED( sh.flag.inotify |= SH_INOTIFY_INSCAN; ); - /* Refresh list files matching glob patterns. - */ - if (sh.flag.checkSum != SH_CHECK_INIT) - sh_files_check_globPatterns(); - /* * check directories and files @@ -2124,7 +1815,4 @@ sh.statistics.dirs_checked = 0; sh.statistics.files_checked = 0; - sh.statistics.files_report = 0; - sh.statistics.files_error = 0; - sh.statistics.files_nodir = 0; TPT((0, FIL__, __LINE__, _("msg=\n"))) @@ -2134,5 +1822,5 @@ (void) sh_dirs_chk (1); #ifndef SH_PROFILE - (void) retry_aud_chdir (FIL__, __LINE__, "/"); + (void) chdir ("/"); #endif } @@ -2141,5 +1829,5 @@ (void) sh_dirs_chk (2); #ifndef SH_PROFILE - (void) retry_aud_chdir (FIL__, __LINE__, "/"); + (void) chdir ("/"); #endif } @@ -2149,5 +1837,7 @@ (void) sh_files_chk (); - if (sig_urgent > 0) { sh_sem_unlock(sh.statistics.files_report); sh_global_check_silent = 0; continue; } + if (sig_urgent > 0) + continue; + /* * check for files not visited @@ -2159,5 +1849,6 @@ } - if (sig_urgent > 0) { sh_sem_unlock(sh.statistics.files_report); sh_global_check_silent = 0; continue; } + if (sig_urgent > 0) + continue; /* reset @@ -2165,20 +1856,16 @@ TPT((0, FIL__, __LINE__, _("msg=\n"))) sh_dirs_reset (); - - if (sig_urgent > 0) { sh_sem_unlock(sh.statistics.files_report); sh_global_check_silent = 0; continue; } + if (sig_urgent > 0) + continue; sh_files_reset (); - check_done = 1; - flag_check_1 = 0; flag_check_2 = 0; - sh_sem_unlock(sh.statistics.files_report); - - SH_INOTIFY_IFUSED( sh.flag.inotify &= ~SH_INOTIFY_INSCAN; ); - SH_INOTIFY_IFUSED( sh.flag.inotify &= ~SH_INOTIFY_DOSCAN; ); - - (void) sh_prelink_run (NULL, NULL, 0, 0); - - if (sig_urgent > 0) { sh_global_check_silent = 0; continue; } + check_done = 1; + + (void) sh_prelink_run (NULL, NULL, 0); + + if (sig_urgent > 0) + continue; runtim = time(NULL) - sh.statistics.time_start; @@ -2186,6 +1873,5 @@ if ((sh.statistics.dirs_checked == 0) && - (sh.statistics.files_checked == 0) && - (sh_global_check_silent < SH_SILENT_FULL)) + (sh.statistics.files_checked == 0)) sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_CHECK_0); @@ -2205,19 +1891,12 @@ sh.statistics.bytes_speed = (unsigned long) st_1; - if (sh_global_check_silent < SH_SILENT_FULL) - sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_CHECK_1, - (long) runtim, - 0.001 * st_1); - - if (sh.flag.checkSum != SH_CHECK_INIT) - sh_efile_report(); + sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_CHECK_1, + (long) runtim, + 0.001 * st_1); } - - if (0 == sh_global_check_silent) - sh.fileCheck.alarm_last = time (NULL); - - sh_global_check_silent = 0; - - if (sig_urgent > 0) continue; + sh.fileCheck.alarm_last = time (NULL); + + if (sig_urgent > 0) + continue; /* @@ -2226,9 +1905,10 @@ #if defined(SH_WITH_MAIL) TPT((0, FIL__, __LINE__, _("msg=\n"))) - (void) sh_nmail_flush (); + (void) sh_mail_msg (NULL); #endif } - if (sig_urgent > 0) continue; + if (sig_urgent > 0) + continue; /* execute modules @@ -2237,9 +1917,9 @@ for (modnum = 0; modList[modnum].name != NULL; ++modnum) { - if (modList[modnum].initval == SH_MOD_ACTIVE && + if (modList[modnum].initval == GOOD && 0 != modList[modnum].mod_timer(tcurrent)) if (0 != (status = modList[modnum].mod_check())) sh_error_handle ((-1), FIL__, __LINE__, status, MSG_MOD_EXEC, - _(modList[modnum].name), (long) (status+SH_MOD_OFFSET)); + _(modList[modnum].name), (long) status); } @@ -2248,5 +1928,5 @@ */ if (sh.flag.checkSum == SH_CHECK_INIT) - sh_dbIO_data_write (NULL, NULL); + sh_hash_pushdata (NULL, NULL); /* write out database @@ -2255,34 +1935,12 @@ sh.flag.update == S_TRUE && check_done == 1) - sh_dbIO_writeout_update (); - - /* no-op unless MEM_LOG is defined in sh_mem.c - */ -#ifdef MEM_DEBUG - sh_mem_dump (); -#endif - - { - char * stale; - - stale = sl_check_stale(); - if (stale) - { - sh_error_handle(SH_ERR_ERR, FIL__, __LINE__, 0, MSG_E_SUBGEN, - stale, _("sl_check_stale")); - } - - stale = sl_check_badfd(); - if (stale) - { - sh_error_handle(SH_ERR_ERR, FIL__, __LINE__, 0, MSG_E_SUBGEN, - stale, _("sl_check_stale")); - } - } + sh_hash_writeout (); /* no loop if not daemon */ - if (sh.flag.isdaemon != S_TRUE && sh.flag.loop == S_FALSE) break; - if (sig_urgent > 0) continue; + if (sh.flag.isdaemon != S_TRUE && sh.flag.loop == S_FALSE) + break; + if (sig_urgent > 0) + continue; /* see whether its time to send mail @@ -2292,9 +1950,10 @@ { TPT((0, FIL__, __LINE__, _("msg=\n"))) - (void) sh_nmail_flush (); + (void) sh_mail_msg (NULL); sh.mailTime.alarm_last = time (NULL); } #endif - if (sig_urgent > 0) continue; + if (sig_urgent > 0) + continue; /* log the timestamp @@ -2316,10 +1975,7 @@ (void) taus_seed(); - if (sig_urgent > 0) continue; + if (sig_urgent > 0) + continue; - /* reset cache - */ - sh_userid_destroy(); - /* go to sleep */ @@ -2343,5 +1999,5 @@ #if defined(SH_WITH_MAIL) if (sh.mailNum.alarm_last > 0) - (void)sh_nmail_flush (); + (void)sh_mail_msg (NULL); #endif Index: trunk/src/samhain_erase.c =================================================================== --- trunk/src/samhain_erase.c (revision 1) +++ trunk/src/samhain_erase.c (revision 1) @@ -0,0 +1,140 @@ +/*************************************************************************** + * + * Purpose: + * ------- + * Hide loaded kernel modules with names including the string MAGIC_HIDE + + * + * Configuration: + * ------------- + * If not building within the samhain system, you may remove the + * line '#include "config.h"' and in the line + * '#define MAGIC_HIDE SH_MAGIC_HIDE', replace SH_MAGIC_HIDE with + * "someString" (in quotes !). + */ + + +#include "config.h" + +#define MAGIC_HIDE SH_MAGIC_HIDE + +/* #define MAGIC_HIDE "someString" */ + +/* define this if you have a modversioned kernel */ +/* #define MODVERSIONS */ + +/* + * Install: + * ------- + * gcc -Wall -O2 -c samhain_erase.c + * mv samhain_hide.o /lib/modules/KERNEL_VERSION/misc/ + * + * (Replace KERNEL_VERSION with your kernel's version.) + * + * Usage: + * ----- + * To load the module: + * insmod samhain_hide (for improved safety: 'sync && insmod samhain_hide') + * + * To unload the module + * rmmod samhain_hide (for improved safety: 'sync && rmmod samhain_hide') + * + * + * Tested on: + * --------- + * Linux 2.2 + * + * Copyright: + * --------- + * Copyright (C) 2001 Rainer Wichmann (http://la-samhna.de) + * + * License: + * ------- + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + ***************************************************************************/ + +#define __KERNEL__ +#define MODULE + +/* The configure options (#defines) for the Kernel + */ +#include + +#ifdef CONFIG_MODVERSIONS +#include +#endif + +#include +#include +#include + +#define N_(string) string +#include "config.h" + +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + +#undef NULL +#define NULL ((void *)0) + + +int init_module() +{ + struct module * ptr; + struct module * prev; + int found = 0; + + ptr = &(__this_module); + prev = &(__this_module); + + /* skip this module to allow 'rmmod' + */ + ptr = ptr->next; + + while (ptr) + { + found = 0; + + if (ptr->name && ptr->name[0] != '\0') + { + /* printk("%s <%s>\n", ptr->name, SH_MAGIC_HIDE); */ + if (NULL != strstr(ptr->name, SH_MAGIC_HIDE)) + { + prev->next = ptr->next; + /* printk("-->HIDE\n"); */ + found = 1; + } + } + + if (ptr->next) + { + if (found == 0) + prev = ptr; + ptr = ptr->next; + } + else + break; + } + + return 0; +} + +void cleanup_module() +{ + return; +} + + Index: trunk/src/samhain_hide.c =================================================================== --- trunk/src/samhain_hide.c (revision 1) +++ trunk/src/samhain_hide.c (revision 1) @@ -0,0 +1,780 @@ +/*************************************************************************** + * + * Purpose: + * ------- + * (1) Hide files with the string MAGIC_HIDE in filename, + * where MAGIC_HIDE is defined below. + * By default, MAGIC_HIDE is defined as "samhain". + * + * (2) Hide all processes, if the executable has the string MAGIC_HIDE + * in its name. + * + * + * Configuration: + * ------------- + * If not building within the samhain system, you may remove the + * line '#include "config.h"' and in the line + * '#define MAGIC_HIDE SH_MAGIC_HIDE', replace SH_MAGIC_HIDE with + * "someString" (in quotes !). + */ + +/* #define _(string) string */ +#include "config.h" + +#undef _ +#define _(string) string + +/* define if this is a 2.6 kernel */ +/* #define LINUX26 */ + +#define MAGIC_HIDE SH_MAGIC_HIDE + +/* #define MAGIC_HIDE "someString" */ + +/* define this if you have a modversioned kernel */ +/* #define MODVERSIONS */ + +/* the address of the sys_call_table (not exported in 2.5 kernels) */ +#define MAGIC_ADDRESS SH_SYSCALLTABLE + +/* + * Install: + * ------- + * gcc -Wall -O2 -c samhain_hide.c + * mv samhain_hide.o /lib/modules/KERNEL_VERSION/misc/ + * + * (Replace KERNEL_VERSION with your kernel's version.) + * + * Usage: + * ----- + * To load the module: + * insmod samhain_hide (for improved safety: 'sync && insmod samhain_hide') + * + * To unload the module + * rmmod samhain_hide (for improved safety: 'sync && rmmod samhain_hide') + * + * + * Details: + * ------- + * The following kernel syscalls are replaced: + * sys_getdents [hide files/directories/processes (/proc/PID)] + * + * Tested on: + * --------- + * Linux 2.2, 2.4, 2.6 + * + * Copyright: + * --------- + * Copyright (C) 2001, 2002 Rainer Wichmann (http://la-samhna.de) + * + * License: + * ------- + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + ***************************************************************************/ + + + +/***************************************************** + * + * The defines: + * + *****************************************************/ + +/* This is a Linux Loadable Kernel Module. + */ + +#ifndef LINUX26 +#define __KERNEL__ +#define MODULE +#endif +#define LINUX + +/* Define for debugging. + */ +/* #define HIDE_DEBUG */ /* query_module */ +/* #define FILE_DEBUG */ /* getdents */ +/* #define READ_DEBUG */ /* read */ +/* #define PROC_DEBUG */ /* procfs */ + + +/***************************************************** + * + * The include files: + * + *****************************************************/ + + +/* The configure options (#defines) for the Kernel + */ +#include + +#ifndef LINUX26 +#ifdef CONFIG_MODVERSIONS +#include +#endif +#endif + + +#ifdef LINUX26 +#include +#endif + +#include + +/* File tables structures. If directory caching is used, + * will be included here, and __LINUX_DCACHE_H + * will thus be defined. + */ +#include +#include + +/* Include the SYS_syscall defines. + */ +#ifndef LINUX26 +#include +#else +#define SYS_getdents 141 +#define SYS_getdents64 220 +#endif + + +/* Includes for 'getdents' per the manpage. + */ +#include +#include +#include + +/* To access userspace memory. + */ +#include + +/* Include for lock_kernel(). + */ +#include + +/* Include for fget(). + */ +#include + +/***************************************************** + * + * The global variables: + * + *****************************************************/ + +/* The kernel syscall table. Not exported anymore in 2.5 ff., and also + * not in the RedHat 2.4 kernel. + */ + +#if 0 +extern void * sys_call_table[]; +#define sh_sys_call_table sys_call_table +#endif + +unsigned long * sh_sys_call_table = (unsigned long *) MAGIC_ADDRESS; + +/* The old address of the sys_getdents syscall. + */ +int (*old_getdents)(unsigned int, struct dirent *, unsigned int); +#ifdef __NR_getdents64 +long (*old_getdents64)(unsigned int, struct dirent64 *, unsigned int); +#endif + +char hidden[] = MAGIC_HIDE; + + +/***************************************************** + * + * The functions: + * + *****************************************************/ + + +MODULE_AUTHOR("Rainer Wichmann"); +MODULE_DESCRIPTION("Hide files/processes/modules with MAGIC_HIDE in name."); +#if defined(MODULE_LICENSE) || defined(LINUX26) +MODULE_LICENSE("GPL"); +#endif + +#ifdef LINUX26 +/* Default is to hide ourselves. + */ +static int removeme = 1; + +MODULE_PARM (removeme, "i"); +#endif + + +/* + * struct task_struct is defined in linux/sched.h + * + * as of 2.4.20, the vanilla kernel holds (among others): + * struct task_struct *next_task, *prev_task; + * + * Redhat kernel seems to have a different scheduler. + * use: + * struct task_struct * find_task_by_pid (int pid); + */ + +#if defined(SH_VANILLA_KERNEL) && !defined(LINUX26) +/* + * Fetch the task struct for a given PID. + */ +struct task_struct * fetch_task_struct (int pid) +{ + struct task_struct * task_ptr; + +#ifdef PROC_DEBUG + printk("FETCH TASK %d\n", pid); +#endif + + task_ptr = current; + + do + { + if (task_ptr->pid == (pid_t) pid ) + return (task_ptr); + task_ptr = task_ptr->next_task; + } + while (task_ptr != current); + +#ifdef PROC_DEBUG + printk("FETCH TASK: NOT FOUND !!!\n"); +#endif + + return (NULL); +} + +#else +/* + * RedHat 2.4.20 kernel + */ +struct task_struct * fetch_task_struct (int pid) +{ + struct task_struct * task_ptr = NULL; + task_ptr = find_task_by_pid (pid); + return (task_ptr); +} +#endif + +/* Convert a string to an int. + * Does not recognize integers with a sign (+/-) in front. + */ +int my_atoi(char * in_str) +{ + int i = 0; + int retval = 0; + int conv = 0; + + if (in_str == NULL) + return (-1); + + while(in_str[i] != '\0') + { + /* Break if not numeric. + */ + if (in_str[i] < '0' || in_str[i] > '9') + break; + + ++conv; + + /* Leading zeroes (should not happen in /proc) + */ + if (retval == 0 && in_str[i] == '0') + retval = retval; + else + retval = retval * 10; + + retval = retval + (in_str[i] - '0'); + + i++; + } + + if (conv == 0) + return (-1); + else + return (retval); +} + +/* Purpose: + * + * Hide all files/dirs that include the string MAGIC_HIDE in their + * name. + */ +int new_getdents (unsigned int fd, struct dirent *dirp, unsigned int count) +{ + int status = 0; /* Return value from original getdents */ + struct inode * dir_inode; + int dir_is_proc = 0; + + struct dirent * dirp_prev; + struct dirent * dirp_new; + struct dirent * dirp_current; + + int dir_table_bytes; + int forward_bytes; + struct task_struct * task_ptr; + int hide_it = 0; + long dirp_offset; + + lock_kernel(); + + status = (*old_getdents)(fd, dirp, count); + +#ifdef FILE_DEBUG + printk("STATUS %d\n", status); +#endif + + /* 0: end of directory. + * -1: some error + */ + if (status <= 0) + { + unlock_kernel(); + return (status); + } + + /* Handle directory caching. dir_inode is the inode of the directory. + */ +#if defined(__LINUX_DCACHE_H) + dir_inode = current->files->fd[fd]->f_dentry->d_inode; +#else + dir_inode = current->files->fd[fd]->f_inode; +#endif + + /* Check for the /proc directory + */ + if (dir_inode->i_ino == PROC_ROOT_INO +#ifndef LINUX26 + && !MAJOR(dir_inode->i_dev) && + MINOR(dir_inode->i_dev) == 1 +#endif + ) + dir_is_proc = 1; + + /* Allocate space for new dirent table. Can't use GFP_KERNEL + * (kernel oops) + */ + dirp_new = (struct dirent *) kmalloc (status, GFP_ATOMIC); + + if (dirp_new == NULL) + { + unlock_kernel(); + return (status); + } + + /* Copy the dirp table to kernel space. + */ + copy_from_user(dirp_new, dirp, status); + +#ifdef FILE_DEBUG + printk("COPY to kernel\n"); +#endif + + /* Loop over the dirp table to find entries to hide. + */ + dir_table_bytes = status; + dirp_current = dirp_new; + dirp_prev = NULL; + + while (dir_table_bytes > 0) + { + hide_it = 0; + + if (dirp_current->d_reclen == 0) + break; + + dirp_offset = dirp_current->d_off; + +#ifdef FILE_DEBUG + printk("DIRENT %d %d %ld\n", + dir_table_bytes, + dirp_current->d_reclen, + dirp_current->d_off); +#endif + + dir_table_bytes -= dirp_current->d_reclen; + forward_bytes = dirp_current->d_reclen; + +#ifdef FILE_DEBUG + printk("ENTRY %s\n", dirp_current->d_name); +#endif + + /* If /proc is scanned (e.g. by 'ps'), hide the entry for + * any process where the executable has MAGIC_HIDE in its name. + */ + if (dir_is_proc == 1) + { + task_ptr = fetch_task_struct(my_atoi(dirp_current->d_name)); + if (task_ptr != NULL) + { + if (strstr(task_ptr->comm, hidden) != NULL) + hide_it = 1; + } + } + /* If it is a regular directory, hide any entry with + * MAGIC_HIDE in its name. + */ + else + { + if (strstr (dirp_current->d_name, hidden) != NULL) + hide_it = 1; + } + + if (hide_it == 1) + { +#ifdef FILE_DEBUG + printk(" -->HIDDEN %s\n", dirp_current->d_name); +#endif + if (dir_table_bytes > 0) + { + status -= dirp_current->d_reclen; + memmove (dirp_current, + (char *) dirp_current + dirp_current->d_reclen, + dir_table_bytes); + + /* Set forward_bytes to 0, because now dirp_current is the + * (previously) next entry in the dirp table. + */ + forward_bytes = 0; + dirp_prev = dirp_current; + } + else + { + status -= dirp_current->d_reclen; + if (dirp_prev != NULL) + dirp_prev->d_off = dirp_offset; + } + + } + else + { + dirp_prev = dirp_current; + if (dir_table_bytes == 0 && dirp_prev != NULL) + dirp_prev->d_off = dirp_offset; + } + + /* Next entry in dirp table. + */ + if (dir_table_bytes > 0) + dirp_current = (struct dirent *) ( (char *) dirp_current + + forward_bytes); + } + + /* Copy our modified dirp table back to user space. + */ + copy_to_user(dirp, dirp_new, status); +#ifdef FILE_DEBUG + printk("COPY to user\n"); +#endif + + kfree (dirp_new); +#ifdef FILE_DEBUG + printk("KFREE\n"); +#endif + + unlock_kernel(); + return (status); +} + + +/* For 2.4 kernel + */ +#ifdef __NR_getdents64 +long new_getdents64 (unsigned int fd, struct dirent64 *dirp, + unsigned int count) +{ + long status = 0; /* Return value from original getdents */ + struct inode * dir_inode; + int dir_is_proc = 0; + + struct dirent64 * dirp_prev; + struct dirent64 * dirp_new; + struct dirent64 * dirp_current; + + int dir_table_bytes; + int forward_bytes; + struct task_struct * task_ptr; + int hide_it = 0; + __s64 dirp_offset; + + lock_kernel(); + + status = (*old_getdents64)(fd, dirp, count); + +#ifdef FILE_DEBUG + printk("STATUS64 %ld\n", status); +#endif + + /* 0: end of directory. + * -1: some error + */ + if (status <= 0) + { + unlock_kernel(); + return (status); + } + + /* Handle directory caching. dir_inode is the inode of the directory. + */ +#if defined(__LINUX_DCACHE_H) + dir_inode = current->files->fd[fd]->f_dentry->d_inode; +#else + dir_inode = current->files->fd[fd]->f_inode; +#endif + +#ifdef FILE_DEBUG + printk("INODE64\n"); +#endif + + /* Check for the /proc directory + */ + if (dir_inode->i_ino == PROC_ROOT_INO +#ifndef LINUX26 + && !MAJOR(dir_inode->i_dev) /* && + MINOR(dir_inode->i_dev) == 1 */ + /* MINOR commented out because of problems with 2.4.17 */ +#endif + ) + { + dir_is_proc = 1; + +#ifdef PROC_DEBUG + printk("PROC_CHECK64\n"); +#endif + } + + /* Allocate space for new dirent table. Can't use GFP_KERNEL + * (kernel oops) + */ + dirp_new = kmalloc ((size_t)status, GFP_ATOMIC); + +#ifdef FILE_DEBUG + printk("KMALLOC64_0\n"); +#endif + + if (dirp_new == NULL) + { + unlock_kernel(); + return (status); + } + +#ifdef FILE_DEBUG + printk("KMALLOC64\n"); +#endif + + /* Copy the dirp table to kernel space. + */ + copy_from_user(dirp_new, dirp, status); + +#ifdef FILE_DEBUG + printk("COPY64 to kernel\n"); +#endif + + /* Loop over the dirp table to find entries to hide. + */ + dir_table_bytes = status; + dirp_current = dirp_new; + dirp_prev = NULL; + + while (dir_table_bytes > 0) + { + hide_it = 0; + + if (dirp_current->d_reclen == 0) + break; + + dirp_offset = dirp_current->d_off; + +#ifdef FILE_DEBUG + printk("DIRENT %d %d %lld\n", + dir_table_bytes, + dirp_current->d_reclen, + dirp_current->d_off); +#endif + + dir_table_bytes -= dirp_current->d_reclen; + forward_bytes = dirp_current->d_reclen; + +#ifdef FILE_DEBUG + printk("ENTRY %s\n", dirp_current->d_name); +#endif + + /* If /proc is scanned (e.g. by 'ps'), hide the entry for + * any process where the executable has MAGIC_HIDE in its name. + */ + if (dir_is_proc == 1) + { +#ifdef PROC_DEBUG + printk("PROC %s\n", dirp_current->d_name); +#endif + task_ptr = fetch_task_struct(my_atoi(dirp_current->d_name)); + if (task_ptr != NULL) + { +#ifdef PROC_DEBUG + printk("PROC %s <> %s\n", task_ptr->comm, hidden); +#endif + if (strstr(task_ptr->comm, hidden) != NULL) + hide_it = 1; + } + } + /* If it is a regular directory, hide any entry with + * MAGIC_HIDE in its name. + */ + else + { + if (strstr (dirp_current->d_name, hidden) != NULL) + hide_it = 1; + } + + if (hide_it == 1) + { +#ifdef FILE_DEBUG + printk(" -->HIDDEN %s\n", dirp_current->d_name); +#endif + if (dir_table_bytes > 0) + { + status -= dirp_current->d_reclen; + memmove (dirp_current, + (char *) dirp_current + dirp_current->d_reclen, + dir_table_bytes); + + /* Set forward_bytes to 0, because now dirp_current is the + * (previously) next entry in the dirp table. + */ + forward_bytes = 0; + dirp_prev = dirp_current; + } + else + { + status -= dirp_current->d_reclen; + if (dirp_prev != NULL) + dirp_prev->d_off = dirp_offset; + } + + } + else + { + dirp_prev = dirp_current; + if (dir_table_bytes == 0 && dirp_prev != NULL) + dirp_prev->d_off = dirp_offset; + } + + /* Next entry in dirp table. + */ + if (dir_table_bytes > 0) + dirp_current = (struct dirent64 *) ( (char *) dirp_current + + forward_bytes); + } + + /* Copy our modified dirp table back to user space. + */ + copy_to_user(dirp, dirp_new, status); + kfree (dirp_new); + unlock_kernel(); + return (status); +} +#endif + +#ifdef LINUX26 +static struct module *find_module(const char *name) +{ + struct module *mod; + struct list_head * modules = (struct list_head *) SH_LIST_MODULES; + + list_for_each_entry(mod, modules, list) { + if (strcmp(mod->name, name) == 0) + return mod; + } + return NULL; +} +#endif + +/* The initialisation function. Automatically called when module is inserted + * via the 'insmod' command. + */ +#ifdef LINUX26 +static int __init samhain_hide_init(void) +#else +int init_module(void) +#endif +{ + + lock_kernel(); + + /* Unfortunately this does not fully prevent the module from appearing + * in /proc/ksyms. + */ +#ifndef LINUX26 + EXPORT_NO_SYMBOLS; +#endif + + /* Replace the 'sys_getdents' syscall with the new version. + */ + old_getdents = (void*) sh_sys_call_table[SYS_getdents]; + sh_sys_call_table[SYS_getdents] = (unsigned long) new_getdents; + +#ifdef __NR_getdents64 + old_getdents64 = (void*) sh_sys_call_table[SYS_getdents64]; + sh_sys_call_table[SYS_getdents64] = (unsigned long) new_getdents64; +#endif + +#ifdef LINUX26 + { + spinlock_t * modlist_lock = (spinlock_t * ) SH_MODLIST_LOCK; + struct module *mod = find_module(SH_INSTALL_NAME"_hide"); + if (mod) { + /* Delete from various lists */ + spin_lock_irq(modlist_lock); + if (removeme == 1) + { + list_del(&mod->list); + } + spin_unlock_irq(modlist_lock); + } + } +#endif + + unlock_kernel(); + return (0); +} + +/* The cleanup function. Automatically called when module is removed + * via the 'rmmod' command. + */ +#ifdef LINUX26 +static void __exit samhain_hide_cleanup(void) +#else +void cleanup_module(void) +#endif +{ + lock_kernel(); + + /* Restore the new syscalls to the original version. + */ + sh_sys_call_table[SYS_getdents] = (unsigned long) old_getdents; +#ifdef __NR_getdents64 + sh_sys_call_table[SYS_getdents64] = (unsigned long) old_getdents64; +#endif + + unlock_kernel(); +} + +#ifdef LINUX26 +module_init(samhain_hide_init); +module_exit(samhain_hide_cleanup); +#endif + + Index: trunk/src/samhain_setpwd.c =================================================================== --- trunk/src/samhain_setpwd.c (revision 591) +++ trunk/src/samhain_setpwd.c (revision 1) @@ -1,3 +1,8 @@ #include "config_xor.h" + +#ifdef HAVE_BROKEN_INCLUDES +#define _ANSI_C_SOURCE +#define _POSIX_SOURCE +#endif #include @@ -8,130 +13,8 @@ #include #include -#include -#include #include #include -#include -#include #include -#if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_YIELD) -#include -#endif - -#if defined(HAVE_INT_32) -typedef unsigned int UINT32; -#elif defined(HAVE_LONG_32) -typedef unsigned long UINT32; -#elif defined(HAVE_SHORT_32) -typedef unsigned short UINT32; -#endif - -#define TAUS_MAX 4294967295UL - -static UINT32 taus_state[3]; - -static UINT32 taus_get () -{ - -#define TAUSWORTHE(s,a,b,c,d) ((s &c) <>b) - taus_state[0] = TAUSWORTHE (taus_state[0], 13, 19, 4294967294UL, 12); - taus_state[1] = TAUSWORTHE (taus_state[1], 2, 25, 4294967288UL, 4); - taus_state[2] = TAUSWORTHE (taus_state[2], 3, 11, 4294967280UL, 17); - return (taus_state[0] ^ taus_state[1] ^ taus_state[2]); -} - -static void taus_seed () -{ - unsigned char buf[12]; - unsigned char buf2[12]; - unsigned char buf3[12]; - ssize_t count; - size_t nbytes = sizeof(buf); - size_t where = 0; - - struct timeval t1, t2; - UINT32 delta, k[3]; - int i, j; - - int fd = open ("/dev/urandom", O_RDONLY); - - if (fd == -1) - { - gettimeofday(&t1, NULL); - delta = t1.tv_usec; - memcpy(&buf[0], &delta, 4); - gettimeofday(&t1, NULL); - delta = t1.tv_usec; - memcpy(&buf[4], &delta, 4); - gettimeofday(&t1, NULL); - delta = t1.tv_usec; - memcpy(&buf[8], &delta, 4); - goto second; - } - - do { - count = read(fd, &buf[where], nbytes); - if (count == -1 && errno == EINTR) - continue; - where += count; - nbytes -= count; - } while (nbytes); - - close(fd); - - second: - for (i = 0; i < 12; ++i) - { - gettimeofday(&t1, NULL); - if (0 == fork()) - _exit(EXIT_SUCCESS); - wait(NULL); - gettimeofday(&t2, NULL); - delta = t2.tv_usec - t1.tv_usec; - buf2[i] = (unsigned char) delta; - } - - for (i = 0; i < 12; ++i) - { - gettimeofday(&t1, NULL); - for (j = 0; j < 32768; ++j) - { - if (0 == kill (j,0)) - k[i % 3] ^= j; - } - gettimeofday(&t2, NULL); - delta = t2.tv_usec - t1.tv_usec; - buf3[i] ^= (unsigned char) delta; - } - - memcpy(&taus_state[0], &buf3[0], 4); - memcpy(&taus_state[1], &buf3[4], 4); - memcpy(&taus_state[2], &buf3[8], 4); - - taus_state[0] ^= k[0]; - taus_state[1] ^= k[1]; - taus_state[2] ^= k[2]; - - memcpy(&k[0], &buf2[0], 4); - memcpy(&k[1], &buf2[4], 4); - memcpy(&k[2], &buf2[8], 4); - - taus_state[0] ^= k[0]; - taus_state[1] ^= k[1]; - taus_state[2] ^= k[2]; - - memcpy(&k[0], &buf[0], 4); - memcpy(&k[1], &buf[4], 4); - memcpy(&k[2], &buf[8], 4); - - taus_state[0] ^= k[0]; - taus_state[1] ^= k[1]; - taus_state[2] ^= k[2]; - - taus_state[0] |= (UINT32) 0x03; - taus_state[1] |= (UINT32) 0x09; - taus_state[2] |= (UINT32) 0x17; -} #ifdef SH_STEALTH @@ -229,8 +112,6 @@ char * newn; - size_t nlen; int oldf; int newf; - int ret; unsigned long bytecount; @@ -246,32 +127,32 @@ char * oldpwd = (char *) malloc(5 * 8 + 2); - memset (newpwd, 0, 5 * 8 + 2); - memset (oldpwd, 0, 5 * 8 + 2); + memset (newpwd, '\0', 5 * 8 + 2); + memset (oldpwd, '\0', 5 * 8 + 2); if (argc < 4) { - fprintf (stderr, "%s", _("\nUsage: samhain_setpwd "\ + fprintf (stderr, _("\nUsage: samhain_setpwd "\ "\n\n")); - fprintf (stderr, "%s", _(" This program is a utility that will:\n")); - fprintf (stderr, "%s", _(" - search in the binary executable "\ - " for samhain's\n")); - fprintf (stderr, "%s", _(" compiled-in default password,\n")); - fprintf (stderr, "%s", _(" - change it to ,\n")); - fprintf (stderr, "%s", _(" - and output the modified binary to "\ + fprintf (stderr, _(" This program is a utility that will:\n")); + fprintf (stderr, _(" - search in the binary executable "\ + "for samhain's\n")); + fprintf (stderr, _(" compiled-in default password,\n")); + fprintf (stderr, _(" - change it to ,\n")); + fprintf (stderr, _(" - and output the modified binary to "\ ".\n\n")); - fprintf (stderr, "%s", _(" To allow for non-printable chars, "\ + fprintf (stderr, _(" To allow for non-printable chars, "\ " must be\n")); - fprintf (stderr, "%s", _(" a 16-digit hexadecimal "\ + fprintf (stderr, _(" a 16-digit hexadecimal "\ "number (only 0-9,A-F allowed in input),\n")); - fprintf (stderr, "%s", _(" thus corresponding"\ + fprintf (stderr, _(" thus corresponding"\ " to an 8-byte password.\n\n")); - fprintf (stderr, "%s", _(" Example: 'samhain_setpwd samhain new "\ + fprintf (stderr, _(" Example: 'samhain_setpwd samhain new "\ "4142434445464748'\n")); - fprintf (stderr, "%s", _(" takes the file 'samhain', sets the "\ - "password to 'ABCDEFGH'\n")); - fprintf (stderr, "%s", _(" ('A' = 41 hex, 'B' = 42 hex, ...) "\ + fprintf (stderr, _(" takes the file 'samhain', sets the password to "\ + "'ABCDEFGH'\n")); + fprintf (stderr, _(" ('A' = 41 hex, 'B' = 42 hex, ...) "\ "and outputs the result\n")); - fprintf (stderr, "%s", _(" to 'samhain.new'.\n")); + fprintf (stderr, _(" to 'samhain.new'.\n")); return EXIT_FAILURE; } @@ -279,7 +160,6 @@ if (strlen(argv[3]) != 16) { - fprintf (stdout, - _("ERROR |%s| has not exactly 16 chars\n"), - argv[3]); + fprintf (stdout, _("ERROR %s has not exactly 16 chars\n"), + argv[0]); fflush(stdout); return EXIT_FAILURE; @@ -316,5 +196,5 @@ (void) umask (0); - taus_seed(); + srand(time(NULL) ^ getpid()); bytecount = 0; @@ -326,9 +206,8 @@ oldf = open(argv[1], O_RDONLY); - nlen = strlen(argv[1])+strlen(argv[2])+2; - newn = (char *) malloc (nlen); - strncpy(newn, argv[1], nlen); newn[nlen-1] = '\0'; - strncat(newn, ".", nlen); newn[nlen-1] = '\0'; - strncat(newn, argv[2], nlen); newn[nlen-1] = '\0'; + newn = (char *) malloc (strlen(argv[1])+strlen(argv[2])+2); + strcpy(newn, argv[1]); + strcat(newn, "."); + strcat(newn, argv[2]); newf = open(newn, O_WRONLY|O_CREAT|O_TRUNC, S_IRWXU); @@ -361,5 +240,5 @@ { suc = 1; - fprintf (stdout, "%s", _("INFO old password found\n")); + fprintf (stdout, _("INFO old password found\n")); fflush(stdout); for (i = 0; i < 8; ++i) @@ -386,5 +265,5 @@ (unsigned char) *found_it); - ccd = (unsigned char) (256.0 * (taus_get()/(TAUS_MAX+1.0))); + ccd = (unsigned char) (256.0 * rand()/(RAND_MAX+1.0)); sprintf(&newpwd[i*2], _("%02x"), (unsigned char) ccd); @@ -399,16 +278,10 @@ - ret = write (newf, buf, dat); - if (dat > 0 && ret < 0) - { - fprintf(stdout, _("ERROR Cannot write to output file %s.\n"), newn); - fflush(stdout); - return EXIT_FAILURE; - } + write (newf, buf, dat); } if (suc == 1 && badcnt == 7) { - fprintf (stdout, "%s", _("INFO finished\n")); + fprintf (stdout, _("INFO finished\n")); close (newf); close (oldf); @@ -420,6 +293,6 @@ lseek (newf, 0, SEEK_SET); - fprintf (stdout, "%s", _("INFO Not found in first pass.\n")); - fprintf (stdout, "%s", _("INFO Second pass ..\n")); + fprintf (stdout, _("INFO Not found in first pass.\n")); + fprintf (stdout, _("INFO Second pass ..\n")); /* offset the start point @@ -427,11 +300,5 @@ dat = read (oldf, buf, (GRAB_SIZE / 2)); - ret = write (newf, buf, dat); - if (dat > 0 && ret < 0) - { - fprintf(stdout, _("ERROR Cannot write to output file %s.\n"), newn); - fflush(stdout); - return EXIT_FAILURE; - } + write (newf, buf, dat); bytecount = 0; @@ -450,5 +317,5 @@ { suc = 1; - fprintf (stdout, "%s", _("INFO old password found\n")); + fprintf (stdout, _("INFO old password found\n")); for (i = 0; i < 8; ++i) { @@ -473,5 +340,5 @@ (unsigned char) *found_it); - ccd = (unsigned char) (256.0 * taus_get()/(TAUS_MAX+1.0)); + ccd = (unsigned char) (256.0 * rand()/(RAND_MAX+1.0)); sprintf(&newpwd[i*2], _("%02x"), (unsigned char) ccd); @@ -484,11 +351,5 @@ } - ret = write (newf, buf, dat); - if (dat > 0 && ret < 0) - { - fprintf(stdout, _("ERROR Cannot write to output file %s.\n"), newn); - fflush(stdout); - return EXIT_FAILURE; - } + write (newf, buf, dat); } @@ -498,5 +359,5 @@ if (suc == 1 && badcnt == 7) { - fprintf (stdout, "%s", _("INFO finished\n")); + fprintf (stdout, _("INFO finished\n")); fflush(stdout); return 0; @@ -505,9 +366,9 @@ if (suc == 0 || badcnt < 7) { - fprintf (stdout, "%s", _("ERROR incomplete replacement\n")); + fprintf (stdout, _("ERROR incomplete replacement\n")); } else { - fprintf (stdout, "%s", _("ERROR bad replacement\n")); + fprintf (stdout, _("ERROR bad replacement\n")); } fflush(stdout); Index: trunk/src/samhain_stealth.c =================================================================== --- trunk/src/samhain_stealth.c (revision 591) +++ trunk/src/samhain_stealth.c (revision 1) @@ -270,35 +270,29 @@ static void usage () { - fprintf(stdout, "%s", _("\nUsage: samhain_stealth -i|s|g|o "\ - "[what]\n\n")); - - fprintf(stdout, "%s", _(" -i info on PS image 'where'\n")); - fprintf(stdout, "%s", _(" (how much bytes can be hidden in it).\n")); - fprintf(stdout, "%s", _(" -s hide file 'what' in PS image 'where'\n")); - fprintf(stdout, "%s", _(" -g get hidden data from PS image 'where'\n")); - fprintf(stdout, "%s", _(" (output to stdout)\n")); - fprintf(stdout, "%s", _(" -o size of file 'where' = offset to "\ - "end-of-file\n")); - fprintf(stdout, "%s", _(" (same as wc -c).\n\n")); - fprintf(stdout, "%s", _(" Example: let bar.ps be the ps file, and"\ - "foo the config file\n")); - fprintf(stdout, "%s", _(" 1) extract with: samhain_stealth "\ - "-g bar.ps >foo\n")); - fprintf(stdout, "%s", _(" 2) hide with: samhain_stealth "\ - "-s bar.ps foo\n\n")); - - fprintf(stdout, "%s", _(" This program hides a file in an UNCOMPRESSED "\ - "postscript\n")); - fprintf(stdout, "%s", _(" image. To generate such an image, you may " \ - "use e.g.:\n")); - fprintf(stdout, "%s", _(" 'convert +compress foo.jpg bar.ps'.\n")); - fprintf(stdout, "%s", _(" 'gimp' apparently saves postscript "\ - "uncompressed by default\n")); - fprintf(stdout, "%s", _(" (V 1.06 of the postscript plugin).\n")); - fprintf(stdout, "%s", _(" 'xv' seems to save with run-length "\ - "compression, which is unsuitable.\n")); - fprintf(stdout, "%s", _(" The program does not check the "\ - "compression type of the PS file.\n")); - fprintf(stdout, "%s", _(" Just have a look at the result to check.\n")); + fprintf(stdout, _("\nUsage: samhain_stealth -i|s|g|o "\ + "[what]\n\n")); + + fprintf(stdout, _(" -i info on PS image 'where'\n")); + fprintf(stdout, _(" (how much bytes can be hidden in it).\n")); + fprintf(stdout, _(" -s hide file 'what' in PS image 'where'\n")); + fprintf(stdout, _(" -g get hidden data from PS image 'where'\n")); + fprintf(stdout, _(" (output to stdout)\n\n")); + fprintf(stdout, _(" -o size of file 'where' = offset to "\ + "end-of-file\n")); + fprintf(stdout, _(" (same as wc -c).\n")); + + fprintf(stdout, _(" This program hides a file in an UNCOMPRESSED "\ + "postscript\n")); + fprintf(stdout, _(" image. To generate such an image, you may "\ + "use e.g.:\n")); + fprintf(stdout, _(" 'convert +compress foo.jpg bar.ps'.\n")); + fprintf(stdout, _(" 'gimp' apparently saves postscript uncompressed "\ + "by default\n")); + fprintf(stdout, _(" (V 1.06 of the postscript plugin).\n")); + fprintf(stdout, _(" 'xv' seems to save with run-length compression, "\ + "which is unsuitable.\n")); + fprintf(stdout, _(" The program does not check the compression type of "\ + "the PS file.\n")); + fprintf(stdout, _(" Just have a look at the result to check.\n\n")); return; } @@ -341,6 +335,5 @@ if (fd == -1) { - fprintf(stderr, _("Error: could not open() %s for reading\n"), - argv[2]); + fprintf(stderr, _("Error: could not open() %s for reading\n"), argv[2]); return (1); } @@ -397,5 +390,5 @@ fprintf(stdout, _(" .. hide %s in %s .. \n"), argv[3], argv[2]); - while (fgets(buf, sizeof(buf), infil)) + while (fgets(buf, 1023, infil)) { lseek(fd, off_data, SEEK_SET); @@ -414,5 +407,5 @@ */ lseek(fd, off_data, SEEK_SET); - add_off = hidein_hex_block(fd, _("\n[EOF]\n"), 7); + add_off = hidein_hex_block(fd, _("[EOF]\n"), 6); if (add_off == -1) { @@ -421,5 +414,5 @@ return (1); } - fprintf(stdout, "%s", _(" .. finished\n")); + fprintf(stdout, _(" .. finished\n")); return (0); } @@ -462,3 +455,4 @@ return (1); } - + + Index: trunk/src/sh_audit.c =================================================================== --- trunk/src/sh_audit.c (revision 591) +++ (revision ) @@ -1,647 +1,0 @@ -/* SAMHAIN file system integrity testing */ -/* Copyright (C) 2010 Rainer Wichmann */ -/* */ -/* This program is free software; you can redistribute it */ -/* and/or modify */ -/* it under the terms of the GNU General Public License as */ -/* published by */ -/* the Free Software Foundation; either version 2 of the License, or */ -/* (at your option) any later version. */ -/* */ -/* This program is distributed in the hope that it will be useful, */ -/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ -/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ -/* GNU General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU General Public License */ -/* along with this program; if not, write to the Free Software */ -/* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -#include "config_xor.h" - -#if defined(SH_WITH_CLIENT) || defined(SH_STANDALONE) - - -#include -#include -#include -#include -#include -#include -#include - -#include "samhain.h" -#include "sh_error.h" - -#undef FIL__ -#define FIL__ _("sh_audit.c") - -#if !defined(SH_COMPILE_STATIC) && defined(__linux__) && defined(HAVE_AUPARSE_H) && defined(HAVE_AUPARSE_LIB) -#include - -#include "sh_extern.h" -#include "sh_utils.h" - - -#define REC_SIZE_SYSCALL 32 -#define REC_SIZE_EXE 64 -#define REC_SIZE_SUCCESS 32 - -struct recordState { - char syscall[REC_SIZE_SYSCALL]; - char exe[REC_SIZE_EXE]; - char success[REC_SIZE_SUCCESS]; - unsigned int auid; - unsigned int uid; - unsigned int gid; - unsigned int euid; - unsigned int egid; - unsigned int fsuid; - unsigned int fsgid; - time_t time; - unsigned int milli; -}; - -static int listRecords (auparse_state_t * au, struct recordState * state) -{ - if (auparse_first_record(au) != 1) - return -1; - - state->time = auparse_get_time(au); - state->milli = auparse_get_milli(au); - - if (auparse_find_field(au, _("syscall"))) - sl_strlcpy(state->syscall, auparse_interpret_field(au), REC_SIZE_SYSCALL); - - if (auparse_find_field(au, _("success"))) - sl_strlcpy(state->success, auparse_interpret_field(au), REC_SIZE_SUCCESS); - - if (auparse_find_field(au, "uid")) - state->uid = auparse_get_field_int(au); - if (auparse_find_field(au, "gid")) - state->gid = auparse_get_field_int(au); - - if (auparse_find_field(au, _("euid"))) - state->euid = auparse_get_field_int(au); - if (auparse_find_field(au, _("fsuid"))) - state->fsuid = auparse_get_field_int(au); - - auparse_first_field(au); - - if (auparse_find_field(au, _("auid"))) - state->auid = auparse_get_field_int(au); - - auparse_first_field(au); - - if (auparse_find_field(au, _("egid"))) - state->egid = auparse_get_field_int(au); - if (auparse_find_field(au, _("fsgid"))) - state->fsgid = auparse_get_field_int(au); - - auparse_first_field(au); - - if (auparse_find_field(au, "exe")) - sl_strlcpy(state->exe, auparse_interpret_field(au), REC_SIZE_EXE); - - return 0; -} - -static char * doAuparse (const char * file, time_t time, int tol, char * result, size_t rsize, int redo_flag) -{ - struct recordState state; - struct recordState stateFetched; - unsigned int found_flag = 0; - - auparse_state_t * au = auparse_init(AUSOURCE_LOGS, NULL); - - if (!au) - { - char ebuf[SH_ERRBUF_SIZE]; - int errnum = errno; - - sl_snprintf(ebuf, sizeof(ebuf), _("Error in auparse_init() - %s\n"), - strerror(errnum)); - sh_error_handle (SH_ERR_ERR, FIL__, __LINE__, errnum, MSG_E_SUBGEN, - ebuf, - _("doAuparse") ); - return NULL; - } - - if (ausearch_add_interpreted_item(au, _("name"), "=", file, - AUSEARCH_RULE_CLEAR) != 0) - { - goto err; - } - - if (time != 0) - { - ausearch_add_timestamp_item(au, ">=", time-tol, 0, AUSEARCH_RULE_AND); - ausearch_add_timestamp_item(au, "<=", time+tol, 0, AUSEARCH_RULE_AND); - } - - if (ausearch_set_stop(au, AUSEARCH_STOP_RECORD) != 0) - { - sh_error_handle (SH_ERR_ERR, FIL__, __LINE__, 0, MSG_E_SUBGEN, - _("Error in ausearch_set_stop\n"), - _("doAuparse") ); - goto err; - } - - memset(&state, 0, sizeof(state)); - - while (ausearch_next_event(au) == 1) - { - memset(&stateFetched, '\0', sizeof(state)); - listRecords(au, &stateFetched); - if (0 == strcmp(stateFetched.success, "yes")) - { - memcpy(&state, &stateFetched, sizeof(state)); - ++found_flag; - } - auparse_next_event(au); - } - - if (found_flag == 0 && redo_flag == S_FALSE) - { - size_t len = strlen(file); - char * path = SH_ALLOC(len + 2); - char * altres; - - sl_strlcpy(path, file, len+2); - path[len] = '/'; path[len+1] = '\0'; - auparse_destroy(au); - - altres = doAuparse(path, time, tol, result, rsize, S_TRUE); - - SH_FREE(path); - return altres; - } - - if (0 == strcmp(state.success, "yes")) - { - char time_str[81]; - char * tmp_exe = sh_util_safe_name(state.exe); - - (void) sh_unix_gmttime (state.time, time_str, sizeof(time_str)); - sl_snprintf(result, rsize, - _("time=%lu.%u, timestamp=%s, syscall=%s, auid=%u, uid=%u, gid=%u, euid=%u, egid=%u, fsuid=%u, fsgid=%u, exe=%s"), - (unsigned long) state.time, state.milli, time_str, - state.syscall, - state.auid, state.uid, state.gid, state.euid, state.egid, - state.fsuid, state.fsgid, tmp_exe); - SH_FREE(tmp_exe); - auparse_destroy(au); - return result; - } - - err: - auparse_destroy(au); - return NULL; -} - -#define SH_AUDIT_DEF "wa" -static char sh_audit_flags[32] = SH_AUDIT_DEF; - -int sh_audit_set_flags(const char * str) -{ - if (!str || strlen(str) >= sizeof(sh_audit_flags)) - return -1; - sl_strlcpy(sh_audit_flags, str, sizeof(sh_audit_flags)); - return 0; -} -static void reset_audit_flags() -{ - sl_strlcpy(sh_audit_flags, SH_AUDIT_DEF, sizeof(sh_audit_flags)); - return; -} - - -static int sh_audit_checkdaemon(); -static int actl_pnum = -1; -static char * actl_paths[4] = - { - N_("/sbin/auditctl"), - N_("/usr/sbin/auditctl"), - N_("/bin/auditctl"), - N_("/usr/bin/auditctl") - }; - -static char * getflags (char * file); - -/* Public function to fetch an audit record for path 'file', time 'time' - * The 'result' array should be sized ~256 char. - */ -char * sh_audit_fetch (char * file, time_t mtime, time_t ctime, time_t atime, char * result, size_t rsize) -{ - char * res = NULL; - char * flags = getflags(file); - - if (sh_audit_checkdaemon() >= 0) - { - time_t new; - - if (flags && (strchr(flags, 'r') || strchr(flags, 'x')) && atime >= ctime && atime >= mtime) { new = atime; } - else if (mtime >= ctime) { new = mtime; } - else { new = ctime; } - - res = doAuparse (file, new, 1, result, rsize, S_FALSE); - - if (!res) - { - res = doAuparse (file, new, 3, result, rsize, S_FALSE); - } - - } - return res; -} - -void sh_audit_delete_all () -{ - int p = sh_audit_checkdaemon(); - - if (p >= 0) - { - char ctl[64]; - - sl_snprintf(ctl, sizeof(ctl), _("%s -D -k samhain"), - _(actl_paths[p])); - sh_error_handle (SH_ERR_ALL, FIL__, __LINE__, - 0, MSG_E_SUBGEN, - _("Deleting audit daemon rules with key samhain"), - _("sh_audit_delete_all") ); - - sl_strlcpy(ctl, _(actl_paths[p]), sizeof(ctl)); - sh_ext_system(ctl, ctl, "-D", "-k", _("samhain"), NULL); - } - reset_audit_flags(); - return; -} - -static int sh_audit_isdir(const char * file) -{ - struct stat buf; - - if ( (0 == lstat (file, &buf)) && S_ISDIR(buf.st_mode)) - return S_TRUE; - return S_FALSE; -} - -static void sh_audit_mark_int (const char * file, const char * flags) -{ - static int flushRules = 0; - - int p = sh_audit_checkdaemon(); - - /* Flush all rules at startup. - */ - if (flushRules == 0) - { - sh_audit_delete_all (); - flushRules = 1; - } - - if (p >= 0) - { - size_t len = strlen(file) + 64; - char * command = SH_ALLOC(len); - char * safe; - char ctl[64]; - char a1[32]; - char a2[32]; - char a3[32]; - char a4[32]; - - sl_snprintf(command, len, _("%s -w %s -p %s -k samhain"), - _(actl_paths[p]), file, flags); - - safe = sh_util_safe_name_keepspace(command); - sh_error_handle (SH_ERR_ALL, FIL__, __LINE__, - 0, MSG_E_SUBGEN, - safe, - _("sh_audit_mark") ); - - SH_FREE(safe); - - sl_strlcpy(ctl, _(actl_paths[p]), sizeof(ctl)); - sl_strlcpy(command, file, len); - - sl_strlcpy(a3, _("samhain"), sizeof(a3)); - sl_strlcpy(a4, flags, sizeof(a4)); - sh_ext_system(ctl, ctl, "-w", command, "-p", a4, "-k", a3, NULL); - - /* Placing a watch on a directory will not place a watch on the - * directory inode, so we do this explicitely. - */ - if (S_TRUE == sh_audit_isdir(file)) - { - safe = sh_util_safe_name(file); - sh_error_handle (SH_ERR_ALL, FIL__, __LINE__, - 0, MSG_E_SUBGPATH, - _("Add path watch for directory"), - _("sh_audit_mark_int"), safe ); - SH_FREE(safe); - sl_strlcpy(command, _("path="), len); - sl_strlcat(command, file, len); - sl_strlcpy(a1, _("always,exit"), sizeof(a1)); - sl_strlcpy(a2, _("perm="), sizeof(a2)); - sl_strlcat(a2, flags, sizeof(a2)); - sh_ext_system(ctl, ctl, "-a", a1, "-F", command, "-F", a2, "-k", a3, NULL); - } - SH_FREE(command); - } - return; -} - -#define SH_AU_FLAGS_SIZ 32 -struct aud_list { - char * file; - char flags[SH_AU_FLAGS_SIZ]; - struct aud_list * next; -}; - -struct aud_list * mark_these = NULL; -static int marked_committed = 0; - -static void delete_listofmarked() -{ - struct aud_list * tmp; - struct aud_list * this = mark_these; - - mark_these = NULL; - - while (this) - { - tmp = this; - this = this->next; - - SH_FREE(tmp->file); - SH_FREE(tmp); - } - marked_committed = 0; -} - -static char * getflags (char * file) -{ - struct aud_list * this = mark_these; - - while (this) - { - if (0 == strcmp(file, this->file)) - return this->flags; - this = this->next; - } - /* no explicit rule for this file */ - return NULL; -} - -static void add_this (char * file) -{ - struct aud_list * this = SH_ALLOC(sizeof(struct aud_list)); - size_t len = strlen(file); - - this->file = sh_util_strdup(file); - - /* strip trailing '/' */ - if ((len > 1) && (file[len-1] == '/')) - this->file[len-1] = '\0'; - - sl_strlcpy(this->flags, sh_audit_flags, SH_AU_FLAGS_SIZ); - - this->next = mark_these; - mark_these = this; - return; -} - -/* Check whether it is already covered by a higher directory - */ -static int test_exchange (struct aud_list * this, const char * file) -{ - size_t len0 = sl_strlen(this->file); - size_t len1 = sl_strlen(file); - int ret = -1; - - if (!file || !this || !this->file) - return 0; - - if (len0 == len1) - { - return strcmp(this->file, file); - } - else - { - if (0 == strcmp(this->flags, sh_audit_flags)) - { - char * s0 = SH_ALLOC(len0 + 2); - char * s1 = SH_ALLOC(len1 + 2); - - sl_strlcpy(s0, this->file, len0 + 2); - sl_strlcpy(s1, file, len1 + 2); - - if (s0 < s1) - { - sl_strlcat(s0, "/", len0 + 2); - ret = strncmp(s0, s1, len0 + 1); - } - else - { - sl_strlcat(s1, "/", len1 + 2); - if (0 == strncmp(s0, s1, len1 + 1)) - { - size_t len = strlen(file); - SH_FREE(this->file); - this->file = sh_util_strdup(file); - if ((len > 1) && (file[len-1] == '/')) - this->file[len-1] = '\0'; - ret = 0; - } - } - SH_FREE(s0); - SH_FREE(s1); - } - } - - return ret; -} - -/* Place a path on the list of of paths to be watched - */ -void sh_audit_mark (char * file) -{ - struct aud_list * this; - - if (marked_committed != 0) - delete_listofmarked(); - - if (!mark_these) { - add_this (file); - return; - } - - this = mark_these; - - while (this) - { - /* Check whether it is already covered by a higher - * directory - */ - if (0 == test_exchange(this, file)) - return; - - this = this->next; - } - - add_this (file); - return; -} - -void sh_audit_commit () -{ - struct aud_list * this = mark_these; - - while (this) - { - sh_audit_mark_int (this->file, this->flags); - this = this->next; - } - marked_committed = 1; -} - -static int sh_audit_checkdaemon() -{ - int i; - static int flag = 0; - char command[64]; - char * p; - - if (flag != 0) - return -1; - - if (actl_pnum >= 0) - return actl_pnum; - - for (i = 0; i < 4; ++i) - { - if (0 == access(_(actl_paths[i]), F_OK))/* flawfinder: ignore */ - { - if (0 == access(_(actl_paths[i]), X_OK))/* flawfinder: ignore */ - { - actl_pnum = i; - break; - } - else - { - char ebuf[SH_ERRBUF_SIZE]; - int errnum = errno; - - sl_snprintf(ebuf, sizeof(ebuf), - _("Cannot execute auditctl - %s\n"), - strerror(errnum)); - sh_error_handle (SH_ERR_ERR, FIL__, __LINE__, - errnum, MSG_E_SUBGEN, - ebuf, - _("sh_audit_checkdaemon") ); - flag = 1; - actl_pnum = -1; - return -1; - } - } - } - - if (actl_pnum == -1 && flag == 0) - { - char ebuf[SH_ERRBUF_SIZE]; - int errnum = errno; - - sl_snprintf(ebuf, sizeof(ebuf), - _("Cannot find auditctl - %s\n"), - strerror(errnum)); - sh_error_handle (SH_ERR_ERR, FIL__, __LINE__, - errnum, MSG_E_SUBGEN, - ebuf, - _("sh_audit_checkdaemon") ); - flag = 1; - actl_pnum = -1; - return -1; - } - - /* We found an executable auditctl */ - - sl_snprintf(command, sizeof(command), _("%s -s"), _(actl_paths[actl_pnum])); - sh_error_handle (SH_ERR_ALL, FIL__, __LINE__, - 0, MSG_E_SUBGEN, - command, - _("sh_audit_checkdaemon") ); - p = sh_ext_popen_str (command); - - if (p) - { - int retval = -1; - if (strstr(p, _(" pid=0 "))) - { - sh_error_handle (SH_ERR_ERR, FIL__, __LINE__, - 0, MSG_E_SUBGEN, - _("Audit daemon for Linux kernel audit system is not running"), - _("sh_audit_checkdaemon") ); - flag = 1; - actl_pnum = -1; - } - else - { - retval = actl_pnum; - sh_error_handle (SH_ERR_ALL, FIL__, __LINE__, - retval, MSG_E_SUBGEN, - _("Audit daemon is running"), - _("sh_audit_checkdaemon") ); - } - SH_FREE(p); - return retval; - } - - sh_error_handle (SH_ERR_ERR, FIL__, __LINE__, - errno, MSG_E_SUBGEN, - _("No output from auditctl -s"), - _("sh_audit_checkdaemon") ); - flag = 1; - actl_pnum = -1; - return -1; -} - -/* HAVE_AUPARSE_H */ -#else -char * sh_audit_fetch (char * file, time_t mtime, time_t ctime, time_t atime, char * result, size_t rsize) -{ - (void) file; - (void) mtime; - (void) ctime; - (void) atime; - (void) result; - (void) rsize; - - return 0; -} -void sh_audit_mark (const char * file) -{ - (void) file; - sh_error_handle(SH_ERR_WARN, FIL__, __LINE__, 0, MSG_E_SUBGEN, - _("Setting audit watch not supported"), - _("sh_audit_mark")); - return; -} -void sh_audit_delete_all () -{ - return; -} -void sh_audit_commit () -{ - return; -} -int sh_audit_set_flags(const char * str) -{ - (void) str; - return -1; -} -#endif - -/* client || standalone */ -#endif - Index: trunk/src/sh_calls.c =================================================================== --- trunk/src/sh_calls.c (revision 591) +++ trunk/src/sh_calls.c (revision 1) @@ -34,5 +34,4 @@ #include #include -#include #include @@ -51,18 +50,14 @@ #include "samhain.h" #include "sh_error.h" -#include "sh_ipvx.h" -#include "sh_sub.h" -#include "sh_utils.h" +#include "sh_calls.h" #undef FIL__ #define FIL__ _("sh_calls.c") -extern int flag_err_debug; - char aud_err_message[64]; typedef struct cht_struct { - const char * str; + char * str; unsigned long val; } cht_type; @@ -87,5 +82,5 @@ /* Set aud functions */ -int sh_aud_set_functions(const char * str_s) +int sh_aud_set_functions(char * str_s) { int i = 0; @@ -114,5 +109,5 @@ /* Need to catch EINTR for these functions. */ -long int retry_sigaction(const char * file, int line, +long int retry_sigaction(char * file, int line, int signum, const struct sigaction *act, struct sigaction *oldact) @@ -120,5 +115,4 @@ int error; long int val_retry = -1; - char errbuf[SH_ERRBUF_SIZE]; errno = 0; @@ -132,5 +126,5 @@ if (val_retry < 0) { sh_error_handle ((-1), file, line, error, MSG_ERR_SIGACT, - sh_error_message(error, errbuf, sizeof(errbuf)), + sh_error_message(error), (long) signum ); } @@ -139,20 +133,13 @@ } -static struct sh_sockaddr bind_addr; +static struct in_addr bind_addr; static int use_bind_addr = 0; -int sh_calls_set_bind_addr (const char * str) -{ - static int reject = 0; - - if (reject == 1) - return (0); - - if (sh.flag.opts == S_TRUE) - reject = 1; - - if (0 == sh_ipvx_aton(str, &bind_addr)) - return -1; - +int sh_calls_set_bind_addr (char * str) +{ + if (0 == /*@-unrecog@*/inet_aton(str, &bind_addr)/*@+unrecog@*/) + { + return -1; + } use_bind_addr = 1; return 0; @@ -160,11 +147,10 @@ -long int retry_connect(const char * file, int line, int sockfd, +long int retry_connect(char * file, int line, int sockfd, struct sockaddr *serv_addr, int addrlen) { int error; - int err_bind = 0; long int val_retry = 0; - char errbuf[SH_ERRBUF_SIZE]; + static struct sockaddr_in new_addr; SL_ENTER(_("retry_connect")); @@ -172,62 +158,40 @@ errno = 0; - if (use_bind_addr) - { - int slen = SH_SS_LEN(bind_addr); - struct sockaddr *b_addr = sh_ipvx_sockaddr_cast(&bind_addr); - - if (bind_addr.ss_family == AF_INET) - b_addr->sa_family = AF_INET; -#if defined(USE_IPVX) - else - b_addr->sa_family = AF_INET6; + if (0 != use_bind_addr) + { + memcpy(&new_addr.sin_addr, &bind_addr, sizeof(struct in_addr)); + new_addr.sin_family = AF_INET; + + val_retry = /*@-unrecog@*/bind(sockfd, + (struct sockaddr*)&new_addr, + sizeof(struct sockaddr_in))/*@+unrecog@*/; + } + + if (val_retry == 0) + { + do { + val_retry = + /*@-unrecog@*/connect(sockfd, serv_addr, addrlen)/*@+unrecog@*/; + } while (val_retry < 0 && errno == EINTR); + } + + error = errno; + if (val_retry != 0) { + /* ugly cast back to struct sockaddr_in :-( + */ + sh_error_handle ((-1), file, line, error, MSG_ERR_CONNECT, + sh_error_message(error), + (long) sockfd, + /*@-unrecog -type@*/ + (long) ntohs(((struct sockaddr_in *)serv_addr)->sin_port), + /*@+unrecog +type@*/ +#ifdef HAVE_INET_ATON + /*@-unrecog -type@*/ + inet_ntoa( ((struct sockaddr_in *)serv_addr)->sin_addr ) + /*@+unrecog +type@*/ +#else + _("unknown") #endif - val_retry = bind(sockfd, b_addr, slen); - } - - if (val_retry == 0) - { - do { - val_retry = connect(sockfd, serv_addr, addrlen); - } while (val_retry < 0 && (errno == EINTR || errno == EINPROGRESS)); - } - else - { - err_bind = 1; - } - - error = errno; - if (val_retry != 0) { - long eport = 0; - char eaddr[SH_IP_BUF]; - char emesg[SH_BUFSIZE]; - struct sockaddr *err_addr = serv_addr; - struct sh_sockaddr ss; - - if (err_bind) - err_addr = sh_ipvx_sockaddr_cast(&bind_addr); - - sh_ipvx_save(&ss, err_addr->sa_family, err_addr); - sh_ipvx_ntoa(eaddr, sizeof(eaddr), &ss); - - if (err_addr->sa_family == AF_INET) - eport = (long) ntohs(((struct sockaddr_in *)serv_addr)->sin_port); -#if defined(USE_IPVX) - else - eport = (long) ntohs(((struct sockaddr_in6 *)serv_addr)->sin6_port); -#endif - - sl_strlcpy(emesg, sh_error_message(error, errbuf, sizeof(errbuf)), sizeof(emesg)); - sl_strlcat(emesg, - (err_addr->sa_family == AF_INET) ? _(", AF_INET") : _(", AF_INET6"), - sizeof(emesg)); - - sl_strlcat(emesg, - (err_bind) ? _(", bind") : _(", connect"), - sizeof(emesg)); - - sh_error_handle ((-1), file, line, error, MSG_ERR_CONNECT, - emesg, - (long) sockfd, eport, eaddr); + ); } errno = error; @@ -235,13 +199,10 @@ } -long int retry_accept(const char * file, int line, int fd, - struct sh_sockaddr *serv_addr, int * addrlen) +long int retry_accept(char * file, int line, int fd, + struct sockaddr *serv_addr, int * addrlen) { int error; long int val_retry = -1; - char errbuf[SH_ERRBUF_SIZE]; - struct sockaddr_storage ss; - - ACCEPT_TYPE_ARG3 my_addrlen = sizeof(ss); + ACCEPT_TYPE_ARG3 my_addrlen = (ACCEPT_TYPE_ARG3) *addrlen; errno = 0; @@ -250,193 +211,65 @@ do { - val_retry = accept(fd, (struct sockaddr *)&ss, &my_addrlen); + val_retry = /*@-unrecog@*/accept(fd, serv_addr, &my_addrlen)/*@+unrecog@*/; } while (val_retry < 0 && errno == EINTR); - + *addrlen = (int) my_addrlen; error = errno; if (val_retry < 0) { sh_error_handle ((-1), file, line, error, MSG_ERR_ACCEPT, - sh_error_message(error, errbuf, sizeof(errbuf)), + sh_error_message(error), (long) fd ); } - errno = error; - - if (flag_err_debug == S_TRUE) - { - char ipbuf[SH_IP_BUF]; - char buf[SH_BUFSIZE]; -#if defined(USE_IPVX) - sl_strlcpy(errbuf, _("Address family: "), sizeof(errbuf)); - sl_strlcat(errbuf, - (ss.ss_family == AF_INET6) ? _("AF_INET6") : _("AF_INET"), - sizeof(errbuf)); - getnameinfo((struct sockaddr *)&ss, my_addrlen, - ipbuf, sizeof(ipbuf), NULL, 0, NI_NUMERICHOST); -#else - struct sockaddr_in sa; - char * p; - memcpy(&(sa), (struct sockaddr_in*)&ss, sizeof(struct sockaddr_in)); - p = inet_ntoa(sa.sin_addr); - sl_strlcpy(ipbuf, p, sizeof(ipbuf)); - sl_strlcpy(errbuf, _("Address family: AF_INET"), sizeof(errbuf)); -#endif - sl_strlcpy(buf, _("Address: "), sizeof(buf)); - sl_strlcat(buf, ipbuf, sizeof(buf)); - sh_error_handle (SH_ERR_ALL, FIL__, __LINE__, 0, MSG_E_SUBGEN, - errbuf, _("retry_accept")); - sh_error_handle (SH_ERR_ALL, FIL__, __LINE__, 0, MSG_E_SUBGEN, - buf, _("retry_accept")); - } - - sh_ipvx_save(serv_addr, ss.ss_family, (struct sockaddr *) &ss); - - if (flag_err_debug == S_TRUE) - { - char ipbuf[SH_IP_BUF]; - char ipbuf2[SH_IP_BUF]; - char buf[SH_BUFSIZE]; -#if defined(USE_IPVX) - int len = (serv_addr->ss_family == AF_INET) ? - sizeof(struct sockaddr_in) : - sizeof(struct sockaddr_in6); - getnameinfo(sh_ipvx_sockaddr_cast(serv_addr), len, - ipbuf2, sizeof(ipbuf2), NULL, 0, NI_NUMERICHOST); -#else - char * p = inet_ntoa((serv_addr->sin).sin_addr); - sl_strlcpy(ipbuf2, p, sizeof(ipbuf2)); -#endif - sh_ipvx_ntoa (ipbuf, sizeof(ipbuf), serv_addr); - sl_snprintf(buf, sizeof(buf), _("Address: %s / %s"), - ipbuf, ipbuf2); - sh_error_handle (SH_ERR_ALL, FIL__, __LINE__, 0, MSG_E_SUBGEN, - buf, _("retry_accept")); - } - - *addrlen = (int) my_addrlen; + errno = error; SL_RETURN(val_retry, _("retry_accept")); } -static int sh_enable_use_sub = 0; - -#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) -#if defined(HOST_IS_CYGWIN) || defined(__cygwin__) || defined(__CYGWIN32__) || defined(__CYGWIN__) -static int sh_use_sub = 0; -#else -static int sh_use_sub = 1; -#endif -#else -static int sh_use_sub = 0; -#endif - -void sh_calls_enable_sub() -{ - sh_enable_use_sub = 1; - return; -} - -int sh_calls_set_sub (const char * str) -{ - int ret = sh_util_flagval(str, &sh_use_sub); - - if ((ret == 0) && (!sh_use_sub)) - { - sh_kill_sub(); - } - return ret; -} - -long int retry_lstat_ns(const char * file, int line, - const char *file_name, struct stat *buf) +long int retry_lstat(char * file, int line, + const char *file_name, struct stat *buf) { int error; long int val_retry = -1; - char errbuf[SH_ERRBUF_SIZE]; - SL_ENTER(_("retry_lstat_ns")); + SL_ENTER(_("retry_lstat")); do { val_retry = /*@-unrecog@*/lstat (file_name, buf)/*@+unrecog@*/; } while (val_retry < 0 && errno == EINTR); - error = errno; if (val_retry < 0) { - (void) sh_error_message(error, aud_err_message, 64); + (void) sl_strlcpy(aud_err_message, sh_error_message(error), 64); sh_error_handle ((-1), file, line, error, MSG_ERR_LSTAT, - sh_error_message(error, errbuf, sizeof(errbuf)), + sh_error_message(error), file_name ); } errno = error; - - SL_RETURN(val_retry, _("retry_lstat_ns")); -} - -long int retry_lstat(const char * file, int line, - const char *file_name, struct stat *buf) + SL_RETURN(val_retry, _("retry_lstat")); +} + +long int retry_stat(char * file, int line, + const char *file_name, struct stat *buf) { int error; long int val_retry = -1; - char errbuf[SH_ERRBUF_SIZE]; - - SL_ENTER(_("retry_lstat")); - - if (sh_use_sub && sh_enable_use_sub) - { - val_retry = sh_sub_lstat (file_name, buf); - } - else - { - do { - val_retry = /*@-unrecog@*/lstat (file_name, buf)/*@+unrecog@*/; - } while (val_retry < 0 && errno == EINTR); - } - - error = errno; - if (val_retry < 0) { - (void) sh_error_message(error, aud_err_message, 64); - sh_error_handle ((-1), file, line, error, MSG_ERR_LSTAT, - sh_error_message(error, errbuf, sizeof(errbuf)), - file_name ); - } - errno = error; - - SL_RETURN(val_retry, _("retry_lstat")); -} - -long int retry_stat(const char * file, int line, - const char *file_name, struct stat *buf) -{ - int error; - long int val_retry = -1; - char errbuf[SH_ERRBUF_SIZE]; SL_ENTER(_("retry_stat")); - if (sh_use_sub && sh_enable_use_sub) - { - val_retry = sh_sub_stat (file_name, buf); - } - else - { - do { - val_retry = stat (file_name, buf); - } while (val_retry < 0 && errno == EINTR); - } - + do { + val_retry = stat (file_name, buf); + } while (val_retry < 0 && errno == EINTR); error = errno; if (val_retry < 0) { - (void) sh_error_message(error, aud_err_message, 64); + (void) sl_strlcpy(aud_err_message, sh_error_message(error), 64); sh_error_handle ((-1), file, line, error, MSG_ERR_STAT, - sh_error_message(error, errbuf, sizeof(errbuf)), + sh_error_message(error), file_name ); } errno = error; - SL_RETURN(val_retry, _("retry_stat")); } -long int retry_fstat(const char * file, int line, int filed, struct stat *buf) +long int retry_fstat(char * file, int line, int filed, struct stat *buf) { int error; long int val_retry = -1; - char errbuf[SH_ERRBUF_SIZE]; SL_ENTER(_("retry_fstat")); @@ -448,5 +281,5 @@ if (val_retry < 0) { sh_error_handle ((-1), file, line, error, MSG_ERR_FSTAT, - sh_error_message(error, errbuf, sizeof(errbuf)), + sh_error_message(error), (long) filed ); } @@ -455,9 +288,8 @@ } -long int retry_fcntl(const char * file, int line, int fd, int cmd, long arg) +long int retry_fcntl(char * file, int line, int fd, int cmd, long arg) { int error; long int val_retry = -1; - char errbuf[SH_ERRBUF_SIZE]; errno = 0; @@ -479,5 +311,5 @@ if (val_retry < 0) { sh_error_handle ((-1), file, line, error, MSG_ERR_FCNTL, - sh_error_message(error, errbuf, sizeof(errbuf)), + sh_error_message(error), (long) fd, (long) cmd, arg ); } @@ -492,4 +324,6 @@ struct timespec req, rem; #endif + + SL_ENTER(_("retry_fcntl")); errno = 0; @@ -512,16 +346,23 @@ #else if (sec > 0) - sleep (sec); /* nanosleep not available */ - else { + { + sleep (sec); + } + else + { #ifdef HAVE_USLEEP - if (millisec > 0) - usleep(1000 * millisec); + if (millisec > 0) + { + usleep(1000 * millisec); + } #else - if (millisec > 0) - sleep (1); + if (millisec > 0) + { + sleep (1); + } #endif - } + } #endif - return result; + SL_RETURN(result, _("retry_msleep")); } @@ -532,7 +373,7 @@ ***************************************************/ -long int retry_aud_execve (const char * file, int line, - const char *dateiname, char *const argv[], - char *const envp[]) +long int retry_aud_execve (char * file, int line, + const char *dateiname, char * argv[], + char * envp[]) { uid_t a = geteuid(); @@ -540,5 +381,4 @@ int i; int error; - char errbuf[SH_ERRBUF_SIZE]; SL_ENTER(_("retry_aud_execve")); @@ -553,6 +393,5 @@ error = errno; if (i < 0) { - sh_error_handle ((-1), file, line, error, MSG_ERR_EXEC, - sh_error_message(error, errbuf, sizeof(errbuf)), + sh_error_handle ((-1), file, line, error, MSG_ERR_EXEC, sh_error_message(error), dateiname, (long) a, (long) b ); } @@ -562,10 +401,9 @@ -long int retry_aud_utime (const char * file, int line, - char * path, struct utimbuf *buf) +long int retry_aud_utime (char * file, int line, + char * path, struct utimbuf *buf) { long int val_return; int error; - char errbuf[SH_ERRBUF_SIZE]; errno = 0; @@ -584,5 +422,5 @@ if (val_return < 0) { sh_error_handle ((-1), file, line, error, MSG_ERR_UTIME, - sh_error_message(error, errbuf, sizeof(errbuf)), + sh_error_message(error), path, (unsigned long) buf->actime, @@ -593,10 +431,9 @@ } -long int retry_aud_unlink (const char * file, int line, +long int retry_aud_unlink (char * file, int line, char * path) { long int val_return; int error; - char errbuf[SH_ERRBUF_SIZE]; errno = 0; @@ -612,6 +449,5 @@ path); if (val_return < 0) { - sh_error_handle ((-1), file, line, error, MSG_ERR_UNLINK, - sh_error_message(error, errbuf, sizeof(errbuf)), + sh_error_handle ((-1), file, line, error, MSG_ERR_UNLINK, sh_error_message(error), path); } @@ -620,10 +456,9 @@ } -long int retry_aud_dup2 (const char * file, int line, +long int retry_aud_dup2 (char * file, int line, int fd, int fd2) { long int val_return; int error; - char errbuf[SH_ERRBUF_SIZE]; errno = 0; @@ -640,5 +475,5 @@ if (val_return < 0) { sh_error_handle ((-1), file, line, error, MSG_ERR_DUP, - sh_error_message(error, errbuf, sizeof(errbuf)), + sh_error_message(error), (long) fd, val_return); } @@ -647,10 +482,9 @@ } -long int retry_aud_dup (const char * file, int line, +long int retry_aud_dup (char * file, int line, int fd) { long int val_return; int error; - char errbuf[SH_ERRBUF_SIZE]; errno = 0; @@ -666,5 +500,5 @@ if (val_return < 0) { sh_error_handle ((-1), file, line, error, MSG_ERR_DUP, - sh_error_message(error, errbuf, sizeof(errbuf)), + sh_error_message(error), (long) fd, val_return); } @@ -675,10 +509,9 @@ -long int retry_aud_chdir (const char * file, int line, +long int retry_aud_chdir (char * file, int line, const char *path) { long int val_return; int error = 0; - char errbuf[SH_ERRBUF_SIZE]; errno = 0; @@ -694,6 +527,5 @@ path); if (val_return < 0) { - sh_error_handle ((-1), file, line, error, MSG_ERR_CHDIR, - sh_error_message(error, errbuf, sizeof(errbuf)), + sh_error_handle ((-1), file, line, error, MSG_ERR_CHDIR, sh_error_message(error), path); } @@ -703,5 +535,5 @@ -long int aud_open_noatime (const char * file, int line, int privs, +long int aud_open_noatime (char * file, int line, int privs, const char *pathname, int flags, mode_t mode, int * o_noatime) @@ -709,41 +541,22 @@ long int val_return; int error; - char errbuf[SH_ERRBUF_SIZE]; SL_ENTER(_("aud_open")); -#ifdef USE_SUID - if (0 == strcmp(pathname, "/usr/bin/sudo")) - { - uid_t ruid; uid_t euid; uid_t suid; - getresuid(&ruid, &euid, &suid); - } - if (privs == SL_YESPRIV) - sl_set_suid(); -#else + val_return = open (pathname, *o_noatime|flags, mode); + if ((val_return < 0) && (*o_noatime != 0)) + { + val_return = open (pathname, flags, mode); + if (val_return >= 0) + *o_noatime = 0; + } + error = errno; /*@-noeffect@*/ (void) privs; /* fix compiler warning */ /*@+noeffect@*/ -#endif - - val_return = open (pathname, *o_noatime|flags, mode); - -#ifdef USE_SUID - if (privs == SL_YESPRIV) - sl_unset_suid(); -#endif - - if ((val_return < 0) && (*o_noatime != 0)) - { - /* cppcheck-suppress resourceLeak */ - val_return = open (pathname, flags, mode); - if (val_return >= 0) - *o_noatime = 0; - } - error = errno; if (val_return < 0) { - (void) sh_error_message(error, aud_err_message, 64); + (void) sl_strlcpy(aud_err_message, sh_error_message(error), 64); } @@ -755,5 +568,5 @@ if (val_return < 0) { sh_error_handle ((-1), file, line, error, MSG_ERR_OPEN, - sh_error_message(error, errbuf, sizeof(errbuf)), + sh_error_message(error), pathname, (long) flags, (long) mode, val_return); } @@ -762,34 +575,21 @@ } -long int aud_open (const char * file, int line, int privs, +long int aud_open (char * file, int line, int privs, const char *pathname, int flags, mode_t mode) { long int val_return; int error; - char errbuf[SH_ERRBUF_SIZE]; SL_ENTER(_("aud_open")); -#ifdef USE_SUID - if (privs == SL_YESPRIV) - sl_set_suid(); -#else + val_return = open (pathname, flags, mode); + error = errno; /*@-noeffect@*/ (void) privs; /* fix compiler warning */ /*@+noeffect@*/ -#endif - - val_return = open (pathname, flags, mode); - -#ifdef USE_SUID - if (privs == SL_YESPRIV) - sl_unset_suid(); -#endif - - error = errno; if (val_return < 0) { - (void) sh_error_message(error, aud_err_message, 64); + (void) sl_strlcpy(aud_err_message, sh_error_message(error), 64); } @@ -801,5 +601,5 @@ if (val_return < 0) { sh_error_handle ((-1), file, line, error, MSG_ERR_OPEN, - sh_error_message(error, errbuf, sizeof(errbuf)), + sh_error_message(error), pathname, (long) flags, (long) mode, val_return); } @@ -808,9 +608,8 @@ } -long int aud_kill (const char * file, int line, pid_t pid, int sig) +long int aud_kill (char * file, int line, pid_t pid, int sig) { int myerror; long int val_return = kill (pid, sig); - char errbuf[SH_ERRBUF_SIZE]; myerror = errno; @@ -822,5 +621,5 @@ if (val_return < 0) { sh_error_handle ((-1), file, line, myerror, MSG_ERR_KILL, - sh_error_message(myerror, errbuf, sizeof(errbuf)), + sh_error_message(myerror), (long) pid, (long) sig); } @@ -830,34 +629,33 @@ /*@noreturn@*/ -void aud_exit (const char * file, int line, int exitval) +void aud_exit (char * file, int line, int fd) { if (sh.flag.audit != 0 && (sh.flag.aud_mask & AUD_EXIT) != 0) sh_error_handle ((-1), file, line, 0, MSG_AUD_EXIT, - (long) exitval); + (long) fd); SL_ENTER(_("aud_exit")); - sh.flag.exit = exitval; - exit(exitval); + sh.flag.exit = fd; + exit(fd); } /*@noreturn@*/ -void aud__exit (const char * file, int line, int exitval) +void aud__exit (char * file, int line, int fd) { if (sh.flag.audit != 0 && (sh.flag.aud_mask & AUD_EXIT) != 0) sh_error_handle ((-1), file, line, 0, MSG_AUD_EXIT, - (long) exitval); + (long) fd); SL_ENTER(_("aud__exit")); - sh.flag.exit = exitval; - _exit(exitval); -} - -pid_t aud_fork (const char * file, int line) + sh.flag.exit = fd; + _exit(fd); +} + +pid_t aud_fork (char * file, int line) { int error; pid_t i = fork(); - char errbuf[SH_ERRBUF_SIZE]; error = errno; @@ -869,5 +667,5 @@ if (i == (pid_t) -1) { sh_error_handle ((-1), file, line, error, MSG_ERR_FORK, - sh_error_message(error, errbuf, sizeof(errbuf)), + sh_error_message(error), (long) i); } @@ -876,9 +674,8 @@ } -int aud_setuid (const char * file, int line, uid_t uid) +int aud_setuid (char * file, int line, uid_t uid) { int error = 0; int i = 0; - char errbuf[SH_ERRBUF_SIZE]; SL_ENTER(_("aud_setuid")); @@ -897,5 +694,5 @@ if (i < 0) { sh_error_handle ((-1), file, line, error, MSG_ERR_SETUID, - sh_error_message(error, errbuf, sizeof(errbuf)), + sh_error_message(error), (long) uid); } @@ -904,9 +701,8 @@ } -int aud_setgid (const char * file, int line, gid_t gid) +int aud_setgid (char * file, int line, gid_t gid) { int error = 0; int i = 0; - char errbuf[SH_ERRBUF_SIZE]; SL_ENTER(_("aud_setgid")); @@ -926,5 +722,5 @@ if (i < 0) { sh_error_handle ((-1), file, line, error, MSG_ERR_SETGID, - sh_error_message(error, errbuf, sizeof(errbuf)), + sh_error_message(error), (long) gid); } @@ -933,9 +729,8 @@ } -int aud_pipe (const char * file, int line, int modus[2]) +int aud_pipe (char * file, int line, int * modus) { int error; int i = pipe (modus); - char errbuf[SH_ERRBUF_SIZE]; SL_ENTER(_("aud_pipe")); @@ -954,9 +749,9 @@ if (i < 0) sh_error_handle ((-1), file, line, error, MSG_ERR_PIPE, - sh_error_message(error, errbuf, sizeof(errbuf)), + sh_error_message(error), (long) 0, (long) 0); else sh_error_handle ((-1), file, line, error, MSG_ERR_PIPE, - sh_error_message(error, errbuf, sizeof(errbuf)), + sh_error_message(error), (long) modus[0], (long) modus[1]); } Index: trunk/src/sh_cat.c =================================================================== --- trunk/src/sh_cat.c (revision 591) +++ trunk/src/sh_cat.c (revision 1) @@ -8,5 +8,5 @@ /*@-nullassign@*/ -const char * class_cat[] = { +char * class_cat[] = { N_("AUD"), /* 0 */ N_("PANIC"), /* 1 */ @@ -40,5 +40,5 @@ { MSG_FI_CSUM, SH_ERR_ALL, FIL, N_("msg=\"Checksum\" chk=\"%s\" path=\"%s\"")}, { MSG_FI_DSUM, SH_ERR_INFO, FIL, N_("msg=\"d: %3ld, -: %3ld, l: %3ld, |: %3ld, s: %3ld, c: %3ld, b: %3ld\"")}, - { MSG_FI_CHK, SH_ERR_INFO, FIL, N_("msg=\"Checking %16s\" path=\"%s\"")}, + { MSG_FI_CHK, SH_ERR_INFO, FIL, N_("msg=\"Checking\" path=\"%s\"")}, #endif @@ -70,13 +70,9 @@ { MSG_CHECK_0, SH_ERR_WARN, RUN, N_("msg=\"No files or directories defined for checking\"")}, { MSG_CHECK_1, SH_ERR_STAMP, STAMP, N_("msg=\"File check completed.\" time=\"%ld\" kBps=\"%f\"")}, - { MSG_CHECK_2, SH_ERR_STAMP, STAMP, N_("msg=\"File check starting.\"")}, { MSG_STAMP, SH_ERR_STAMP, STAMP, N_("msg=\"---- TIMESTAMP ----\"")}, - { MSG_DCLOSE, SH_ERR_NOTICE, RUN, N_("msg=\"Finished writing baseline database.\"")}, - + { MSG_D_START, SH_ERR_INFO, RUN, N_("msg=\"Downloading configuration file\"")}, { MSG_D_DSTART, SH_ERR_INFO, RUN, N_("msg=\"Downloading database file\"")}, { MSG_D_FAIL, SH_ERR_INFO, RUN, N_("msg=\"No file from server, trying local file\"")}, - { MSG_D_DELTAOK, SH_ERR_SEVERE, RUN, N_("msg=\"Delta database downloaded\", path=\"%s\"")}, - { MSG_D_DELTAFAIL, SH_ERR_SEVERE, RUN, N_("msg=\"Delta database download failed\", path=\"%s\"")}, @@ -97,4 +93,17 @@ { MSG_SUID_QREPORT,SH_ERR_SEVERE, EVENT, N_("msg=\"Quarantine report: %s\" path=\"%s\"") }, { MSG_SUID_ERROR, SH_ERR_SEVERE, EVENT, N_("msg=\"Quarantine error: %s\"") }, +#endif + +#ifdef SH_USE_KERN + /* FreeBSD */ + { MSG_KERN_POLICY, SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY KERNEL BSD syscall table: new: %#lx old: %#lx\" syscall=\"%03d %s\"") }, + { MSG_KERN_POL_CO, SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY KERNEL BSD syscall code: new: %#x,%#x old: %#x,%#x\" syscall=\"%03d %s\"") }, + + /* Linux */ + { MSG_KERN_SYSCALL,SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [Kernel] SYSCALL modified syscall\" syscall=\"%03d %s\" %s") }, + { MSG_KERN_PROC, SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [Kernel] PROC modified proc filesystem: %s\"") }, + { MSG_KERN_IDT, SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [Kernel] IDT modified interrupt %03d: new: 0x%-8.8lx %-9s %3d %c old: 0x%-8.8lx %-9s %3d %c\" %s") }, + { MSG_KERN_GATE, SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [Kernel] SYS_GATE modified system_call: new: %#x,%#x old: %#x,%#x\" syscall=\"%03d %s\" %s") }, + #endif @@ -113,54 +122,15 @@ { MSG_UT_ROT, SH_ERR_WARN, RUN, N_("msg=\"Logfile size decreased\" path=\"%s\"")}, - { MSG_UT_BAD, SH_ERR_SEVERE, EVENT, N_("msg=\"Login at disallowed time\" userid=\"%s\" host=\"%s\" time=\"%s\"")}, - { MSG_UT_FIRST, SH_ERR_SEVERE, EVENT, N_("msg=\"First login from this host\" userid=\"%s\" host=\"%s\" time=\"%s\"")}, - { MSG_UT_OUTLIER, SH_ERR_SEVERE, EVENT, N_("msg=\"Login time outlier\" userid=\"%s\" host=\"%s\" time=\"%s\"")}, - -#endif - -#ifdef SH_USE_PROCESSCHECK - { MSG_PCK_CHECK, SH_ERR_INFO, RUN, N_("msg=\"Checking processes in pid interval [%ld,%ld]\"")}, - { MSG_PCK_OK, SH_ERR_ALL, RUN, N_("msg=\"PID %ld found with tests %s\"")}, - { MSG_PCK_P_HIDDEN,SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [Process] Hidden pid: %ld tests: %s\" path=\"%s\" userid=\"%s\"")}, - { MSG_PCK_HIDDEN, SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [Process] Hidden pid: %ld tests: %s\"")}, - { MSG_PCK_FAKE, SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [Process] Fake pid: %ld tests: %s\"")}, - { MSG_PCK_MISS, SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [Process] Missing: %s\"")}, -#endif - -#ifdef SH_USE_PORTCHECK - { MSG_PORT_MISS, SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [ServiceMissing] %s\"")}, - { MSG_PORT_NEW, SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [ServiceNew] %s\" path=\"%s\" pid=\"%lu\" userid=\"%s\"")}, - { MSG_PORT_RESTART,SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [ServiceRestarted] %s\" path=\"%s\" pid=\"%lu\" userid=\"%s\"")}, - { MSG_PORT_NEWPORT,SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [ServicePortSwitch] %s\" path=\"%s\" pid=\"%lu\" userid=\"%s\"")}, #endif #ifdef SH_USE_MOUNTS - { MSG_MNT_CHECK, SH_ERR_INFO, RUN, N_("msg=\"Checking mounts\"")}, + { MSG_MNT_CHECK, SH_ERR_NOTICE, RUN, N_("msg=\"Checking mounts\"")}, { MSG_MNT_MEMLIST, SH_ERR_ERR, RUN, N_("msg=\"Cannot read mount list from memory\"")}, - { MSG_MNT_MNTMISS, SH_ERR_WARN, EVENT, N_("msg=\"POLICY [Mounts] Mount missing\" path=\"%s\"")}, - { MSG_MNT_OPTMISS, SH_ERR_WARN, EVENT, N_("msg=\"POLICY [Mounts] Mount option missing\" path=\"%s\" option=\"%s\"")}, + { MSG_MNT_MNTMISS, SH_ERR_WARN, EVENT, N_("msg=\"Mount missing\" path=\"%s\"")}, + { MSG_MNT_OPTMISS, SH_ERR_WARN, EVENT, N_("msg=\"Mount option missing\" path=\"%s\" option=\"%s\"")}, #endif #ifdef SH_USE_USERFILES { MSG_USERFILES_SUMMARY,SH_ERR_INFO, RUN, N_("msg=\"Checked for users files\"") }, -#endif - -#ifdef USE_LOGFILE_MONITOR - { MSG_LOGMON_CHKS, SH_ERR_INFO, RUN, N_("msg=\"Checking logfile %s\"") }, - { MSG_LOGMON_CHKE, SH_ERR_INFO, RUN, N_("msg=\"Finished logfile %s, %lu new records processed\"") }, - { MSG_LOGMON_MISS, SH_ERR_ERR, RUN, N_("msg=\"Missing logfile %s\"") }, - { MSG_LOGMON_EOPEN,SH_ERR_ERR, RUN, N_("msg=\"Cannot open logfile %s\"") }, - { MSG_LOGMON_EREAD,SH_ERR_ERR, RUN, N_("msg=\"Error while reading logfile %s\"") }, - { MSG_LOGMON_REP, SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [Logfile] %s\" time=\"%s\" host=\"%s\" path=\"%s\"") }, - { MSG_LOGMON_SUM, SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [Logfile] %s\" host=\"%s\" path=\"%s\"") }, - { MSG_LOGMON_COR, SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [Logfile] Correlation event %s occured %d time(s)\"") }, - { MSG_LOGMON_MARK, SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [Logfile] Event %s missing for %lu seconds\"") }, - { MSG_LOGMON_BURST, SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [Logfile] Repeated %d times: %s\" host=\"%s\"") }, -#endif - -#ifdef USE_REGISTRY_CHECK - { MSG_REG_MISS, SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [RegistryKeyMissing] %s\" path=\"%s\" %s")}, - { MSG_REG_NEW, SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [RegistryKeyNew] %s\" path=\"%s\" %s")}, - { MSG_REG_CHANGE, SH_ERR_SEVERE, EVENT, N_("msg=\"POLICY [RegistryKeyChanged] %s\" path=\"%s\" %s")}, #endif @@ -172,5 +142,5 @@ { MSG_FI_CSUM, SH_ERR_ALL, FIL, N_("msg=\"Checksum\" chk=\"%s\" path=\"%s\"")}, { MSG_FI_DSUM, SH_ERR_INFO, FIL, N_("msg=\"d: %3ld, -: %3ld, l: %3ld, |: %3ld, s: %3ld, c: %3ld, b: %3ld\"")}, - { MSG_FI_CHK, SH_ERR_INFO, FIL, N_("msg=\"Checking %16s\" path=\"%s\"")}, + { MSG_FI_CHK, SH_ERR_INFO, FIL, N_("msg=\"Checking\" path=\"%s\"")}, #endif @@ -187,5 +157,5 @@ { MSG_FI_NOGRP, SH_ERR_ERR, FIL, N_("interface=\"getgrgid\" msg=\"No such group\" group=\"%ld\" path=\"%s\"")}, { MSG_FI_NOUSR, SH_ERR_ERR, FIL, N_("interface=\"getpwuid\" msg=\"No such user\" userid=\"%ld\" path=\"%s\"")}, - { MSG_FI_STAT, SH_ERR_ERR, FIL, N_("interface=\"%s\" msg=\"%s\" userid=\"%ld\" path=\"%s\"")}, + { MSG_FI_LSTAT, SH_ERR_ERR, FIL, N_("interface=\"lstat\" msg=\"%s\" path=\"%s\"")}, { MSG_FI_OBSC, SH_ERR_ERR, FIL, N_("msg=\"Weird filename\" path=\"%s\"")}, { MSG_FI_OBSC2, SH_ERR_ERR, FIL, N_("msg=\"Weird filename\" path=\"%s/%s\"")}, @@ -211,5 +181,5 @@ { MSG_TCP_MISMATCH,SH_ERR_ERR, TCP, N_("msg=\"Protocol mismatch\"")}, { MSG_TCP_MISENC, SH_ERR_ERR, TCP, N_("msg=\"Encryption mismatch in %s: server: %s client: %s\"")}, - { MSG_TCP_NONAME, SH_ERR_ERR, TCP, N_("msg=\"No server name known\"")}, + { MSG_TCP_NONAME, SH_ERR_ERR, TCP, N_("msg=\"No server name available\"")}, { MSG_TCP_UNEXP, SH_ERR_ERR, TCP, N_("msg=\"Unexpected reply\"")}, { MSG_TCP_EFIL, SH_ERR_ERR, TCP, N_("msg=\"Could not open temporary file\"")}, @@ -225,5 +195,4 @@ { MSG_TCP_CREG, SH_ERR_ALL, TCP, N_("msg=\"Registered %s, salt %s, verifier %s\"")}, - { MSG_TCP_AREG, SH_ERR_ALL, TCP, N_("msg=\"Registered %s, hostname %s\"")}, { MSG_TCP_FAUTH, SH_ERR_INFO, TCP, N_("msg=\"Force authentication\" host=\"%s\"")}, @@ -246,5 +215,5 @@ { MSG_TCP_ILL, SH_ERR_SEVERE, TCP, N_("msg=\"Restart without prior exit\" host=\"%s\"")}, { MSG_TCP_SYNC, SH_ERR_SEVERE, TCP, N_("msg=\"Out of sync\" host=\"%s\"")}, - { MSG_TCP_RESET, SH_ERR_NOTICE, TCP, N_("msg=\"Connection reset by peer\" host=\"%s\"")}, + { MSG_TCP_RESET, SH_ERR_SEVERE, TCP, N_("msg=\"Connection reset by peer\" host=\"%s\"")}, { MSG_TCP_CNEW, SH_ERR_INFO, TCP, N_("msg=\"New connection\" socket_id=\"%d\"")}, { MSG_E_HTML, SH_ERR_ERR, ERR, N_("msg=\"Error writing HTML status\"")}, @@ -265,5 +234,5 @@ { MSG_MSTAMP, SH_ERR_STAMP, STAMP, N_("msg=\"Memory used: max.=%lu, current=%lu\"")}, { MSG_MSTAMP2, SH_ERR_STAMP, STAMP, N_("msg=\"Blocks: %d allocated, %d freed, %d maximum\"")}, - { MSG_E_MNULL, SH_ERR_ERR, ERR, N_("msg=\"Dereferenced NULL pointer allocated in %s, line %d\" source_file=\"%s\" source_line=\"%d\"")}, + { MSG_E_MNULL, SH_ERR_ERR, ERR, N_("msg=\"Dereferenced NULL pointer\" source_file=\"%s\" source_line=\"%d\"")}, { MSG_E_MMEM, SH_ERR_ERR, ERR, N_("msg=\"Out of memory\" source_file=\"%s\" source_line=\"%d\"")}, { MSG_E_MREC, SH_ERR_ERR, ERR, N_("msg=\"Free() on unrecorded block\" source_file=\"%s\" source_line=\"%d\"")}, @@ -276,8 +245,7 @@ { MSG_E_HASH, SH_ERR_ERR, ERR, N_("msg=\"Incorrect checksum\" path=\"%s\"")}, { MSG_E_ACCESS, SH_ERR_ERR, ERR, N_("msg=\"File not accessible\" userid=\"%ld\" path=\"%s\"")}, - { MSG_E_READ, SH_ERR_ERR, ERR, N_("msg=\"Not accessible or not a regular file (%s / %s)\" path=\"%s\"")}, - { MSG_E_NOTREG, SH_ERR_ERR, ERR, N_("msg=\"Not a regular file\" path=\"%s\"")}, + { MSG_E_READ, SH_ERR_ERR, ERR, N_("msg=\"Not accessible or not a regular file\" path=\"%s\"")}, { MSG_E_TIMEOUT, SH_ERR_ERR, ERR, N_("msg=\"Timeout (%d sec) while checksumming file\" path=\"%s\"")}, - { MSG_NODEV, SH_ERR_ERR, ERR, N_("msg=\"Device not available or timeout during read attempt\" userid=\"%ld\" path=\"%s\"")}, + { MSG_NODEV, SH_ERR_ERR, ERR, N_("msg=\"Device not available\" userid=\"%ld\" path=\"%s\"")}, { MSG_LOCKED, SH_ERR_ERR, ERR, N_("msg=\"File lock error\" userid=\"%ld\" path=\"%s\" obj=\"%s\"")}, { MSG_PIDFILE, SH_ERR_ERR, ERR, N_("msg=\"Could not write PID file\" userid=\"%ld\" path=\"%s\"")}, @@ -374,5 +342,5 @@ { MSG_FI_CSUM, SH_ERR_ALL, FIL, N_("msg=, chk=<%s>, path=<%s>")}, { MSG_FI_DSUM, SH_ERR_INFO, FIL, N_("msg=")}, - { MSG_FI_CHK, SH_ERR_INFO, FIL, N_("msg=, path=<%s>")}, + { MSG_FI_CHK, SH_ERR_INFO, FIL, N_("msg=, path=<%s>")}, #endif @@ -403,13 +371,9 @@ { MSG_CHECK_0, SH_ERR_WARN, RUN, N_("msg=")}, { MSG_CHECK_1, SH_ERR_STAMP, STAMP, N_("msg=, time=<%ld>, kBps=<%f>")}, - { MSG_CHECK_2, SH_ERR_STAMP, STAMP, N_("msg=")}, { MSG_STAMP, SH_ERR_STAMP, STAMP, N_("msg=<---- TIMESTAMP ---->")}, - { MSG_DCLOSE, SH_ERR_NOTICE, RUN, N_("msg=")}, { MSG_D_START, SH_ERR_INFO, RUN, N_("msg=")}, { MSG_D_DSTART, SH_ERR_INFO, RUN, N_("msg=")}, { MSG_D_FAIL, SH_ERR_INFO, RUN, N_("msg=")}, - { MSG_D_DELTAOK, SH_ERR_SEVERE, RUN, N_("msg=, path=<%s>")}, - { MSG_D_DELTAFAIL, SH_ERR_SEVERE, RUN, N_("msg=, path=<%s>")}, @@ -433,6 +397,6 @@ #ifdef SH_USE_KERN - { MSG_KERN_POLICY, SH_ERR_SEVERE, EVENT, N_("msg=, syscall=<%03d %s>") }, - { MSG_KERN_POL_CO, SH_ERR_SEVERE, EVENT, N_("msg=, syscall=<%03d %s>") }, + { MSG_KERN_POLICY, SH_ERR_SEVERE, EVENT, N_("msg=, syscall=<%03d %s>") }, + { MSG_KERN_POL_CO, SH_ERR_SEVERE, EVENT, N_("msg=, syscall=<%03d %s>") }, { MSG_KERN_SYSCALL,SH_ERR_SEVERE, EVENT, N_("msg= syscall=<%03d %s>, %s") }, @@ -460,23 +424,4 @@ { MSG_UT_ROT, SH_ERR_WARN, RUN, N_("msg=, path=<%s>")}, - { MSG_UT_BAD, SH_ERR_SEVERE, EVENT, N_("msg= userid=<%s> host=<%s> time=<%s>")}, - { MSG_UT_FIRST, SH_ERR_SEVERE, EVENT, N_("msg= userid=<%s> host=<%s> time=<%s>")}, - { MSG_UT_OUTLIER, SH_ERR_SEVERE, EVENT, N_("msg= userid=<%s> host=<%s> time=<%s>")}, -#endif - -#ifdef SH_USE_PROCESSCHECK - { MSG_PCK_CHECK, SH_ERR_INFO, RUN, N_("msg=")}, - { MSG_PCK_OK, SH_ERR_ALL, RUN, N_("msg=")}, - { MSG_PCK_P_HIDDEN,SH_ERR_SEVERE, EVENT, N_("msg=