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

Added snsecprintf function that writes the secprintf message into the

Browse Source 
buffer provided.
This commit is contained in:
Scott Haseley 2017-02-18 22:58:35 -05:00
parent 398e4eb90a
commit dbb57b2826
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
common/libtest161/test161.c
View File

@ -65,9 +65,9 @@ success(int status, const char * secret, const char * name) {
int int
partial_credit(const char *secret, const char *name, int scored, int total) partial_credit(const char *secret, const char *name, int scored, int total)
{ {
char buffer[128]; char buffer[128];
snprintf(buffer, 128, "PARTIAL CREDIT %d OF %d", scored, total); snprintf(buffer, 128, "PARTIAL CREDIT %d OF %d", scored, total);
return secprintf(secret, buffer, name); return secprintf(secret, buffer, name);
} }
#ifndef _KERNEL #ifndef _KERNEL
@ -87,6 +87,13 @@ say(const char *fmt, ...)
#ifndef SECRET_TESTING #ifndef SECRET_TESTING
int
snsecprintf(size_t len, char *buffer, const char *secret, const char *msg, const char *name)
{
(void)secret;
return snprintf(buffer, len, "%s: %s", name, msg);
}
int int
secprintf(const char * secret, const char * msg, const char * name) secprintf(const char * secret, const char * msg, const char * name)
{ {
@ -101,8 +108,9 @@ secprintf(const char * secret, const char * msg, const char * name)
#else #else
int static int
secprintf(const char * secret, const char * msg, const char * name) secprintf_common(use_buf int, size_t len, char *buffer,
const char *secret, const char *msg, const char *name)
{ {
char *hash, *salt, *fullmsg; char *hash, *salt, *fullmsg;
int res; int res;
@ -132,11 +140,15 @@ secprintf(const char * secret, const char * msg, const char * name)
goto out; goto out;
} }
if (!use_buf) {
#ifdef _KERNEL #ifdef _KERNEL
res = kprintf("\n(%s, %s, %s, %s: %s)\n", name, hash, salt, name, msg); res = kprintf("\n(%s, %s, %s, %s: %s)\n", name, hash, salt, name, msg);
#else #else
res = say("\n(%s, %s, %s, %s: %s)\n", name, hash, salt, name, msg); res = say("\n(%s, %s, %s, %s: %s)\n", name, hash, salt, name, msg);
#endif #endif
} else {
res = snprintf(buffer, b_len, "\n(%s, %s, %s, %s: %s)\n", name, hash, salt, name, msg);
}
out: out:
// These may be NULL, but that's OK // These may be NULL, but that's OK
@ -151,6 +163,18 @@ out:
return res; return res;
} }
int
snsecprintf(size_t b_len, char *buffer, const char *secret, const char *msg, const char *name)
{
return secprintf_common(1, b_len, buffer, secret, msg, name);
}
int
secprintf(const char * secret, const char * msg, const char * name)
{
return snsecprintf(0, 0, NULL, secret, msg, name);
}
#endif #endif
#ifdef _KERNEL #ifdef _KERNEL

1
kern/include/kern/test161.h
View File

@ -66,6 +66,7 @@
int success(int, const char *, const char *); int success(int, const char *, const char *);
int secprintf(const char *secret, const char *msg, const char *name); int secprintf(const char *secret, const char *msg, const char *name);
int snsecprintf(size_t len, char *buffer, const char *secret, const char *msg, const char *name);
int partial_credit(const char *secret, const char *name, int scored, int total); int partial_credit(const char *secret, const char *name, int scored, int total);
#ifdef _KERNEL #ifdef _KERNEL