summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r--src/lib/libssl/s3_lib.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 28a3d51b9e..12ce8a1605 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -2962,9 +2962,9 @@ ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
2962 break; 2962 break;
2963 case SSL_CTRL_NEED_TMP_RSA: 2963 case SSL_CTRL_NEED_TMP_RSA:
2964 if ((s->cert != NULL) && (s->cert->rsa_tmp == NULL) && 2964 if ((s->cert != NULL) && (s->cert->rsa_tmp == NULL) &&
2965 ((s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL) || 2965 ((s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL) ||
2966 (EVP_PKEY_size(s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey) 2966 (EVP_PKEY_size(s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey)
2967 > (512 / 8)))) 2967 > (512 / 8))))
2968 ret = 1; 2968 ret = 1;
2969 break; 2969 break;
2970 case SSL_CTRL_SET_TMP_RSA: 2970 case SSL_CTRL_SET_TMP_RSA:
@@ -3113,10 +3113,12 @@ ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
3113 } 3113 }
3114 if (s->tlsext_opaque_prf_input != NULL) 3114 if (s->tlsext_opaque_prf_input != NULL)
3115 free(s->tlsext_opaque_prf_input); 3115 free(s->tlsext_opaque_prf_input);
3116 if ((size_t)larg == 0) 3116 if ((size_t)larg == 0) {
3117 s->tlsext_opaque_prf_input = malloc(1); /* dummy byte just to get non-NULL */ 3117 /* dummy byte just to get non-NULL */
3118 else 3118 s->tlsext_opaque_prf_input = malloc(1);
3119 s->tlsext_opaque_prf_input = BUF_memdup(parg, (size_t)larg); 3119 } else
3120 s->tlsext_opaque_prf_input =
3121 BUF_memdup(parg, (size_t)larg);
3120 if (s->tlsext_opaque_prf_input != NULL) { 3122 if (s->tlsext_opaque_prf_input != NULL) {
3121 s->tlsext_opaque_prf_input_len = (size_t)larg; 3123 s->tlsext_opaque_prf_input_len = (size_t)larg;
3122 ret = 1; 3124 ret = 1;