Skip to content

Commit ff410e2

Browse files
author
Yaniv Kaul
authored
socket.c: comment properly what the SSL version is (gluster#3042)
Instead of guessing what the hex version stands for, just add a comment. Data taken from https://gist.github.com/GPHemsley/73b5b29d69a65d1c69e653b66de1e985 Updates: gluster#1000 Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
1 parent 8db0b37 commit ff410e2

File tree

2 files changed

+9
-9
lines changed
  • rpc/rpc-transport/socket/src
  • xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src

2 files changed

+9
-9
lines changed

rpc/rpc-transport/socket/src/socket.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -4068,7 +4068,7 @@ reconfigure(rpc_transport_t *this, dict_t *options)
40684068
return ret;
40694069
}
40704070

4071-
#if OPENSSL_VERSION_NUMBER < 0x1010000f
4071+
#if OPENSSL_VERSION_NUMBER < 0x1010000f // 1.1.0
40724072
static pthread_mutex_t *lock_array = NULL;
40734073

40744074
static void
@@ -4081,7 +4081,7 @@ locking_func(int mode, int type, const char *file, int line)
40814081
}
40824082
}
40834083

4084-
#if OPENSSL_VERSION_NUMBER >= 0x1000000f
4084+
#if OPENSSL_VERSION_NUMBER >= 0x1000000f // 1.0.0
40854085
static void
40864086
threadid_func(CRYPTO_THREADID *id)
40874087
{
@@ -4123,7 +4123,7 @@ init_openssl_mt(void)
41234123

41244124
initialized = _gf_true;
41254125

4126-
#if OPENSSL_VERSION_NUMBER < 0x1010000f
4126+
#if OPENSSL_VERSION_NUMBER < 0x1010000f // 1.1.0
41274127
int num_locks = CRYPTO_num_locks();
41284128
int i;
41294129

@@ -4133,7 +4133,7 @@ init_openssl_mt(void)
41334133
for (i = 0; i < num_locks; ++i) {
41344134
pthread_mutex_init(&lock_array[i], NULL);
41354135
}
4136-
#if OPENSSL_VERSION_NUMBER >= 0x1000000f
4136+
#if OPENSSL_VERSION_NUMBER >= 0x1000000f // 1.0.0
41374137
CRYPTO_THREADID_set_callback(threadid_func);
41384138
#else /* older openssl */
41394139
CRYPTO_set_id_callback(legacy_threadid_func);
@@ -4145,15 +4145,15 @@ init_openssl_mt(void)
41454145

41464146
static void __attribute__((destructor)) fini_openssl_mt(void)
41474147
{
4148-
#if OPENSSL_VERSION_NUMBER < 0x1010000f
4148+
#if OPENSSL_VERSION_NUMBER < 0x1010000f // 1.1.0
41494149
int i;
41504150

41514151
if (!lock_array) {
41524152
return;
41534153
}
41544154

41554155
CRYPTO_set_locking_callback(NULL);
4156-
#if OPENSSL_VERSION_NUMBER >= 0x1000000f
4156+
#if OPENSSL_VERSION_NUMBER >= 0x1000000f // 1.0.0
41574157
CRYPTO_THREADID_set_callback(NULL);
41584158
#else /* older openssl */
41594159
CRYPTO_set_id_callback(NULL);

xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ aws_b64_encode(const unsigned char *input, int length)
300300
char *
301301
aws_sign_request(char *const str, char *awssekey)
302302
{
303-
#if (OPENSSL_VERSION_NUMBER < 0x1010002f)
303+
#if (OPENSSL_VERSION_NUMBER < 0x1010002f) // 1.0.1-beta2
304304
HMAC_CTX ctx;
305305
#endif
306306
HMAC_CTX *pctx = NULL;
@@ -310,7 +310,7 @@ aws_sign_request(char *const str, char *awssekey)
310310
unsigned len;
311311
char *base64 = NULL;
312312

313-
#if (OPENSSL_VERSION_NUMBER < 0x1010002f)
313+
#if (OPENSSL_VERSION_NUMBER < 0x1010002f) // 1.0.1-beta2
314314
HMAC_CTX_init(&ctx);
315315
pctx = &ctx;
316316
#else
@@ -320,7 +320,7 @@ aws_sign_request(char *const str, char *awssekey)
320320
HMAC_Update(pctx, (unsigned char *)str, strlen(str));
321321
HMAC_Final(pctx, (unsigned char *)md, &len);
322322

323-
#if (OPENSSL_VERSION_NUMBER < 0x1010002f)
323+
#if (OPENSSL_VERSION_NUMBER < 0x1010002f) // 1.0.1-beta2
324324
HMAC_CTX_cleanup(pctx);
325325
#else
326326
HMAC_CTX_free(pctx);

0 commit comments

Comments
 (0)