planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Uses new anonymous OpenSSL structs

Browse Source 
FossilOrigin-Name: d33b8ea38976194c05f13970ecdeb9308add6905cced5eac52765a7fdcb1ddaf
This commit is contained in:
root 2020-03-07 23:11:12 +00:00
parent afd1b7e4ea
commit 99186fdb82
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cw/dtls_openssl.c
View File

@ -113,7 +113,7 @@ int pem_passwd_cb(char *buf, int size, int rwflag, void *password)
if (rsa_512) if (rsa_512)
rsa_tmp = rsa_512; rsa_tmp = rsa_512;
else { /* generate on the fly, should not happen in this example */ else { /* generate on the fly, should not happen in this example */
rsa_tmp = RSA_generate_key(keylength,RSA_F4,NULL,NULL); /* rsa_tmp = RSA_generate_key(keylength,RSA_F4,NULL,NULL);*/
rsa_512 = rsa_tmp; /* Remember for later reuse */ rsa_512 = rsa_tmp; /* Remember for later reuse */
} }
break; break;
@ -293,7 +293,7 @@ return 1;
static unsigned int psk_server_cb(SSL *ssl,const char *identity, unsigned char * psk, unsigned int max_psk_len) static unsigned int psk_server_cb(SSL *ssl,const char *identity, unsigned char * psk, unsigned int max_psk_len)
{ {
BIO * b = SSL_get_rbio(ssl); BIO * b = SSL_get_rbio(ssl);
struct conn * conn = b->ptr; struct conn * conn = BIO_get_data(b); /*->ptr;*/
int l = bstr16_len(conn->dtls_psk) < max_psk_len ? bstr16_len(conn->dtls_psk) : max_psk_len; int l = bstr16_len(conn->dtls_psk) < max_psk_len ? bstr16_len(conn->dtls_psk) : max_psk_len;
memcpy(psk,conn->dtls_psk,l); memcpy(psk,conn->dtls_psk,l);
@ -450,7 +450,9 @@ struct dtls_openssl_data * dtls_openssl_data_create(struct conn * conn, const SS
d->bio = BIO_new(bio); d->bio = BIO_new(bio);
d->bio->ptr = conn; /* d->bio->ptr = conn;*/
BIO_set_data(d->bio,conn);
SSL_set_bio(d->ssl, d->bio, d->bio); SSL_set_bio(d->ssl, d->bio, d->bio);
return d; return d;
@ -542,7 +544,7 @@ int dtls_openssl_generate_cookie(SSL *ssl, unsigned char *cookie, unsigned int *
char sock_buf2[SOCK_ADDR_BUFSIZE]; char sock_buf2[SOCK_ADDR_BUFSIZE];
BIO * b = SSL_get_rbio(ssl); BIO * b = SSL_get_rbio(ssl);
struct conn * conn = b->ptr; struct conn * conn = BIO_get_data(b); /*b->ptr;*/
cw_rand(conn->dtls_cookie,sizeof(conn->dtls_cookie)); cw_rand(conn->dtls_cookie,sizeof(conn->dtls_cookie));
@ -561,7 +563,8 @@ int dtls_openssl_verify_cookie(SSL *ssl, unsigned char *cookie, unsigned int len
char sock_buf[SOCK_ADDR_BUFSIZE]; char sock_buf[SOCK_ADDR_BUFSIZE];
char sock_buf2[SOCK_ADDR_BUFSIZE]; char sock_buf2[SOCK_ADDR_BUFSIZE];
BIO * b = SSL_get_rbio(ssl); BIO * b = SSL_get_rbio(ssl);
struct conn * conn = b->ptr; /*struct conn * conn = b->ptr;*/
struct conn * conn = BIO_get_data(b); /*b->ptr;*/
cw_dbg(DBG_DTLS,"Verifying DTLS cookie from %s: %s", cw_dbg(DBG_DTLS,"Verifying DTLS cookie from %s: %s",
sock_addr2str(&conn->addr,sock_buf),sock_hwaddr2idstr(conn->dtls_cookie,len,sock_buf2)); sock_addr2str(&conn->addr,sock_buf),sock_hwaddr2idstr(conn->dtls_cookie,len,sock_buf2));

3
src/cw/dtls_openssl_connect.c
View File

@ -30,7 +30,8 @@ static BIO_METHOD bio_methods = {
{ {
int l; int l;
BIO *b = SSL_get_rbio(ssl); BIO *b = SSL_get_rbio(ssl);
struct conn *conn = b->ptr; /*struct conn *conn = b->ptr;*/
struct conn * conn = BIO_get_data(b); /*b->ptr;*/
snprintf(identity, max_identity_len, "CLient_identity"); snprintf(identity, max_identity_len, "CLient_identity");