diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | auth.h | 3 | ||||
| -rw-r--r-- | hostfile.c | 15 | ||||
| -rw-r--r-- | hostfile.h | 4 |
4 files changed, 9 insertions, 18 deletions
@@ -18,6 +18,9 @@ - markus@cvs.openbsd.org 2001/12/10 20:34:31 [ssh-keyscan.c] check that server supports v1 for -t rsa1, report from wirth@dfki.de + - jakob@cvs.openbsd.org 2001/12/18 10:04:21 + [auth.h hostfile.c hostfile.h] + remove auth_rsa_read_key, make hostfile_ready_key non static; ok markus@ 20011219 - (stevesk) OpenBSD CVS sync X11 localhost display @@ -7046,4 +7049,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1697 2001/12/21 01:45:43 djm Exp $ +$Id: ChangeLog,v 1.1698 2001/12/21 01:47:09 djm Exp $ @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $OpenBSD: auth.h,v 1.23 2001/12/09 18:45:56 markus Exp $ + * $OpenBSD: auth.h,v 1.24 2001/12/18 10:04:21 jakob Exp $ */ #ifndef AUTH_H #define AUTH_H @@ -94,7 +94,6 @@ auth_rhosts2(struct passwd *, const char *, const char *, const char *); int auth_rhosts_rsa(struct passwd *, const char *, RSA *); int auth_password(Authctxt *, const char *); int auth_rsa(struct passwd *, BIGNUM *); -int auth_rsa_read_key(char **, u_int *, BIGNUM *, BIGNUM *); int auth_rsa_challenge_dialog(RSA *); #ifdef KRB4 @@ -36,7 +36,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: hostfile.c,v 1.28 2001/06/25 08:25:37 markus Exp $"); +RCSID("$OpenBSD: hostfile.c,v 1.29 2001/12/18 10:04:21 jakob Exp $"); #include "packet.h" #include "match.h" @@ -49,7 +49,7 @@ RCSID("$OpenBSD: hostfile.c,v 1.28 2001/06/25 08:25:37 markus Exp $"); * pointer over the key. Skips any whitespace at the beginning and at end. */ -static int +int hostfile_read_key(char **cpp, u_int *bitsp, Key *ret) { char *cp; @@ -71,17 +71,6 @@ hostfile_read_key(char **cpp, u_int *bitsp, Key *ret) return 1; } -int -auth_rsa_read_key(char **cpp, u_int *bitsp, BIGNUM * e, BIGNUM * n) -{ - Key *k = key_new(KEY_RSA1); - int ret = hostfile_read_key(cpp, bitsp, k); - BN_copy(e, k->rsa->e); - BN_copy(n, k->rsa->n); - key_free(k); - return ret; -} - static int hostfile_check_key(int bits, Key *key, const char *host, const char *filename, int linenum) { @@ -1,4 +1,4 @@ -/* $OpenBSD: hostfile.h,v 1.9 2001/06/26 17:27:23 markus Exp $ */ +/* $OpenBSD: hostfile.h,v 1.10 2001/12/18 10:04:21 jakob Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -18,9 +18,9 @@ typedef enum { HOST_OK, HOST_NEW, HOST_CHANGED } HostStatus; +int hostfile_read_key(char **, u_int *, Key *); HostStatus check_host_in_hostfile(const char *, const char *, Key *, Key *, int *); int add_host_to_hostfile(const char *, const char *, Key *); -int auth_rsa_read_key(char **, u_int *, BIGNUM *, BIGNUM *); #endif |