← Back to branch summary

~ubuntu-branches/ubuntu/trusty/dropbear/trusty

« back to all changes in this revision

Viewing changes to dropbearkey.c

  • Committer: Package Import Robot
  • Author(s): Mattia Rizzolo
  • Date: 2014-01-29 17:44:42 UTC
  • mfrom: (1.3.9) (14.1.8 sid)
  • Revision ID: package-import@ubuntu.com-20140129174442-966g9n5pa58m0b1s
Tags: 2013.60-1ubuntu1
https://launchpad.net/bugs/1274195
* Merge from Debian unstable.  Remaining changes: (LP: #1274195)
  - debian/initrmfs/premount-devpts: if /dev/pts is already mounted, don't
    re-mount it.
* debian/diff/autoconfupdate.diff: dropped, not needed anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dropbearkey.c
65
65
static void printhelp(char * progname) {
66
66
 
67
67
        fprintf(stderr, "Usage: %s -t <type> -f <filename> [-s bits]\n"
68
 
                                        "Options are:\n"
69
68
                                        "-t type        Type of key to generate. One of:\n"
70
69
#ifdef DROPBEAR_RSA
71
70
                                        "               rsa\n"