devs/libstrophe-gh
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

forgot to update tls_schannel.c with new API's

Browse Source 
Fixup of
93e04b8d03
a97714da18

Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
This commit is contained in:
Steffen Jaeckel
2022-02-10 11:21:20 +01:00
parent 2bc34b5847
commit e32d39dbc1
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/tls_schannel.c
View File

@@ -65,14 +65,14 @@ char *tls_id_on_xmppaddr(xmpp_conn_t *conn, unsigned int n)
{ {
UNUSED(n); UNUSED(n);
/* always fail */ /* always fail */
xmpp_error(conn->ctx, "tls", "Client-Authentication not implemented"); strophe_error(conn->ctx, "tls", "Client-Authentication not implemented");
return NULL; return NULL;
} }
unsigned int tls_id_on_xmppaddr_num(xmpp_conn_t *conn) unsigned int tls_id_on_xmppaddr_num(xmpp_conn_t *conn)
{ {
/* always fail */ /* always fail */
xmpp_error(conn->ctx, "tls", "Client-Authentication not implemented"); strophe_error(conn->ctx, "tls", "Client-Authentication not implemented");
return 0; return 0;
} }
@@ -102,7 +102,7 @@ tls_t *tls_new(xmpp_conn_t *conn)
return NULL; return NULL;
} }
tls = xmpp_alloc(ctx, sizeof(*tls)); tls = strophe_alloc(ctx, sizeof(*tls));
if (!tls) { if (!tls) {
return NULL; return NULL;
@@ -138,7 +138,7 @@ tls_t *tls_new(xmpp_conn_t *conn)
return NULL; return NULL;
} }
xmpp_debug(ctx, "TLSS", "QuerySecurityPackageInfo() success"); strophe_debug(ctx, "TLSS", "QuerySecurityPackageInfo() success");
memset(&scred, 0, sizeof(scred)); memset(&scred, 0, sizeof(scred));
scred.dwVersion = SCHANNEL_CRED_VERSION; scred.dwVersion = SCHANNEL_CRED_VERSION;
@@ -163,7 +163,7 @@ tls_t *tls_new(xmpp_conn_t *conn)
return NULL; return NULL;
} }
xmpp_debug(ctx, "TLSS", "AcquireCredentialsHandle() success"); strophe_debug(ctx, "TLSS", "AcquireCredentialsHandle() success");
tls->init = 1; tls->init = 1;
@@ -196,15 +196,15 @@ tls_t *tls_new(xmpp_conn_t *conn)
void tls_free(tls_t *tls) void tls_free(tls_t *tls)
{ {
if (tls->recvbuffer) { if (tls->recvbuffer) {
xmpp_free(tls->ctx, tls->recvbuffer); strophe_free(tls->ctx, tls->recvbuffer);
} }
if (tls->readybuffer) { if (tls->readybuffer) {
xmpp_free(tls->ctx, tls->readybuffer); strophe_free(tls->ctx, tls->readybuffer);
} }
if (tls->sendbuffer) { if (tls->sendbuffer) {
xmpp_free(tls->ctx, tls->sendbuffer); strophe_free(tls->ctx, tls->sendbuffer);
} }
if (tls->init) { if (tls->init) {
@@ -218,14 +218,14 @@ void tls_free(tls_t *tls)
tls->hsec32 = NULL; tls->hsec32 = NULL;
} }
xmpp_free(tls->ctx, tls); strophe_free(tls->ctx, tls);
return; return;
} }
xmpp_tlscert_t *tls_peer_cert(xmpp_conn_t *conn) xmpp_tlscert_t *tls_peer_cert(xmpp_conn_t *conn)
{ {
/* always fail */ /* always fail */
xmpp_error(conn->ctx, "tls", "tls_peer_cert() not implemented"); strophe_error(conn->ctx, "tls", "tls_peer_cert() not implemented");
return NULL; return NULL;
} }
@@ -263,7 +263,7 @@ int tls_start(tls_t *tls)
memset(&(sbin[0]), 0, sizeof(sbin[0])); memset(&(sbin[0]), 0, sizeof(sbin[0]));
sbin[0].BufferType = SECBUFFER_TOKEN; sbin[0].BufferType = SECBUFFER_TOKEN;
sbin[0].pvBuffer = xmpp_alloc(tls->ctx, tls->spi->cbMaxToken); sbin[0].pvBuffer = strophe_alloc(tls->ctx, tls->spi->cbMaxToken);
sbin[0].cbBuffer = tls->spi->cbMaxToken; sbin[0].cbBuffer = tls->spi->cbMaxToken;
memset(&(sbin[1]), 0, sizeof(sbin[1])); memset(&(sbin[1]), 0, sizeof(sbin[1]));
@@ -369,12 +369,12 @@ int tls_start(tls_t *tls)
} }
} }
xmpp_free(tls->ctx, sbin[0].pvBuffer); strophe_free(tls->ctx, sbin[0].pvBuffer);
if (ret != SEC_E_OK) { if (ret != SEC_E_OK) {
tls->lasterror = ret; tls->lasterror = ret;
xmpp_error(tls->ctx, "TLSS", "Schannel error 0x%lx", strophe_error(tls->ctx, "TLSS", "Schannel error 0x%lx",
(unsigned long)ret); (unsigned long)ret);
return 0; return 0;
} }
@@ -383,16 +383,16 @@ int tls_start(tls_t *tls)
tls->recvbuffermaxlen = tls->spcss.cbHeader + tls->spcss.cbMaximumMessage + tls->recvbuffermaxlen = tls->spcss.cbHeader + tls->spcss.cbMaximumMessage +
tls->spcss.cbTrailer; tls->spcss.cbTrailer;
tls->recvbuffer = xmpp_alloc(tls->ctx, tls->recvbuffermaxlen); tls->recvbuffer = strophe_alloc(tls->ctx, tls->recvbuffermaxlen);
tls->recvbufferpos = 0; tls->recvbufferpos = 0;
tls->sendbuffermaxlen = tls->spcss.cbHeader + tls->spcss.cbMaximumMessage + tls->sendbuffermaxlen = tls->spcss.cbHeader + tls->spcss.cbMaximumMessage +
tls->spcss.cbTrailer; tls->spcss.cbTrailer;
tls->sendbuffer = xmpp_alloc(tls->ctx, tls->sendbuffermaxlen); tls->sendbuffer = strophe_alloc(tls->ctx, tls->sendbuffermaxlen);
tls->sendbufferpos = 0; tls->sendbufferpos = 0;
tls->sendbufferlen = 0; tls->sendbufferlen = 0;
tls->readybuffer = xmpp_alloc(tls->ctx, tls->spcss.cbMaximumMessage); tls->readybuffer = strophe_alloc(tls->ctx, tls->spcss.cbMaximumMessage);
tls->readybufferpos = 0; tls->readybufferpos = 0;
tls->readybufferlen = 0; tls->readybufferlen = 0;