Skip to content

Commit 75918ab

Browse files
pks-tethomson
authored andcommitted
mbedtls: make global variables static
The mbedtls stream implementation makes use of some global variables which are not marked as `static`, even though they're only used in this compilation unit. Fix this and remove a duplicate declaration.
1 parent 657197e commit 75918ab

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/streams/mbedtls.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
#define GIT_SSL_DEFAULT_CIPHERS "TLS-ECDHE-ECDSA-WITH-AES-128-GCM-SHA256:TLS-ECDHE-RSA-WITH-AES-128-GCM-SHA256:TLS-ECDHE-ECDSA-WITH-AES-256-GCM-SHA384:TLS-ECDHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-RSA-WITH-AES-128-GCM-SHA256:TLS-DHE-DSS-WITH-AES-128-GCM-SHA256:TLS-DHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-DSS-WITH-AES-256-GCM-SHA384:TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA256:TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA256:TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA:TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA:TLS-ECDHE-ECDSA-WITH-AES-256-CBC-SHA384:TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA384:TLS-ECDHE-ECDSA-WITH-AES-256-CBC-SHA:TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-RSA-WITH-AES-128-CBC-SHA256:TLS-DHE-RSA-WITH-AES-256-CBC-SHA256:TLS-DHE-RSA-WITH-AES-128-CBC-SHA:TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-128-CBC-SHA256:TLS-DHE-DSS-WITH-AES-256-CBC-SHA256:TLS-DHE-DSS-WITH-AES-128-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-128-GCM-SHA256:TLS-RSA-WITH-AES-256-GCM-SHA384:TLS-RSA-WITH-AES-128-CBC-SHA256:TLS-RSA-WITH-AES-256-CBC-SHA256:TLS-RSA-WITH-AES-128-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA"
4343
#define GIT_SSL_DEFAULT_CIPHERS_COUNT 30
4444

45-
mbedtls_ssl_config *git__ssl_conf;
45+
static mbedtls_ssl_config *git__ssl_conf;
4646
static int ciphers_list[GIT_SSL_DEFAULT_CIPHERS_COUNT];
47-
mbedtls_entropy_context *mbedtls_entropy;
47+
static mbedtls_entropy_context *mbedtls_entropy;
4848

4949
/**
5050
* This function aims to clean-up the SSL context which
@@ -166,8 +166,6 @@ int git_mbedtls_stream_global_init(void)
166166
return -1;
167167
}
168168

169-
mbedtls_ssl_config *git__ssl_conf;
170-
171169
static int bio_read(void *b, unsigned char *buf, size_t len)
172170
{
173171
git_stream *io = (git_stream *) b;

0 commit comments

Comments
 (0)