1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
|
Description: fix package build with openssl 1.1
Author: Mark Hymers <mhy@debian.org>
Bug: https://arc.liv.ac.uk/trac/SGE/ticket/1572
Bug-Debian: https://bugs.debian.org/827076
Applied-Upstream: https://gitlab.com/loveshack/sge/commit/0b6d6e0dc5f3bb3ad8176141938d6db0935de3b9
Last-Update: 2017-01-07
--- pkg-gridengine.orig/source/libs/comm/cl_ssl_framework.c
+++ pkg-gridengine/source/libs/comm/cl_ssl_framework.c
@@ -484,7 +484,7 @@
static int ssl_callback_SSLVerify_CRL(int ok, X509_STORE_CTX *ctx, cl_com_ssl_private_t* private) {
X509 *cert = NULL;
X509_LOOKUP *lookup = NULL;
- X509_STORE_CTX verify_ctx;
+ X509_STORE_CTX *verify_ctx = NULL;
int err;
int is_ok = true;
SGE_STRUCT_STAT stat_buffer;
@@ -499,6 +499,8 @@
return true;
}
+ verify_ctx = X509_STORE_CTX_new();
+
/* create the cert store and set the verify callback */
if (private->ssl_crl_data->store == NULL || stat_buffer.st_mtime != private->ssl_crl_data->last_modified) {
CL_LOG(CL_LOG_WARNING, "creating new crl store context");
@@ -545,20 +547,20 @@
cert = X509_STORE_CTX_get_current_cert(ctx);
if (is_ok == true && cert != NULL) {
/* X509_STORE_CTX_init did not return an error condition in prior versions */
- if (X509_STORE_CTX_init(&verify_ctx, private->ssl_crl_data->store, cert, NULL) != 1) {
+ if (X509_STORE_CTX_init(verify_ctx, private->ssl_crl_data->store, cert, NULL) != 1) {
CL_LOG(CL_LOG_ERROR, "Error initializing verification context");
is_ok = false;
} else {
/* verify the certificate */
- if (X509_verify_cert(&verify_ctx) != 1) {
+ if (X509_verify_cert(verify_ctx) != 1) {
is_ok = false;
}
}
if (is_ok == false) {
- err = X509_STORE_CTX_get_error(&verify_ctx);
+ err = X509_STORE_CTX_get_error(verify_ctx);
X509_STORE_CTX_set_error(ctx, err);
}
- X509_STORE_CTX_cleanup(&verify_ctx);
+ X509_STORE_CTX_cleanup(verify_ctx);
} else {
if (is_ok == false) {
CL_LOG(CL_LOG_ERROR,"X509 store is not valid");
@@ -569,6 +571,8 @@
is_ok = false;
}
+ X509_STORE_CTX_free(verify_ctx);
+
return is_ok;
}
--- pkg-gridengine.orig/source/utilbin/sge_passwd.c
+++ pkg-gridengine/source/utilbin/sge_passwd.c
@@ -280,7 +280,7 @@
size_t *buffer_out_length)
{
unsigned int ebuflen;
- EVP_CIPHER_CTX ectx;
+ EVP_CIPHER_CTX *ectx = NULL;
unsigned char iv[EVP_MAX_IV_LENGTH];
unsigned char *ekey[1];
int ekeylen=0, net_ekeylen=0;
@@ -315,6 +315,8 @@
ret = sge_ssl_rand_load_file(rand_file, sizeof(rand_file));
if(ret <= 0) {
+ sge_free(&(ekey[0]));
+ EVP_PKEY_free(pubKey[0]);
snprintf(err_str, MAX_STRING_SIZE, MSG_PWD_CANTLOADRANDFILE_SSS,
"sgepasswd", rand_file, MSG_PWD_NO_SSL_ERR);
@@ -325,11 +327,22 @@
return;
}
+ /* Initialise cipher context */
+ ectx = EVP_CIPHER_CTX_new();
+ if (!ectx) {
+ sge_free(&(ekey[0]));
+ EVP_PKEY_free(pubKey[0]);
+ fprintf(stderr, MSG_PWD_MALLOC_SS, SGE_PASSWD_PROG_NAME, MSG_PWD_NO_SSL_ERR);
+ fprintf(stderr, "\n");
+ DEXIT;
+ exit(1);
+ }
+
memset(iv, '\0', sizeof(iv));
#if 0
- ret = EVP_SealInit(&ectx, EVP_des_ede3_cbc(), ekey, &ekeylen, iv, pubKey, 1);
+ ret = EVP_SealInit(ectx, EVP_des_ede3_cbc(), ekey, &ekeylen, iv, pubKey, 1);
#else
- ret = EVP_SealInit(&ectx, EVP_rc4(), ekey, &ekeylen, iv, pubKey, 1);
+ ret = EVP_SealInit(ectx, EVP_rc4(), ekey, &ekeylen, iv, pubKey, 1);
#endif
if(ret == 0) {
printf("---> EVP_SealInit\n");
@@ -352,7 +365,7 @@
buffer_append(buffer_out, buffer_out_size, buffer_out_length,
(char*)iv, sizeof(iv));
- EVP_SealUpdate(&ectx, (unsigned char*)ebuf,
+ EVP_SealUpdate(ectx, (unsigned char*)ebuf,
(int*)&ebuflen,
(const unsigned char *) buffer_in,
buffer_in_length);
@@ -360,11 +373,12 @@
buffer_append(buffer_out, buffer_out_size, buffer_out_length,
ebuf, ebuflen);
- EVP_SealFinal(&ectx, (unsigned char *)ebuf, (int*)&ebuflen);
+ EVP_SealFinal(ectx, (unsigned char *)ebuf, (int*)&ebuflen);
buffer_append(buffer_out, buffer_out_size, buffer_out_length,
ebuf, ebuflen);
+ EVP_CIPHER_CTX_free(ectx);
EVP_PKEY_free(pubKey[0]);
sge_free(&(ekey[0]));
DEXIT;
@@ -379,7 +393,7 @@
char buf[520];
char ebuf[512];
unsigned int buflen;
- EVP_CIPHER_CTX ectx;
+ EVP_CIPHER_CTX *ectx = NULL;
unsigned char iv[EVP_MAX_IV_LENGTH];
unsigned char *encryptKey;
unsigned int ekeylen;
@@ -455,6 +469,16 @@
return 1;
}
+ /* Initialise cipher context */
+ ectx = EVP_CIPHER_CTX_new();
+ if (!ectx) {
+ sge_free(&encryptKey);
+ fprintf(stderr, MSG_PWD_MALLOC_SS, SGE_PASSWD_PROG_NAME, MSG_PWD_NO_SSL_ERR);
+ fprintf(stderr, "\n");
+ DEXIT;
+ exit(1);
+ }
+
memcpy(encryptKey, curr_ptr, ekeylen);
curr_ptr += ekeylen;
buffer_in_length -= ekeylen;
@@ -462,9 +486,9 @@
curr_ptr += sizeof(iv);
buffer_in_length -= sizeof(iv);
#if 0
- ret = EVP_OpenInit(&ectx, EVP_des_ede3_cbc(), encryptKey, ekeylen, iv, privateKey);
+ ret = EVP_OpenInit(ectx, EVP_des_ede3_cbc(), encryptKey, ekeylen, iv, privateKey);
#else
- ret = EVP_OpenInit(&ectx, EVP_rc4(), encryptKey, ekeylen, iv, privateKey);
+ ret = EVP_OpenInit(ectx, EVP_rc4(), encryptKey, ekeylen, iv, privateKey);
#endif
if(ret == 0) {
printf("----> EVP_OpenInit\n");
@@ -484,12 +508,13 @@
readlen = sizeof(ebuf);
}
- ret = EVP_OpenUpdate(&ectx, (unsigned char *)buf,
+ ret = EVP_OpenUpdate(ectx, (unsigned char *)buf,
(int*)&buflen,
(const unsigned char *)ebuf, readlen);
if (ret == 0) {
error_code = ERR_get_error();
ERR_error_string(error_code, err_msg);
+ EVP_CIPHER_CTX_free(ectx);
snprintf(err_str, lstr, MSG_PWD_SSL_ERR_MSG_SS, SGE_PASSWD_PROG_NAME, err_msg);
#ifdef DEFINE_SGE_PASSWD_MAIN
fprintf(stderr, "%s\n", err_str);
@@ -502,10 +527,11 @@
buf, buflen);
}
- ret = EVP_OpenFinal(&ectx, (unsigned char *)buf, (int*)&buflen);
+ ret = EVP_OpenFinal(ectx, (unsigned char *)buf, (int*)&buflen);
if (ret == 0) {
error_code = ERR_get_error();
ERR_error_string(error_code, err_msg);
+ EVP_CIPHER_CTX_free(ectx);
snprintf(err_str, lstr, MSG_PWD_SSL_ERR_MSG_SS, SGE_PASSWD_PROG_NAME, err_msg);
#ifdef DEFINE_SGE_PASSWD_MAIN
fprintf(stderr, "%s\n", err_str);
@@ -516,6 +542,7 @@
buffer_append(buffer_out, buffer_out_size, buffer_out_length,
buf, buflen);
+ EVP_CIPHER_CTX_free(ectx);
EVP_PKEY_free(privateKey);
sge_free(&encryptKey);
error_code = ERR_get_error();
|
