comparison signkey.c @ 1122:aaf576b27a10

Merge pull request #13 from gazoo74/fix-warnings Fix warnings
author Matt Johnston <matt@ucc.asn.au>
date Thu, 04 Jun 2015 23:08:50 +0800
parents c45d65392c1a
children c6346c63281b
comparison
equal deleted inserted replaced
1087:1e486f368ec3 1122:aaf576b27a10
136 /* returns DROPBEAR_SUCCESS on success, DROPBEAR_FAILURE on fail. 136 /* returns DROPBEAR_SUCCESS on success, DROPBEAR_FAILURE on fail.
137 * type should be set by the caller to specify the type to read, and 137 * type should be set by the caller to specify the type to read, and
138 * on return is set to the type read (useful when type = _ANY) */ 138 * on return is set to the type read (useful when type = _ANY) */
139 int buf_get_pub_key(buffer *buf, sign_key *key, enum signkey_type *type) { 139 int buf_get_pub_key(buffer *buf, sign_key *key, enum signkey_type *type) {
140 140
141 unsigned char* ident; 141 char *ident;
142 unsigned int len; 142 unsigned int len;
143 enum signkey_type keytype; 143 enum signkey_type keytype;
144 int ret = DROPBEAR_FAILURE; 144 int ret = DROPBEAR_FAILURE;
145 145
146 TRACE2(("enter buf_get_pub_key")) 146 TRACE2(("enter buf_get_pub_key"))
207 /* returns DROPBEAR_SUCCESS on success, DROPBEAR_FAILURE on fail. 207 /* returns DROPBEAR_SUCCESS on success, DROPBEAR_FAILURE on fail.
208 * type should be set by the caller to specify the type to read, and 208 * type should be set by the caller to specify the type to read, and
209 * on return is set to the type read (useful when type = _ANY) */ 209 * on return is set to the type read (useful when type = _ANY) */
210 int buf_get_priv_key(buffer *buf, sign_key *key, enum signkey_type *type) { 210 int buf_get_priv_key(buffer *buf, sign_key *key, enum signkey_type *type) {
211 211
212 unsigned char* ident; 212 char *ident;
213 unsigned int len; 213 unsigned int len;
214 enum signkey_type keytype; 214 enum signkey_type keytype;
215 int ret = DROPBEAR_FAILURE; 215 int ret = DROPBEAR_FAILURE;
216 216
217 TRACE2(("enter buf_get_priv_key")) 217 TRACE2(("enter buf_get_priv_key"))
513 * If FAILURE is returned, the position of 513 * If FAILURE is returned, the position of
514 * buf is undefined. If SUCCESS is returned, buf will be positioned after the 514 * buf is undefined. If SUCCESS is returned, buf will be positioned after the
515 * signature blob */ 515 * signature blob */
516 int buf_verify(buffer * buf, sign_key *key, buffer *data_buf) { 516 int buf_verify(buffer * buf, sign_key *key, buffer *data_buf) {
517 517
518 unsigned char * type_name = NULL; 518 char *type_name = NULL;
519 unsigned int type_name_len = 0; 519 unsigned int type_name_len = 0;
520 enum signkey_type type; 520 enum signkey_type type;
521 521
522 TRACE(("enter buf_verify")) 522 TRACE(("enter buf_verify"))
523 523