RYTEC
/
libiec61850
mirror of https://github.com/mz-automation/libiec61850.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed useless semaphore for renegotiation lock

Browse Source
pull/494/head
Federico Francescon 2 years ago
parent 83ad8f9ca9
commit 091ea970eb
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File

6
hal/tls/mbedtls/tls_mbedtls.c
Unescape Escape View File

@ -99,7 +99,6 @@ struct sTLSSocket {
/* time of last session renegotiation (used to calculate next renegotiation time) */ /* time of last session renegotiation (used to calculate next renegotiation time) */
uint64_t lastRenegotiationTime; uint64_t lastRenegotiationTime;
Semaphore renegotiationLock;
/* time of the last CRL update */ /* time of the last CRL update */
uint64_t crlUpdated; uint64_t crlUpdated;
@ -709,7 +708,6 @@ TLSSocket_create(Socket socket, TLSConfiguration configuration, bool storeClient
self->storePeerCert = storeClientCert; self->storePeerCert = storeClientCert;
self->peerCert = NULL; self->peerCert = NULL;
self->peerCertLength = 0; self->peerCertLength = 0;
self->renegotiationLock = Semaphore_create(1);
TLSConfiguration_setupComplete(configuration); TLSConfiguration_setupComplete(configuration);
@ -852,7 +850,6 @@ TLSSocket_getPeerCertificate(TLSSocket self, int* certSize)
bool bool
TLSSocket_performHandshake(TLSSocket self) TLSSocket_performHandshake(TLSSocket self)
{ {
Semaphore_wait(self->renegotiationLock);
int ret = mbedtls_ssl_renegotiate(&(self->ssl)); int ret = mbedtls_ssl_renegotiate(&(self->ssl));
if (ret == 0 || ret == MBEDTLS_ERR_SSL_WANT_READ || ret == MBEDTLS_ERR_SSL_WANT_WRITE || if (ret == 0 || ret == MBEDTLS_ERR_SSL_WANT_READ || ret == MBEDTLS_ERR_SSL_WANT_WRITE ||
@ -861,7 +858,6 @@ TLSSocket_performHandshake(TLSSocket self)
raiseSecurityEvent(self->tlsConfig, TLS_SEC_EVT_WARNING, TLS_EVENT_CODE_WRN_INSECURE_TLS_VERSION, "Warning: Insecure TLS version", self); raiseSecurityEvent(self->tlsConfig, TLS_SEC_EVT_WARNING, TLS_EVENT_CODE_WRN_INSECURE_TLS_VERSION, "Warning: Insecure TLS version", self);
} }
Semaphore_post(self->renegotiationLock);
DEBUG_PRINT("TLS", "TLSSocket_performHandshake Success -> ret=%i\n", ret); DEBUG_PRINT("TLS", "TLSSocket_performHandshake Success -> ret=%i\n", ret);
return true; return true;
@ -877,7 +873,6 @@ TLSSocket_performHandshake(TLSSocket self)
DEBUG_PRINT("TLS", "mbedtls_ssl_session_reset failed -> ret: -0x%X\n", -ret); DEBUG_PRINT("TLS", "mbedtls_ssl_session_reset failed -> ret: -0x%X\n", -ret);
} }
Semaphore_post(self->renegotiationLock);
return false; return false;
} }
} }
@ -1028,7 +1023,6 @@ TLSSocket_close(TLSSocket self)
if (self->peerCert) if (self->peerCert)
GLOBAL_FREEMEM(self->peerCert); GLOBAL_FREEMEM(self->peerCert);
Semaphore_destroy(self->renegotiationLock);
GLOBAL_FREEMEM(self); GLOBAL_FREEMEM(self);
} }

Write Preview
Loading…
Cancel
Save