about summary refs log tree commit diff
path: root/tls_signer.c
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2023-10-11 19:26:04 -0400
committerJune McEnroe <june@causal.agency>2023-10-11 19:26:04 -0400
commit60da345ee97c2f374d11b94f5954397b152ca8b5 (patch)
tree95426d50e299fdfba6350353dcbbaba5961a7376 /tls_signer.c
parentMerge LibreSSL 3.7.3 (diff)
parentImport LibreSSL 3.8.0 (diff)
downloadlibretls-60da345ee97c2f374d11b94f5954397b152ca8b5.tar.gz
libretls-60da345ee97c2f374d11b94f5954397b152ca8b5.zip
Merge LibreSSL 3.8.0
Diffstat (limited to 'tls_signer.c')
-rw-r--r--tls_signer.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/tls_signer.c b/tls_signer.c
index 9311cfe..97e5e38 100644
--- a/tls_signer.c
+++ b/tls_signer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls_signer.c,v 1.4 2022/02/01 17:18:38 jsing Exp $ */
+/* $OpenBSD: tls_signer.c,v 1.5 2023/04/09 18:26:26 tb Exp $ */
 /*
  * Copyright (c) 2021 Eric Faurot <eric@openbsd.org>
  *
@@ -194,8 +194,6 @@ tls_sign_rsa(struct tls_signer *signer, struct tls_signer_key *skey,
 		rsa_padding = RSA_NO_PADDING;
 	} else if (padding_type == TLS_PADDING_RSA_PKCS1) {
 		rsa_padding = RSA_PKCS1_PADDING;
-	} else if (padding_type == TLS_PADDING_RSA_X9_31) {
-		rsa_padding = RSA_X931_PADDING;
 	} else {
 		tls_error_setx(&signer->error, "invalid RSA padding type (%d)",
 		    padding_type);
@@ -332,8 +330,6 @@ tls_rsa_priv_enc(int from_len, const unsigned char *from, unsigned char *to,
 		padding_type = TLS_PADDING_NONE;
 	} else if (rsa_padding == RSA_PKCS1_PADDING) {
 		padding_type = TLS_PADDING_RSA_PKCS1;
-	} else if (rsa_padding == RSA_X931_PADDING) {
-		padding_type = TLS_PADDING_RSA_X9_31;
 	} else {
 		goto err;
 	}