summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libtls/tls_internal.h3
-rw-r--r--src/lib/libtls/tls_signer.c6
2 files changed, 2 insertions, 7 deletions
diff --git a/src/lib/libtls/tls_internal.h b/src/lib/libtls/tls_internal.h
index ca1d96f627..f4c23f64e6 100644
--- a/src/lib/libtls/tls_internal.h
+++ b/src/lib/libtls/tls_internal.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_internal.h,v 1.80 2022/03/24 15:56:34 tb Exp $ */ 1/* $OpenBSD: tls_internal.h,v 1.81 2023/04/09 18:26:26 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org> 3 * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org>
4 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 4 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
@@ -302,7 +302,6 @@ ECDSA_METHOD *tls_signer_ecdsa_method(void);
302 302
303#define TLS_PADDING_NONE 0 303#define TLS_PADDING_NONE 0
304#define TLS_PADDING_RSA_PKCS1 1 304#define TLS_PADDING_RSA_PKCS1 1
305#define TLS_PADDING_RSA_X9_31 2
306 305
307int tls_config_set_sign_cb(struct tls_config *_config, tls_sign_cb _cb, 306int tls_config_set_sign_cb(struct tls_config *_config, tls_sign_cb _cb,
308 void *_cb_arg); 307 void *_cb_arg);
diff --git a/src/lib/libtls/tls_signer.c b/src/lib/libtls/tls_signer.c
index 1f11096792..f6005d3e07 100644
--- a/src/lib/libtls/tls_signer.c
+++ b/src/lib/libtls/tls_signer.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_signer.c,v 1.4 2022/02/01 17:18:38 jsing Exp $ */ 1/* $OpenBSD: tls_signer.c,v 1.5 2023/04/09 18:26:26 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2021 Eric Faurot <eric@openbsd.org> 3 * Copyright (c) 2021 Eric Faurot <eric@openbsd.org>
4 * 4 *
@@ -193,8 +193,6 @@ tls_sign_rsa(struct tls_signer *signer, struct tls_signer_key *skey,
193 rsa_padding = RSA_NO_PADDING; 193 rsa_padding = RSA_NO_PADDING;
194 } else if (padding_type == TLS_PADDING_RSA_PKCS1) { 194 } else if (padding_type == TLS_PADDING_RSA_PKCS1) {
195 rsa_padding = RSA_PKCS1_PADDING; 195 rsa_padding = RSA_PKCS1_PADDING;
196 } else if (padding_type == TLS_PADDING_RSA_X9_31) {
197 rsa_padding = RSA_X931_PADDING;
198 } else { 196 } else {
199 tls_error_setx(&signer->error, "invalid RSA padding type (%d)", 197 tls_error_setx(&signer->error, "invalid RSA padding type (%d)",
200 padding_type); 198 padding_type);
@@ -331,8 +329,6 @@ tls_rsa_priv_enc(int from_len, const unsigned char *from, unsigned char *to,
331 padding_type = TLS_PADDING_NONE; 329 padding_type = TLS_PADDING_NONE;
332 } else if (rsa_padding == RSA_PKCS1_PADDING) { 330 } else if (rsa_padding == RSA_PKCS1_PADDING) {
333 padding_type = TLS_PADDING_RSA_PKCS1; 331 padding_type = TLS_PADDING_RSA_PKCS1;
334 } else if (rsa_padding == RSA_X931_PADDING) {
335 padding_type = TLS_PADDING_RSA_X9_31;
336 } else { 332 } else {
337 goto err; 333 goto err;
338 } 334 }