diff options
| author | des <des@FreeBSD.org> | 2005-09-03 07:04:25 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2005-09-03 07:04:25 +0000 |
| commit | 88c7c9558ba88abbcc00dcd9133b4996eff74033 (patch) | |
| tree | 15c858fecc18a67f9dcc639fd5be6afa6ed7037f /crypto/openssh/key.c | |
| parent | 1ea3628aba1278f27d571a26380b4e91155d3973 (diff) | |
| download | FreeBSD-src-88c7c9558ba88abbcc00dcd9133b4996eff74033.zip FreeBSD-src-88c7c9558ba88abbcc00dcd9133b4996eff74033.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/key.c')
| -rw-r--r-- | crypto/openssh/key.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/key.c b/crypto/openssh/key.c index e419304..08c158b 100644 --- a/crypto/openssh/key.c +++ b/crypto/openssh/key.c @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$OpenBSD: key.c,v 1.57 2004/10/29 23:57:05 djm Exp $"); +RCSID("$OpenBSD: key.c,v 1.58 2005/06/17 02:44:32 djm Exp $"); #include <openssl/evp.h> @@ -231,7 +231,7 @@ static char * key_fingerprint_hex(u_char *dgst_raw, u_int dgst_raw_len) { char *retval; - int i; + u_int i; retval = xmalloc(dgst_raw_len * 3 + 1); retval[0] = '\0'; |
