Mercurial > dropbear

comparison dss.h @ 641:2b1bb792cd4d dropbear-tfm

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Update tfm changes to current default tip
author Matt Johnston <matt@ucc.asn.au>
date Mon, 21 Nov 2011 19:52:28 +0800
parents 76097ec1a29a b50f0107e505
children 33fd2f3499d2
comparison
equal deleted inserted replaced
640:76097ec1a29a 641:2b1bb792cd4d
30 30
31 #ifdef DROPBEAR_DSS 31 #ifdef DROPBEAR_DSS
32 32
33 #define DSS_SIGNATURE_SIZE 4+SSH_SIGNKEY_DSS_LEN+4+2*SHA1_HASH_SIZE 33 #define DSS_SIGNATURE_SIZE 4+SSH_SIGNKEY_DSS_LEN+4+2*SHA1_HASH_SIZE
34 34
35 struct DSS_key { 35 typedef struct {
36 36
37 <<<<<<< mine
37 fp_int* p; 38 fp_int* p;
38 fp_int* q; 39 fp_int* q;
39 fp_int* g; 40 fp_int* g;
40 fp_int* y; 41 fp_int* y;
41 fp_int* x; 42 fp_int* x;
43 =======
44 mp_int* p;
45 mp_int* q;
46 mp_int* g;
47 mp_int* y;
48 /* x is the private part */
49 mp_int* x;
50 >>>>>>> theirs
42 51
43 }; 52 } dropbear_dss_key;
44 53
45 typedef struct DSS_key dss_key; 54 void buf_put_dss_sign(buffer* buf, dropbear_dss_key *key, const unsigned char* data,
46
47 void buf_put_dss_sign(buffer* buf, dss_key *key, const unsigned char* data,
48 unsigned int len); 55 unsigned int len);
49 #ifdef DROPBEAR_SIGNKEY_VERIFY 56 #ifdef DROPBEAR_SIGNKEY_VERIFY
50 int buf_dss_verify(buffer* buf, dss_key *key, const unsigned char* data, 57 int buf_dss_verify(buffer* buf, dropbear_dss_key *key, const unsigned char* data,
51 unsigned int len); 58 unsigned int len);
52 #endif 59 #endif
53 int buf_get_dss_pub_key(buffer* buf, dss_key *key); 60 int buf_get_dss_pub_key(buffer* buf, dropbear_dss_key *key);
54 int buf_get_dss_priv_key(buffer* buf, dss_key *key); 61 int buf_get_dss_priv_key(buffer* buf, dropbear_dss_key *key);
55 void buf_put_dss_pub_key(buffer* buf, dss_key *key); 62 void buf_put_dss_pub_key(buffer* buf, dropbear_dss_key *key);
56 void buf_put_dss_priv_key(buffer* buf, dss_key *key); 63 void buf_put_dss_priv_key(buffer* buf, dropbear_dss_key *key);
57 void dss_key_free(dss_key *key); 64 void dss_key_free(dropbear_dss_key *key);
58 65
59 #endif /* DROPBEAR_DSS */ 66 #endif /* DROPBEAR_DSS */
60 67
61 #endif /* _DSS_H_ */ 68 #endif /* _DSS_H_ */