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

Split secrets.h to public and core + miscellaneous cleanup

Browse Source 
Also, changed some function names to this_style from thisStyle. More of
this in later commits.
This commit is contained in:
Esa Korhonen
2017-01-27 13:14:31 +02:00
parent 6cc205dafa
commit 1f9b18e3bc
15 changed files with 107 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/core/secrets.c
View File

@ -12,13 +12,20 @@
*/
#include <maxscale/secrets.h>
#include <time.h>
#include <maxscale/log_manager.h>
#include <ctype.h>
#include <maxscale/protocol/mysql.h>
#include <maxscale/paths.h>
#include <maxscale/random_jkiss.h>
#include <time.h>
#include <sys/stat.h>
#include <openssl/aes.h>
#include <maxscale/alloc.h>
#include <maxscale/log_manager.h>
#include <maxscale/paths.h>
#include <maxscale/protocol/mysql.h>
#include <maxscale/random_jkiss.h>
#include "maxscale/secrets.h"
/**
* Generate a random printable character
@ -245,7 +252,7 @@ secrets_readKeys(const char* path)
* @param dir The directory where the ".secrets" file should be created.
* @return 0 on success and 1 on failure
*/
int secrets_writeKeys(const char *dir)
int secrets_write_keys(const char *dir)
{
int fd, randfd;
unsigned int randval;
@ -345,7 +352,7 @@ int secrets_writeKeys(const char *dir)
* @return The decrypted password or NULL if allocation failure.
*/
char *
decryptPassword(const char *crypt)
decrypt_password(const char *crypt)
{
MAXKEYS *keys;
AES_KEY aeskey;
@ -398,7 +405,7 @@ decryptPassword(const char *crypt)
* @return The encrypted password
*/
char *
encryptPassword(const char* path, const char *password)
encrypt_password(const char* path, const char *password)
{
MAXKEYS *keys;
AES_KEY aeskey;