minhtrannhat/os161
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moving the secret inside the tests, not in a library function.

Browse Source
This commit is contained in:
Geoffrey Challen 2015-12-31 12:03:41 -05:00
parent ff1d44b505
commit 5271fc50c7
4 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kern/include/kern/secret.h
View File

@ -38,14 +38,12 @@
#define _SECRET_H_
/*
* During automated testing this is set to a random 32-bit value, to ensure
* that the kernel is actually running the compiled binaries. A non-zero value
* can also be used as a flag to change test output. During normal testing
* this can be set to zero to disable printing the kernel secret and enable
* normal test output.
* During automated testing all instances of KERNEL_SECRET in trusted tests
* are rewritten to a random value to ensure that the kernel is actually
* running the appropriate tests. So this value is never actually used, but
* allows normally compilation and operation.
*/
// #define KERNEL_SECRET ((unsigned long long)1) // Cast for consistent printf
#define KERNEL_SECRET ((unsigned long long)0) // Cast for consistent printf
#define KERNEL_SECRET ""
#endif /* _SECRET_H_ */

1
kern/include/lib.h
View File

@ -204,6 +204,5 @@ void random_spinner(uint32_t);
*/
int tkprintf(const char *format, ...) __PF(1,2);
int skprintf(const char *format, ...) __PF(1,2);
#endif /* _LIB_H_ */

22
kern/lib/kprintf.c
View File

@ -149,7 +149,7 @@ tkprintf(const char *fmt, ...)
int chars;
va_list ap;
if (KERNEL_SECRET != 0) {
if (strcmp(KERNEL_SECRET, "") != 0) {
return 0;
}
@ -160,26 +160,6 @@ tkprintf(const char *fmt, ...)
return chars;
}
/*
* kprintf variant that prints the automated secret
*/
int
skprintf(const char *fmt, ...)
{
int chars;
va_list ap;
if (KERNEL_SECRET != 0) {
kprintf("SECRET=%llu ", KERNEL_SECRET);
}
va_start(ap, fmt);
chars = vkprintf(fmt, ap);
va_end(ap);
return chars;
}
/*
* panic() is for fatal errors. It prints the printf arguments it's
* passed and then halts the system.

4
kern/test/synchtest.c
View File

@ -98,9 +98,9 @@ static
void
success(bool status, const char *msg) {
if (status == SUCCESS) {
skprintf("%s: SUCCESS\n", msg);
kprintf("%s%s: SUCCESS\n", KERNEL_SECRET, msg);
} else {
skprintf("%s: FAIL\n", msg);
kprintf("%s%s: FAIL\n", KERNEL_SECRET, msg);
}
}