Skip to content

Commit

Permalink
cleanup: removed unused functions
Browse files Browse the repository at this point in the history
  • Loading branch information
franku committed Jun 8, 2018
1 parent 8ffb6b3 commit 3a6d5a5
Showing 1 changed file with 0 additions and 87 deletions.
87 changes: 0 additions & 87 deletions core/src/dird/dird.cc
Expand Up @@ -659,93 +659,6 @@ bool DoReloadConfig()
return reloaded;
}

static int me_psk_server_callback(const char *identity,
unsigned char *psk,
unsigned int max_psk_len) {

Dmsg0(100, "me_psk_server_callback");
Dmsg1(100, "Received identity '%s'\n", identity);

int result = 0;

if (NULL != me && NULL != me->password.value) {
if (p_encoding_clear == me->password.encoding) {
/* plain password */
} else if (p_encoding_md5 == me->password.encoding) {
/* md5 string */
/* convert the PSK key to binary */
result = (int)hex2bin(me->password.value, psk, max_psk_len);
} else {
/* hex password excoding? */
}
} else {
Dmsg0(100, "Passowrd not set in Director Config\n");
}
if (result == 0 || result > (int)max_psk_len) {
Dmsg1(100, "Error, Could not convert PSK key '%s' to binary key\n", me->password.value);
return 0;
}

return result;
}

static int ConsPskServerCallback(const char *identity, unsigned char *psk, unsigned int max_psk_len) {

Dmsg0(100, "ConsPskServerCallback");
Dmsg1(100, "Received identity '%s'\n", identity);

char *psk_key = (char *)"1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A";

/* convert the PSK key to binary */
unsigned int ret = hex2bin(psk_key, psk, max_psk_len);
if (ret <= 0 || ret > max_psk_len) {
Dmsg1(100, "Could not convert PSK key '%s' to binary key\n", psk_key);
return 0;
}

return ret;
}

/* Authenticate file_deamon connection */
static int client_psk_client_callback(char *identity,
unsigned int max_identity_len,
unsigned char *psk,
unsigned int max_psk_len) {
Dmsg0(100, "client_psk_server_callback");
Dmsg1(100, "Received identity '%s'\n", identity);

char *psk_key = (char *)"1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A";

/* convert the PSK key to binary */
unsigned int ret = hex2bin(psk_key, psk, max_psk_len);
if (ret <= 0 || ret > max_psk_len) {
Dmsg1(100, "Could not convert PSK key '%s' to binary key\n", psk_key);
return 0;
}

return ret;
}

static int store_psk_client_callback(char *identity,
unsigned int max_identity_len,
unsigned char *psk,
unsigned int max_psk_len) {

Dmsg0(100, "store_psk_server_callback");
Dmsg1(100, "Received identity '%s'\n", identity);

char *psk_key = (char *)"1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A";

/* convert the PSK key to binary */
unsigned int ret = hex2bin(psk_key, psk, max_psk_len);
if (ret <= 0 || ret > max_psk_len) {
Dmsg1(100, "Could not convert PSK key '%s' to binary key\n", psk_key);
return 0;
}

return ret;
}

/*
* See if two storage definitions point to the same Storage Daemon.
*
Expand Down

0 comments on commit 3a6d5a5

Please sign in to comment.