comparison common-runopts.c @ 910:89555751c489 asm

merge up to 2013.63, improve ASM makefile rules a bit
author Matt Johnston <matt@ucc.asn.au>
date Thu, 27 Feb 2014 21:35:58 +0800
parents 220f55d540ae
children 17d874ae93a1
comparison
equal deleted inserted replaced
909:e4b75744acab 910:89555751c489
27 #include "signkey.h" 27 #include "signkey.h"
28 #include "buffer.h" 28 #include "buffer.h"
29 #include "dbutil.h" 29 #include "dbutil.h"
30 #include "auth.h" 30 #include "auth.h"
31 #include "algo.h" 31 #include "algo.h"
32 #include "random.h" 32 #include "dbrandom.h"
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);