diff options
author | miod <> | 2014-04-23 22:26:26 +0000 |
---|---|---|
committer | miod <> | 2014-04-23 22:26:26 +0000 |
commit | 57f363f2f8ca275d715c73b6a4af0dadbc19d804 (patch) | |
tree | fdc347c1b6ae5bb862c0b018453022fe0225f681 /src/lib/libssl/s3_clnt.c | |
parent | 7aa32b6e8c2f36d05bd2d61063dbe667bb62842a (diff) | |
download | openbsd-57f363f2f8ca275d715c73b6a4af0dadbc19d804.tar.gz openbsd-57f363f2f8ca275d715c73b6a4af0dadbc19d804.tar.bz2 openbsd-57f363f2f8ca275d715c73b6a4af0dadbc19d804.zip |
Unifdef -UPKCS1_CHECK and remove SSL_OP_PKCS1_CHECK_[12], this is leftover
``debug'' code from a 15+ years old bugfix and the SSL_OP_PKCS1_CHECK_*
constants have had a value of zero since ages. No production code should use
them.
ok beck@
Diffstat (limited to 'src/lib/libssl/s3_clnt.c')
-rw-r--r-- | src/lib/libssl/s3_clnt.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c index ac1812d857..f740f7e139 100644 --- a/src/lib/libssl/s3_clnt.c +++ b/src/lib/libssl/s3_clnt.c | |||
@@ -2046,12 +2046,6 @@ ssl3_send_client_key_exchange(SSL *s) | |||
2046 | p += 2; | 2046 | p += 2; |
2047 | n = RSA_public_encrypt(sizeof tmp_buf, | 2047 | n = RSA_public_encrypt(sizeof tmp_buf, |
2048 | tmp_buf, p, rsa, RSA_PKCS1_PADDING); | 2048 | tmp_buf, p, rsa, RSA_PKCS1_PADDING); |
2049 | #ifdef PKCS1_CHECK | ||
2050 | if (s->options & SSL_OP_PKCS1_CHECK_1) | ||
2051 | p[1]++; | ||
2052 | if (s->options & SSL_OP_PKCS1_CHECK_2) | ||
2053 | tmp_buf[0] = 0x70; | ||
2054 | #endif | ||
2055 | if (n <= 0) { | 2049 | if (n <= 0) { |
2056 | SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, SSL_R_BAD_RSA_ENCRYPT); | 2050 | SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, SSL_R_BAD_RSA_ENCRYPT); |
2057 | goto err; | 2051 | goto err; |