diff options
author | Gilles Chehade <gilles@cvs.openbsd.org> | 2016-02-02 21:18:05 +0000 |
---|---|---|
committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2016-02-02 21:18:05 +0000 |
commit | 57712a6c7308b4fd255dae592d8362c69529e66a (patch) | |
tree | 42eebe99fb14774a4bb84c200c8905b18236f2f4 | |
parent | da946cdb03c1241cf471552d5a42e78508dd1562 (diff) |
in RSA privsep engine, do not provide methods for rsa_sign / rsa_verify,
they are unused in OpenSMTPD and lead to crashes in -portable when we're
linked to OpenSSL starting with 1.0.2f
ok reyk@
-rw-r--r-- | usr.sbin/smtpd/ca.c | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/usr.sbin/smtpd/ca.c b/usr.sbin/smtpd/ca.c index 9e9fa44ad32..de6be966f21 100644 --- a/usr.sbin/smtpd/ca.c +++ b/usr.sbin/smtpd/ca.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ca.c,v 1.20 2015/12/28 22:08:30 jung Exp $ */ +/* $OpenBSD: ca.c,v 1.21 2016/02/02 21:18:04 gilles Exp $ */ /* * Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org> @@ -59,10 +59,6 @@ static int rsae_bn_mod_exp(BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *, BN_MONT_CTX *); static int rsae_init(RSA *); static int rsae_finish(RSA *); -static int rsae_sign(int, const unsigned char *, unsigned int, - unsigned char *, unsigned int *, const RSA *); -static int rsae_verify(int dtype, const unsigned char *m, unsigned int, - const unsigned char *, unsigned int, const RSA *); static int rsae_keygen(RSA *, int, BIGNUM *, BN_GENCB *); static uint64_t rsae_reqid = 0; @@ -356,8 +352,8 @@ static RSA_METHOD rsae_method = { rsae_finish, 0, NULL, - rsae_sign, - rsae_verify, + NULL, + NULL, rsae_keygen }; @@ -513,24 +509,6 @@ rsae_finish(RSA *rsa) } static int -rsae_sign(int type, const unsigned char *m, unsigned int m_length, - unsigned char *sigret, unsigned int *siglen, const RSA *rsa) -{ - log_debug("debug: %s: %s", proc_name(smtpd_process), __func__); - return (rsa_default->rsa_sign(type, m, m_length, - sigret, siglen, rsa)); -} - -static int -rsae_verify(int dtype, const unsigned char *m, unsigned int m_length, - const unsigned char *sigbuf, unsigned int siglen, const RSA *rsa) -{ - log_debug("debug: %s: %s", proc_name(smtpd_process), __func__); - return (rsa_default->rsa_verify(dtype, m, m_length, - sigbuf, siglen, rsa)); -} - -static int rsae_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb) { log_debug("debug: %s: %s", proc_name(smtpd_process), __func__); |