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
|
From 253e6ef6a4fde5545111f7c439a9692afecc597b Mon Sep 17 00:00:00 2001
From: TJ Saunders <tj@castaglia.org>
Date: Thu, 10 Mar 2016 15:17:50 -0800
Subject: [PATCH] Fix build errors; used wrong variable name, and pushed
without building. Shame.
Upstream-Status: Backport
Author: TJ Saunders <tj@castaglia.org>
Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
---
contrib/mod_tls.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/contrib/mod_tls.c b/contrib/mod_tls.c
index c557454..ecd9f56 100644
--- a/contrib/mod_tls.c
+++ b/contrib/mod_tls.c
@@ -2423,7 +2423,7 @@ static int tls_ctrl_renegotiate_cb(CALLBACK_FRAME) {
}
#endif
-static DH *tls_dh_cb(SSL *ssl, int is_export, int keylength) {
+static DH *tls_dh_cb(SSL *ssl, int is_export, int keylen) {
DH *dh = NULL;
EVP_PKEY *pkey;
int pkeylen = 0, use_pkeylen = FALSE;
@@ -2597,7 +2597,7 @@ static DH *tls_dh_cb(SSL *ssl, int is_export, int keylength) {
}
#ifdef PR_USE_OPENSSL_ECC
-static EC_KEY *tls_ecdh_cb(SSL *ssl, int is_export, int keylength) {
+static EC_KEY *tls_ecdh_cb(SSL *ssl, int is_export, int keylen) {
static EC_KEY *ecdh = NULL;
static int init = 0;
@@ -5064,7 +5064,7 @@ static ssize_t tls_read(SSL *ssl, void *buf, size_t len) {
return count;
}
-static RSA *tls_rsa_cb(SSL *ssl, int is_export, int keylength) {
+static RSA *tls_rsa_cb(SSL *ssl, int is_export, int keylen) {
BIGNUM *e = NULL;
if (tls_tmp_rsa) {
@@ -5082,13 +5082,13 @@ static RSA *tls_rsa_cb(SSL *ssl, int is_export, int keylength) {
return NULL;
}
- if (RSA_generate_key_ex(tls_tmp_rsa, keylength, e, NULL) != 1) {
+ if (RSA_generate_key_ex(tls_tmp_rsa, keylen, e, NULL) != 1) {
BN_free(e);
return NULL;
}
#else
- tls_tmp_rsa = RSA_generate_key(keylength, RSA_F4, NULL, NULL);
+ tls_tmp_rsa = RSA_generate_key(keylen, RSA_F4, NULL, NULL);
#endif /* OpenSSL version 0.9.8 and later */
if (e != NULL) {
--
2.7.4
|
