Mercurial > dropbear
diff dss.h @ 642:33fd2f3499d2 dropbear-tfm
A few build fixes
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Tue, 22 Nov 2011 19:28:58 +0700 |
| parents | 2b1bb792cd4d |
| children |
line wrap: on
line diff
--- a/dss.h Mon Nov 21 19:52:28 2011 +0800 +++ b/dss.h Tue Nov 22 19:28:58 2011 +0700 @@ -34,20 +34,12 @@ typedef struct { -<<<<<<< mine fp_int* p; fp_int* q; fp_int* g; fp_int* y; + /* x is the private part */ fp_int* x; -======= - mp_int* p; - mp_int* q; - mp_int* g; - mp_int* y; - /* x is the private part */ - mp_int* x; ->>>>>>> theirs } dropbear_dss_key;