summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-12-07 16:47:28 +1100
committerDamien Miller <djm@mindrot.org>1999-12-07 16:47:28 +1100
commit81b25cf0a96f516d8ebc4a9b2684b4f46ce79b77 (patch)
treee185fcabc420c91b610d61a0ef8f46670dc486a4
parent23aa96edca3f8db12a7548108c2b05bf1f28a14a (diff)
Forgot -kb
-rw-r--r--channels.c4
-rw-r--r--fingerprint.c74
2 files changed, 2 insertions, 76 deletions
diff --git a/channels.c b/channels.c
index 6c2fb73aa..328a11781 100644
--- a/channels.c
+++ b/channels.c
@@ -16,7 +16,7 @@
16 */ 16 */
17 17
18#include "includes.h" 18#include "includes.h"
19RCSID("$Id: channels.c,v 1.10 1999/12/07 04:38:32 damien Exp $"); 19RCSID("$Id: channels.c,v 1.11 1999/12/07 05:47:28 damien Exp $");
20 20
21#include "ssh.h" 21#include "ssh.h"
22#include "packet.h" 22#include "packet.h"
@@ -1178,7 +1178,7 @@ x11_create_display_inet(int screen_number)
1178 1178
1179static 1179static
1180int 1180int
1181connect_local_xsocket(unsigned dnr) 1181connect_local_xsocket(unsigned int dnr)
1182{ 1182{
1183 static const char *const x_sockets[] = { 1183 static const char *const x_sockets[] = {
1184 X_UNIX_PATH "%u", 1184 X_UNIX_PATH "%u",
diff --git a/fingerprint.c b/fingerprint.c
deleted file mode 100644
index 7784e8b7d..000000000
--- a/fingerprint.c
+++ /dev/null
@@ -1,74 +0,0 @@
1/*
2 * Copyright (c) 1999 Markus Friedl. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * 3. All advertising materials mentioning features or use of this software
13 * must display the following acknowledgement:
14 * This product includes software developed by Markus Friedl.
15 * 4. The name of the author may not be used to endorse or promote products
16 * derived from this software without specific prior written permission.
17 *
18 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
19 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
20 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
21 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
22 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */
29
30#include "includes.h"
31RCSID("$Id: fingerprint.c,v 1.4 1999/11/24 16:15:25 markus Exp $");
32
33#include "ssh.h"
34#include "xmalloc.h"
35#ifdef HAVE_OPENSSL
36#include <openssl/md5.h>
37#endif
38#ifdef HAVE_SSL
39#include <ssl/md5.h>
40#endif
41
42#define FPRINT "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x"
43
44/*
45 * Generate key fingerprint in ascii format.
46 * Based on ideas and code from Bjoern Groenvall <bg@sics.se>
47 */
48char *
49fingerprint(BIGNUM *e, BIGNUM *n)
50{
51 static char retval[80];
52 MD5_CTX md;
53 unsigned char d[16];
54 char *buf;
55 int nlen, elen;
56
57 nlen = BN_num_bytes(n);
58 elen = BN_num_bytes(e);
59
60 buf = xmalloc(nlen + elen);
61
62 BN_bn2bin(n, buf);
63 BN_bn2bin(e, buf + nlen);
64
65 MD5_Init(&md);
66 MD5_Update(&md, buf, nlen + elen);
67 MD5_Final(d, &md);
68 snprintf(retval, sizeof(retval), FPRINT,
69 d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7],
70 d[8], d[9], d[10], d[11], d[12], d[13], d[14], d[15]);
71 memset(buf, 0, nlen + elen);
72 xfree(buf);
73 return retval;
74}