~ubuntu-branches/ubuntu/lucid/openssh/lucid

« back to all changes in this revision

Viewing changes to key.h

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2008-09-30 23:09:58 UTC
  • mfrom: (1.13.3 upstream) (29 hardy)
  • mto: This revision was merged to the branch mainline in revision 43.
  • Revision ID: james.westby@ubuntu.com-20080930230958-o6vsgn8c4mm959s0
Tags: 1:5.1p1-3
* Remove unnecessary ssh-vulnkey output in non-verbose mode when no
  compromised or unknown keys were found (closes: #496495).
* Configure with --disable-strip; dh_strip will deal with stripping
  binaries and will honour DEB_BUILD_OPTIONS (thanks, Bernhard R. Link;
  closes: #498681).
* Fix handling of zero-length server banners (thanks, Tomas Mraz; closes:
  #497026).

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
/* $OpenBSD: key.h,v 1.26 2006/08/03 03:34:42 deraadt Exp $ */
 
1
/* $OpenBSD: key.h,v 1.27 2008/06/11 21:01:35 grunk Exp $ */
2
2
 
3
3
/*
4
4
 * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
43
43
};
44
44
enum fp_rep {
45
45
        SSH_FP_HEX,
46
 
        SSH_FP_BUBBLEBABBLE
 
46
        SSH_FP_BUBBLEBABBLE,
 
47
        SSH_FP_RANDOMART
47
48
};
48
49
 
49
50
/* key is stored in external hardware */