comparison common-runopts.c @ 845:774ad9b112ef

merge yet again
author Matt Johnston <matt@ucc.asn.au>
date Fri, 01 Nov 2013 00:21:59 +0800
parents d4ce5269a439
children 220f55d540ae
comparison
equal deleted inserted replaced
844:68facbc41273 845:774ad9b112ef
33 33
34 runopts opts; /* GLOBAL */ 34 runopts opts; /* GLOBAL */
35 35
36 /* returns success or failure, and the keytype in *type. If we want 36 /* returns success or failure, and the keytype in *type. If we want
37 * to restrict the type, type can contain a type to return */ 37 * to restrict the type, type can contain a type to return */
38 int readhostkey(const char * filename, sign_key * hostkey, int *type) { 38 int readhostkey(const char * filename, sign_key * hostkey,
39 enum signkey_type *type) {
39 40
40 int ret = DROPBEAR_FAILURE; 41 int ret = DROPBEAR_FAILURE;
41 buffer *buf; 42 buffer *buf;
42 43
43 buf = buf_new(MAX_PRIVKEY_SIZE); 44 buf = buf_new(MAX_PRIVKEY_SIZE);