diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2014-04-21 17:22:07 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2014-04-21 17:22:07 +0000 |
| commit | 18167fbd693858d2b51ef99dfea8ce5479cfee28 (patch) | |
| tree | 58805fa25c7c39f93c7d9b65dffd95b7488fb94c | |
| parent | c25baa4f1ad6a3a59e35b23865799d38e3f0f6b3 (diff) | |
Use RSA_set_ex_data()/RSA_get_ex_data() directly instead of
the undocumented RSA_set_app_data()/RSA_get_app_data() wrappers.
| -rw-r--r-- | usr.sbin/relayd/ca.c | 4 | ||||
| -rw-r--r-- | usr.sbin/relayd/ssl.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/relayd/ca.c b/usr.sbin/relayd/ca.c index 2b0cbb390bc..48a7c4de312 100644 --- a/usr.sbin/relayd/ca.c +++ b/usr.sbin/relayd/ca.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ca.c,v 1.5 2014/04/21 16:08:47 reyk Exp $ */ +/* $OpenBSD: ca.c,v 1.6 2014/04/21 17:22:06 reyk Exp $ */ /* * Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org> @@ -251,7 +251,7 @@ rsae_send_imsg(int flen, const u_char *from, u_char *to, RSA *rsa, int n, done = 0, cnt = 0; u_char *toptr; - if ((id = RSA_get_app_data(rsa)) == NULL) + if ((id = RSA_get_ex_data(rsa, 0)) == NULL) return (0); iev = proc_iev(env->sc_ps, PROC_CA, proc_id); diff --git a/usr.sbin/relayd/ssl.c b/usr.sbin/relayd/ssl.c index 33bf43f26a1..35c78b0947b 100644 --- a/usr.sbin/relayd/ssl.c +++ b/usr.sbin/relayd/ssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl.c,v 1.20 2014/04/18 13:55:26 reyk Exp $ */ +/* $OpenBSD: ssl.c,v 1.21 2014/04/21 17:22:06 reyk Exp $ */ /* * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -456,7 +456,7 @@ ssl_ctx_fake_private_key(SSL_CTX *ctx, void *data, char *buf, off_t len, goto fail; } - RSA_set_app_data(rsa, data); + RSA_set_ex_data(rsa, 0, data); /* * Use the public key as the "private" key - the secret key |