zeekling/hiredis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support SNI

Browse Source
This commit is contained in:
valentino 2018-12-20 16:26:24 +02:00 committed by Mark Nunberg
parent 389e694abe
commit 58222c26f4
6 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/example-libevent-ssl.c
View File

@ -57,7 +57,7 @@ int main (int argc, char **argv) {
printf("Error: %s\n", c->errstr); printf("Error: %s\n", c->errstr);
return 1; return 1;
} }
if (redisSecureConnection(&c->c, caCert, cert, certKey) != REDIS_OK) { if (redisSecureConnection(&c->c, caCert, cert, certKey, "sni") != REDIS_OK) {
printf("SSL Error!\n"); printf("SSL Error!\n");
exit(1); exit(1);
} }

2
examples/example-ssl.c
View File

@ -30,7 +30,7 @@ int main(int argc, char **argv) {
exit(1); exit(1);
} }
if (redisSecureConnection(c, ca, cert, key) != REDIS_OK) { if (redisSecureConnection(c, ca, cert, key, "sni") != REDIS_OK) {
printf("Couldn't initialize SSL!\n"); printf("Couldn't initialize SSL!\n");
printf("Error: %s\n", c->errstr); printf("Error: %s\n", c->errstr);
redisFree(c); redisFree(c);

4
hiredis.c
View File

@ -753,8 +753,8 @@ redisContext *redisConnectFd(int fd) {
} }
int redisSecureConnection(redisContext *c, const char *caPath, int redisSecureConnection(redisContext *c, const char *caPath,
const char *certPath, const char *keyPath) { const char *certPath, const char *keyPath, const char *servername) {
return redisSslCreate(c, caPath, certPath, keyPath); return redisSslCreate(c, caPath, certPath, keyPath, servername);
} }
/* Set read/write timeout on a blocking socket. */ /* Set read/write timeout on a blocking socket. */

2
hiredis.h
View File

@ -207,7 +207,7 @@ redisContext *redisConnectFd(int fd);
* executed on the connection. * executed on the connection.
*/ */
int redisSecureConnection(redisContext *c, const char *capath, const char *certpath, int redisSecureConnection(redisContext *c, const char *capath, const char *certpath,
const char *keypath); const char *keypath, const char *servername);
/** /**
* Reconnect the given context using the saved information. * Reconnect the given context using the saved information.

8
sslio.c
View File

@ -87,7 +87,7 @@ void redisFreeSsl(redisSsl *ssl){
} }
int redisSslCreate(redisContext *c, const char *capath, const char *certpath, int redisSslCreate(redisContext *c, const char *capath, const char *certpath,
const char *keypath) { const char *keypath, const char *servername) {
assert(!c->ssl); assert(!c->ssl);
c->ssl = calloc(1, sizeof(*c->ssl)); c->ssl = calloc(1, sizeof(*c->ssl));
static int isInit = 0; static int isInit = 0;
@ -131,6 +131,12 @@ int redisSslCreate(redisContext *c, const char *capath, const char *certpath,
__redisSetError(c, REDIS_ERR, "Couldn't create new SSL instance"); __redisSetError(c, REDIS_ERR, "Couldn't create new SSL instance");
return REDIS_ERR; return REDIS_ERR;
} }
if (servername) {
if (!SSL_set_tlsext_host_name(s->ssl, servername)) {
__redisSetError(c, REDIS_ERR, "Couldn't set server name indication");
return REDIS_ERR;
}
}
SSL_set_fd(s->ssl, c->fd); SSL_set_fd(s->ssl, c->fd);
SSL_set_connect_state(s->ssl); SSL_set_connect_state(s->ssl);

6
sslio.h
View File

@ -12,8 +12,8 @@ static inline void redisFreeSsl(redisSsl *ssl) {
(void)ssl; (void)ssl;
} }
static inline int redisSslCreate(struct redisContext *c, const char *ca, static inline int redisSslCreate(struct redisContext *c, const char *ca,
const char *cert, const char *key) { const char *cert, const char *key, const char *servername) {
(void)c;(void)ca;(void)cert;(void)key; (void)c;(void)ca;(void)cert;(void)key;(void)servername;
return REDIS_ERR; return REDIS_ERR;
} }
static inline int redisSslRead(struct redisContext *c, char *s, size_t n) { static inline int redisSslRead(struct redisContext *c, char *s, size_t n) {
@ -55,7 +55,7 @@ struct redisContext;
void redisFreeSsl(redisSsl *); void redisFreeSsl(redisSsl *);
int redisSslCreate(struct redisContext *c, const char *caPath, int redisSslCreate(struct redisContext *c, const char *caPath,
const char *certPath, const char *keyPath); const char *certPath, const char *keyPath, const char *servername);
int redisSslRead(struct redisContext *c, char *buf, size_t bufcap); int redisSslRead(struct redisContext *c, char *buf, size_t bufcap);
int redisSslWrite(struct redisContext *c); int redisSslWrite(struct redisContext *c);