dzwdz
/
catboy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Search for cert and priv in config dirs

master
C. McEnroe 2020-02-06 02:21:04 -05:00
parent 5e98d83f83
commit 8b3bf897c2
3 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
chat.c
View File

@ -111,7 +111,19 @@ int main(int argc, char *argv[]) {
set(&self.chanTypes, "#&");
set(&self.prefixes, "@+");
ircConfig(insecure, cert, priv);
FILE *certFile = NULL;
FILE *privFile = NULL;
if (cert) {
certFile = configOpen(cert, "r");
if (!certFile) err(EX_NOINPUT, "%s", cert);
}
if (priv) {
privFile = configOpen(priv, "r");
if (!privFile) err(EX_NOINPUT, "%s", priv);
}
ircConfig(insecure, certFile, privFile);
if (certFile) fclose(certFile);
if (privFile) fclose(privFile);
uiInit();
uiShowID(Network);

2
chat.h
View File

@ -105,7 +105,7 @@ struct Message {
char *params[ParamCap];
};
void ircConfig(bool insecure, const char *cert, const char *priv);
void ircConfig(bool insecure, FILE *cert, FILE *priv);
int ircConnect(const char *host, const char *port);
void ircRecv(void);
void ircSend(const char *ptr, size_t len);

37
irc.c
View File

@ -23,6 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sysexits.h>
#include <tls.h>
#include <unistd.h>
@ -31,7 +32,22 @@
struct tls *client;
void ircConfig(bool insecure, const char *cert, const char *priv) {
static byte *readFile(size_t *len, FILE *file) {
struct stat stat;
int error = fstat(fileno(file), &stat);
if (error) err(EX_IOERR, "fstat");
byte *buf = malloc(stat.st_size);
if (!buf) err(EX_OSERR, "malloc");
rewind(file);
*len = fread(buf, 1, stat.st_size, file);
if (ferror(file)) err(EX_IOERR, "fread");
return buf;
}
void ircConfig(bool insecure, FILE *cert, FILE *priv) {
struct tls_config *config = tls_config_new();
if (!config) errx(EX_SOFTWARE, "tls_config_new");
@ -49,13 +65,28 @@ void ircConfig(bool insecure, const char *cert, const char *priv) {
}
if (cert) {
error = tls_config_set_keypair_file(config, cert, (priv ? priv : cert));
size_t len;
byte *buf = readFile(&len, cert);
error = tls_config_set_cert_mem(config, buf, len);
if (error) {
errx(
EX_SOFTWARE, "tls_config_set_keypair_file: %s",
EX_CONFIG, "tls_config_set_cert_mem: %s",
tls_config_error(config)
);
}
if (priv) {
free(buf);
buf = readFile(&len, priv);
}
error = tls_config_set_key_mem(config, buf, len);
if (error) {
errx(
EX_CONFIG, "tls_config_set_key_mem: %s",
tls_config_error(config)
);
}
explicit_bzero(buf, len);
free(buf);
}
client = tls_client();