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

Refactored ksecprintf -> secprintf. Secure code is now all in common libtest161.

Browse Source 
This library gets linked in by default in userland, and the common files are
included in the kernel.
This commit is contained in:
Scott Haseley 2016-02-23 15:31:37 -05:00
parent 2e74764d49
commit 1b99c0e18f
22 changed files with 241 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/libc/secure/secure.h
View File

@ -1,16 +0,0 @@
#ifndef _SECURE_H
#define _SECURE_H
#define SHA256_BLOCK_SIZE 64
#define SHA256_OUTPUT_SIZE 32
#define TOHEX(n) n < 10 ? '0'+n : 'a' + (n-10)
// Compute the hex string from SHA256 hash output
void hex_from_hash(unsigned char hash[SHA256_OUTPUT_SIZE], char res[SHA256_OUTPUT_SIZE*2 + 1]);
// Compute the FIPS 198-1 complient HMAC of msg using SHA256
void hmac_sha256(const char *msg, size_t msg_len, char *key, size_t key_len,
unsigned char output[SHA256_OUTPUT_SIZE]);
#endif //_SECURE_H

0
common/libc/secure/config.h → common/libtest161/config.h
View File

20
common/libc/secure/secure.c → common/libtest161/secure.c
View File

@ -27,12 +27,28 @@
static const unsigned char ipad[SHA256_BLOCK_SIZE] = { [0 ... SHA256_BLOCK_SIZE-1] = 0x36 };
static const unsigned char opad[SHA256_BLOCK_SIZE] = { [0 ... SHA256_BLOCK_SIZE-1] = 0x5c };
// Hack for not having a userspace malloc until ASST3. We 'allocate' these statuc buffers.
// This works because the process single-threaded.
#define NUM_BUFFERS 4
#define BUFFER_LEN 1024
static char temp_buffers[NUM_BUFFERS][BUFFER_LEN];
static int buf_num = 0;
static void * _alloc(size_t size)
{
#ifdef _KERNEL
// Compiler
(void)temp_buffers;
(void)buf_num;
return kmalloc(size);
#else
return malloc(size);
(void)size;
void *ptr = temp_buffers[buf_num];
buf_num++;
buf_num = buf_num % NUM_BUFFERS;
return ptr;
#endif
}
@ -41,7 +57,7 @@ static void _free(void *ptr)
#ifdef _KERNEL
kfree(ptr);
#else
free(ptr);
(void)ptr;
#endif
}

0
common/libc/secure/sha256.c → common/libtest161/sha256.c
View File

0
common/libc/secure/sha256.h → common/libtest161/sha256.h
View File

107
common/libtest161/test161.c Normal file
View File

@ -0,0 +1,107 @@
// Beware, this code is shared between the kernel and userspace.
#ifdef _KERNEL
#include <types.h>
#include <lib.h>
#include <kern/errno.h>
#include <kern/secure.h>
#include <kern/test161.h>
#else
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#include <test161/test161.h>
#include <test161/secure.h>
#endif
// Hack for allocating userspace memory without malloc.
static char temp_buffer[4096];
static inline void * _alloc(size_t size)
{
#ifdef _KERNEL
(void)temp_buffer;
return kmalloc(size);
#else
(void)size;
return temp_buffer;
#endif
}
static inline void _free(void *ptr)
{
#ifdef _KERNEL
kfree(ptr);
#else
(void)ptr;
#endif
}
/*
* Common success function for kernel tests. If SECRET_TESTING is defined,
* ksecprintf will compute the hmac/sha256 hash of any message using the
* shared secret and a random salt value. The (secure) server also knows
* the secret and can verify the message was generated by a trusted source.
* The salt value prevents against replay attacks.
*/
int
success(int status, const char * secret, const char * name) {
if (status == TEST161_SUCCESS) {
return secprintf(secret, "SUCCESS", name);
} else {
return secprintf(secret, "FAIL", name);
}
}
#ifndef SECRET_TESTING
int
secprintf(const char * secret, const char * msg, const char * name)
{
(void)secret;
#ifdef _KERNEL
return kprintf("%s: %s\n", name, msg);
#else
return printf("%s: %s\n", name, msg);
#endif
}
#else
int
secprintf(const char * secret, const char * msg, const char * name)
{
char *hash, *salt, *fullmsg;
int res;
size_t len;
hash = salt = fullmsg = NULL;
// test161 expects "name: msg"
len = strlen(name) + strlen(msg) + 3; // +3 for " :" and null terminator
fullmsg = (char *)_alloc(len);
if (fullmsg == NULL) {
return -ENOMEM;
}
snprintf(fullmsg, len, "%s: %s", name, msg);
res = hmac_salted(fullmsg, len-1, secret, strlen(secret), &hash, &salt);
if (res)
return -res;
#ifdef _KERNEL
res = kprintf("(%s, %s, %s, %s: %s)\n", name, hash, salt, name, msg);
#else
res = printf("(%s, %s, %s, %s: %s)\n", name, hash, salt, name, msg);
#endif
_free(hash);
_free(salt);
_free(fullmsg);
return res;
}
#endif

8
kern/conf/conf.kern
View File

@ -310,12 +310,12 @@ file ../common/libc/string/strrchr.c
file ../common/libc/string/strtok_r.c
#
# Security functions that we've added to the C library and
# use for secure output.
# libtest161 shared code and security functions
#
file ../common/libc/secure/secure.c
file ../common/libc/secure/sha256.c
file ../common/libtest161/test161.c
file ../common/libtest161/secure.c
file ../common/libtest161/sha256.c
########################################
# #

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

@ -44,7 +44,7 @@
* allows normally compilation and operation.
*/
#undef SECRET_TESTING
#define SECRET_TESTING
#define SECRET "SECRET"
#endif /* _SECRET_H_ */

41
kern/include/kern/test161.h Normal file
View File

@ -0,0 +1,41 @@
/*
* Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
* The President and Fellows of Harvard College.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY AND CONTRIBUTORS ``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 UNIVERSITY 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.
*/
#ifndef _KERN_TEST161_H_
#define _KERN_TEST161_H_
#define TEST161_SUCCESS 0
#define TEST161_FAIL 1
#include <kern/secret.h>
int success(int, const char *, const char *);
int secprintf(const char *secret, const char *msg, const char *name);
#endif /* _KERN_TEST161_H_ */

7
kern/include/test.h
View File

@ -178,13 +178,6 @@ int ll1test(int, char **);
int ll16test(int, char **);
#endif
#define SUCCESS 0
#define FAIL 1
int success(bool, const char *, const char *);
int ksecprintf(const char *secret, const char *msg, const char *name);
void random_yielder(uint32_t);
void random_spinner(uint32_t);

58
kern/test/lib.c
View File

@ -1,65 +1,7 @@
#include <kern/secret.h>
#include <types.h>
#include <thread.h>
#include <test.h>
#include <lib.h>
#include <kern/secure.h>
/*
* Common success function for kernel tests. If SECRET_TESTING is defined,
* ksecprintf will compute the hmac/sha256 hash of any message using the
* shared secret and a random salt value. The (secure) server also knows
* the secret and can verify the message was generated by a trusted source.
* The salt value prevents against replay attacks.
*/
int
success(bool status, const char * secret, const char * name) {
if (status == SUCCESS) {
return ksecprintf(secret, "SUCCESS", name);
} else {
return ksecprintf(secret, "FAIL", name);
}
}
#ifndef SECRET_TESTING
int
ksecprintf(const char * secret, const char * msg, const char * name)
{
(void)secret;
return kprintf("%s: %s\n", name, msg);
}
#else
int
ksecprintf(const char * secret, const char * msg, const char * name)
{
char *hash, *salt, *fullmsg;
int res;
size_t len;
hash = salt = fullmsg = NULL;
// test161 expects "name: msg"
len = strlen(name) + strlen(msg) + 3; // +3 for " :" and null terminator
fullmsg = (char *)kmalloc(len);
KASSERT(fullmsg != NULL);
snprintf(fullmsg, len, "%s: %s", name, msg);
res = hmac_salted(fullmsg, len-1, secret, strlen(secret), &hash, &salt);
KASSERT(res == 0);
res = kprintf("(%s, %s, %s, %s: %s)\n", name, hash, salt, name, msg);
kfree(hash);
kfree(salt);
kfree(fullmsg);
return res;
}
#endif
/*
* Helper functions used by testing and problem driver code

12
kern/test/rwtest.c
View File

@ -9,7 +9,7 @@
#include <thread.h>
#include <synch.h>
#include <test.h>
#include <kern/secret.h>
#include <kern/test161.h>
#include <spinlock.h>
/*
@ -21,7 +21,7 @@ int rwtest(int nargs, char **args) {
(void)args;
kprintf_n("rwt1 unimplemented\n");
success(FAIL, SECRET, "rwt1");
success(TEST161_FAIL, SECRET, "rwt1");
return 0;
}
@ -31,7 +31,7 @@ int rwtest2(int nargs, char **args) {
(void)args;
kprintf_n("rwt2 unimplemented\n");
success(FAIL, SECRET, "rwt2");
success(TEST161_FAIL, SECRET, "rwt2");
return 0;
}
@ -41,7 +41,7 @@ int rwtest3(int nargs, char **args) {
(void)args;
kprintf_n("rwt3 unimplemented\n");
success(FAIL, SECRET, "rwt3");
success(TEST161_FAIL, SECRET, "rwt3");
return 0;
}
@ -51,7 +51,7 @@ int rwtest4(int nargs, char **args) {
(void)args;
kprintf_n("rwt4 unimplemented\n");
success(FAIL, SECRET, "rwt4");
success(TEST161_FAIL, SECRET, "rwt4");
return 0;
}
@ -61,7 +61,7 @@ int rwtest5(int nargs, char **args) {
(void)args;
kprintf_n("rwt5 unimplemented\n");
success(FAIL, SECRET, "rwt5");
success(TEST161_FAIL, SECRET, "rwt5");
return 0;
}

40
kern/test/synchprobs.c
View File

@ -9,14 +9,14 @@
#include <test.h>
#include <current.h>
#include <synch.h>
#include <kern/secret.h>
#include <kern/test161.h>
#include <spinlock.h>
#define PROBLEMS_MAX_YIELDER 16
#define PROBLEMS_MAX_SPINNER 8192
#define SUCCESS 0
#define FAIL 1
#define TEST161_SUCCESS 0
#define TEST161_FAIL 1
/*
* Shared initialization routines
@ -29,7 +29,7 @@ static struct semaphore *startsem;
static struct semaphore *endsem;
struct spinlock status_lock;
static bool test_status = FAIL;
static bool test_status = TEST161_FAIL;
const char *test_message;
static
@ -37,7 +37,7 @@ bool
failif(bool condition, const char *message) {
if (condition) {
spinlock_acquire(&status_lock);
test_status = FAIL;
test_status = TEST161_FAIL;
test_message = message;
spinlock_release(&status_lock);
}
@ -273,7 +273,7 @@ whalemating(int nargs, char **args) {
panic("sp1: sem_create failed\n");
}
spinlock_init(&status_lock);
test_status = SUCCESS;
test_status = TEST161_SUCCESS;
test_message = "";
whalemating_init();
@ -308,18 +308,18 @@ whalemating(int nargs, char **args) {
}
/* Make sure nothing is happening... */
loop_status = SUCCESS;
for (i = 0; i < CHECK_TIMES && loop_status == SUCCESS; i++) {
loop_status = TEST161_SUCCESS;
for (i = 0; i < CHECK_TIMES && loop_status == TEST161_SUCCESS; i++) {
kprintf_t(".");
random_spinner(PROBLEMS_MAX_SPINNER);
lock_acquire(testlock);
if ((male_start_count != NMATING) || (female_start_count != NMATING) ||
(matchmaker_start_count + male_end_count + female_end_count + matchmaker_end_count != 0)) {
loop_status = FAIL;
loop_status = TEST161_FAIL;
}
lock_release(testlock);
}
if (failif((loop_status == FAIL), "failed: uncoordinated matchmaking is occurring")) {
if (failif((loop_status == TEST161_FAIL), "failed: uncoordinated matchmaking is occurring")) {
goto done;
}
@ -352,19 +352,19 @@ whalemating(int nargs, char **args) {
}
/* Make sure nothing else is happening... */
loop_status = SUCCESS;
for (i = 0; i < CHECK_TIMES && loop_status == SUCCESS; i++) {
loop_status = TEST161_SUCCESS;
for (i = 0; i < CHECK_TIMES && loop_status == TEST161_SUCCESS; i++) {
kprintf_t(".");
random_spinner(PROBLEMS_MAX_SPINNER);
lock_acquire(testlock);
if ((male_start_count != NMATING) || (female_start_count != NMATING) ||
(matchmaker_start_count != pivot) || (male_end_count != pivot) ||
(female_end_count != pivot) || (matchmaker_end_count != pivot)) {
loop_status = FAIL;
loop_status = TEST161_FAIL;
}
lock_release(testlock);
}
if (failif((loop_status == FAIL), "failed: uncoordinated matchmaking is occurring")) {
if (failif((loop_status == TEST161_FAIL), "failed: uncoordinated matchmaking is occurring")) {
goto done;
}
@ -399,8 +399,8 @@ done:
sem_destroy(matcher_sem);
kprintf_t("\n");
if (test_status != SUCCESS) {
ksecprintf(SECRET, test_message, "sp1");
if (test_status != TEST161_SUCCESS) {
secprintf(SECRET, test_message, "sp1");
}
success(test_status, SECRET, "sp1");
@ -628,7 +628,7 @@ int stoplight(int nargs, char **args) {
panic("sp2: sem_create failed\n");
}
spinlock_init(&status_lock);
test_status = SUCCESS;
test_status = TEST161_SUCCESS;
stoplight_init();
@ -669,7 +669,7 @@ int stoplight(int nargs, char **args) {
for (i = 0; i < NCARS; i++) {
passed += car_locations[i] == PASSED_CAR ? 1 : 0;
}
if ((test_status == SUCCESS) &&
if ((test_status == TEST161_SUCCESS) &&
(!(failif((passed != NCARS), "failed: not enough cars"))) &&
(!(failif((all_quadrant != required_quadrant), "failed: didn't do the right turns"))) &&
(!(failif((max_car_count <= 1), "failed: no concurrency achieved")))) {};
@ -679,8 +679,8 @@ int stoplight(int nargs, char **args) {
sem_destroy(endsem);
kprintf_t("\n");
if (test_status != SUCCESS) {
ksecprintf(SECRET, test_message, "sp2");
if (test_status != TEST161_SUCCESS) {
secprintf(SECRET, test_message, "sp2");
}
success(test_status, SECRET, "sp2");

32
kern/test/synchtest.c
View File

@ -40,7 +40,7 @@
#include <thread.h>
#include <synch.h>
#include <test.h>
#include <kern/secret.h>
#include <kern/test161.h>
#include <spinlock.h>
#define CREATELOOPS 8
@ -63,7 +63,7 @@ static struct cv *testcv = NULL;
static struct semaphore *donesem = NULL;
struct spinlock status_lock;
static bool test_status = FAIL;
static bool test_status = TEST161_FAIL;
static unsigned long semtest_current;
@ -72,7 +72,7 @@ bool
failif(bool condition) {
if (condition) {
spinlock_acquire(&status_lock);
test_status = FAIL;
test_status = TEST161_FAIL;
spinlock_release(&status_lock);
}
return condition;
@ -131,7 +131,7 @@ semtest(int nargs, char **args)
}
}
spinlock_init(&status_lock);
test_status = SUCCESS;
test_status = TEST161_SUCCESS;
kprintf_n("If this hangs, it's broken: ");
P(testsem);
@ -264,7 +264,7 @@ locktest(int nargs, char **args)
}
}
spinlock_init(&status_lock);
test_status = SUCCESS;
test_status = TEST161_SUCCESS;
for (i=0; i<NTHREADS; i++) {
kprintf_t(".");
@ -302,12 +302,12 @@ locktest2(int nargs, char **args) {
panic("lt2: lock_create failed\n");
}
ksecprintf(SECRET, "Should panic...", "lt2");
secprintf(SECRET, "Should panic...", "lt2");
lock_release(testlock);
/* Should not get here on success. */
success(FAIL, SECRET, "lt2");
success(TEST161_FAIL, SECRET, "lt2");
lock_destroy(testlock);
testlock = NULL;
@ -328,13 +328,13 @@ locktest3(int nargs, char **args) {
panic("lt3: lock_create failed\n");
}
ksecprintf(SECRET, "Should panic...", "lt3");
secprintf(SECRET, "Should panic...", "lt3");
lock_acquire(testlock);
lock_destroy(testlock);
/* Should not get here on success. */
success(FAIL, SECRET, "lt3");
success(TEST161_FAIL, SECRET, "lt3");
testlock = NULL;
@ -426,7 +426,7 @@ cvtest(int nargs, char **args)
}
}
spinlock_init(&status_lock);
test_status = SUCCESS;
test_status = TEST161_SUCCESS;
testval1 = NTHREADS-1;
for (i=0; i<NTHREADS; i++) {
@ -562,7 +562,7 @@ cvtest2(int nargs, char **args)
testcvs[i] = cv_create("cvtest2 cv");
}
spinlock_init(&status_lock);
test_status = SUCCESS;
test_status = TEST161_SUCCESS;
result = thread_fork("cvt2", NULL, sleepthread, NULL, 0);
if (result) {
@ -609,12 +609,12 @@ cvtest3(int nargs, char **args) {
panic("cvt3: cv_create failed\n");
}
ksecprintf(SECRET, "Should panic...", "cvt3");
secprintf(SECRET, "Should panic...", "cvt3");
cv_wait(testcv, testlock);
/* Should not get here on success. */
success(FAIL, SECRET, "cvt3");
success(TEST161_FAIL, SECRET, "cvt3");
lock_destroy(testlock);
cv_destroy(testcv);
@ -641,12 +641,12 @@ cvtest4(int nargs, char **args) {
panic("cvt4: cv_create failed\n");
}
ksecprintf(SECRET, "Should panic...", "cvt4");
secprintf(SECRET, "Should panic...", "cvt4");
cv_broadcast(testcv, testlock);
/* Should not get here on success. */
success(FAIL, SECRET, "cvt4");
success(TEST161_FAIL, SECRET, "cvt4");
lock_destroy(testlock);
cv_destroy(testcv);
@ -726,7 +726,7 @@ cvtest5(int nargs, char **args) {
panic("cvt5: sem_create failed\n");
}
spinlock_init(&status_lock);
test_status = SUCCESS;
test_status = TEST161_SUCCESS;
testval1 = 0;
lock_acquire(testlock);

4
kern/vm/kmalloc.c
View File

@ -31,7 +31,7 @@
#include <lib.h>
#include <spinlock.h>
#include <vm.h>
#include <kern/secret.h>
#include <kern/test161.h>
#include <test.h>
/*
@ -838,7 +838,7 @@ kheap_printused(void)
char total_string[32];
snprintf(total_string, sizeof(total_string), "%lu", total);
ksecprintf(SECRET, total_string, "khu");
secprintf(SECRET, total_string, "khu");
}
////////////////////////////////////////

2
mk/os161.config.mk
View File

@ -470,7 +470,7 @@ MORECFLAGS+=-I$(INSTALLTOP)/include
LDFLAGS+=-nostdlib -L$(INSTALLTOP)/lib $(INSTALLTOP)/lib/crt0.o
MORELIBS+=-lc
LIBDEPS+=$(INSTALLTOP)/lib/crt0.o $(INSTALLTOP)/lib/libc.a
LIBS+=-ltest161
############################################################
# end.

1
userland/Makefile
View File

@ -12,6 +12,7 @@ INCLUDES=\
include include \
include/sys include/sys \
include/test include/test \
include/test161 include/test161 \
include/types include/types
INCLUDELINKS=\

0
userland/include/secure.h → userland/include/test161/secure.h
View File

6
userland/include/test161/test161.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef _TEST161_H_
#define _TEST161_H_
#include <kern/test161.h>
#endif // _TEST161_H

2
userland/lib/Makefile
View File

@ -8,6 +8,6 @@
TOP=../..
.include "$(TOP)/mk/os161.config.mk"
SUBDIRS=crt0 libc libtest hostcompat
SUBDIRS=crt0 libc libtest libtest161 hostcompat
.include "$(TOP)/mk/os161.subdir.mk"

5
userland/lib/libc/Makefile
View File

@ -13,11 +13,6 @@ SRCS+=\
$(COMMON)/printf/snprintf.c \
$(COMMON)/printf/tprintf.c
# secure
SRCS+=\
$(COMMON)/secure/secure.c \
$(COMMON)/secure/sha256.c \
# stdio
SRCS+=\
stdio/__puts.c \

17
userland/lib/libtest161/Makefile Normal file
View File

@ -0,0 +1,17 @@
#
# libtest - library of common test support code
#
TOP=../../..
.include "$(TOP)/mk/os161.config.mk"
COMMON=$(TOP)/common/libtest161
SRCS+=\
$(COMMON)/secure.c \
$(COMMON)/sha256.c \
$(COMMON)/test161.c \
LIB=test161
.include "$(TOP)/mk/os161.lib.mk"