Mercurial > dropbear

comparison dss.h @ 642:33fd2f3499d2 dropbear-tfm

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
A few build fixes
author Matt Johnston <matt@ucc.asn.au>
date Tue, 22 Nov 2011 19:28:58 +0700
parents 2b1bb792cd4d
children
comparison
equal deleted inserted replaced
641:2b1bb792cd4d 642:33fd2f3499d2
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 typedef struct { 35 typedef struct {
36 36
37 <<<<<<< mine
38 fp_int* p; 37 fp_int* p;
39 fp_int* q; 38 fp_int* q;
40 fp_int* g; 39 fp_int* g;
41 fp_int* y; 40 fp_int* y;
41 /* x is the private part */
42 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
51 43
52 } dropbear_dss_key; 44 } dropbear_dss_key;
53 45
54 void buf_put_dss_sign(buffer* buf, dropbear_dss_key *key, const unsigned char* data, 46 void buf_put_dss_sign(buffer* buf, dropbear_dss_key *key, const unsigned char* data,
55 unsigned int len); 47 unsigned int len);