hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reindent server/core/secrets.c

Browse Source
This commit is contained in:
Johan Wikman 2015-11-30 18:26:04 +02:00
parent 233f50f3e6
commit 17eb80072f
2 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
server/core/secrets.c
View File

@ -56,13 +56,13 @@ secrets_random_str(unsigned char *output, int len)
static MAXKEYS *
secrets_readKeys(const char* path)
{
char secret_file[PATH_MAX + 1];
char *home;
MAXKEYS *keys;
struct stat secret_stats;
int fd;
int len;
static int reported = 0;
char secret_file[PATH_MAX + 1];
char *home;
MAXKEYS *keys;
struct stat secret_stats;
int fd;
int len;
static int reported = 0;
if (path != NULL)
{
@ -212,10 +212,10 @@ secrets_readKeys(const char* path)
*/
int secrets_writeKeys(const char *path)
{
int fd, randfd;
unsigned int randval;
MAXKEYS key;
char secret_file[PATH_MAX + 10];
int fd, randfd;
unsigned int randval;
MAXKEYS key;
char secret_file[PATH_MAX + 10];
if (strlen(path) > PATH_MAX)
{
@ -312,12 +312,12 @@ int secrets_writeKeys(const char *path)
char *
decryptPassword(const char *crypt)
{
MAXKEYS *keys;
AES_KEY aeskey;
unsigned char *plain;
const char *ptr;
unsigned char encrypted[80];
int enlen;
MAXKEYS *keys;
AES_KEY aeskey;
unsigned char *plain;
const char *ptr;
unsigned char encrypted[80];
int enlen;
keys = secrets_readKeys(NULL);
if (!keys)
@ -325,9 +325,9 @@ decryptPassword(const char *crypt)
return strdup(crypt);
}
/*
** If the input is not a HEX string return the input
** it probably was not encrypted
*/
** If the input is not a HEX string return the input
** it probably was not encrypted
*/
for (ptr = crypt; *ptr; ptr++)
{
if (!isxdigit(*ptr))
@ -365,12 +365,12 @@ decryptPassword(const char *crypt)
char *
encryptPassword(const char* path, const char *password)
{
MAXKEYS *keys;
AES_KEY aeskey;
int padded_len;
char *hex_output;
unsigned char padded_passwd[80];
unsigned char encrypted[80];
MAXKEYS *keys;
AES_KEY aeskey;
int padded_len;
char *hex_output;
unsigned char padded_passwd[80];
unsigned char encrypted[80];
if ((keys = secrets_readKeys(path)) == NULL)
{

3
server/include/secrets.h
View File

@ -19,7 +19,7 @@
*/
/**
* @file secrets.h
* @file secrets.h
*
* @verbatim
* Revision History
@ -55,4 +55,5 @@ typedef struct maxkeys
extern int secrets_writeKeys(const char *filename);
extern char *decryptPassword(const char *);
extern char *encryptPassword(const char*, const char *);
#endif