fix fuckup

This commit is contained in:
glenda 2015-08-25 09:35:10 +00:00
parent 6b402b83cf
commit c4fdc6bfdb
42 changed files with 218 additions and 359 deletions

View file

@ -403,16 +403,6 @@ PEMChain*readcertchain(char *filename);
int aes_xts_encrypt(ulong tweak[], ulong ecb[], vlong sectorNumber, uchar *input, uchar *output, ulong len) ;
int aes_xts_decrypt(ulong tweak[], ulong ecb[], vlong sectorNumber, uchar *input, uchar *output, ulong len);
/*
* ECC
*/
/* ids for ecnamedcurve */
enum
{
Secp256r1 = 23,
};
typedef struct ECpoint{
int inf;
mpint *x;
@ -434,15 +424,10 @@ typedef struct ECdomain{
mpint *h;
} ECdomain;
ECdomain* ecnamedcurve(int);
void ecfreepoint(ECpoint*);
void ecfreepriv(ECpriv*);
void ecfreedomain(ECdomain*);
void ecassign(ECdomain *, ECpoint *old, ECpoint *new);
void ecadd(ECdomain *, ECpoint *a, ECpoint *b, ECpoint *s);
void ecmul(ECdomain *, ECpoint *a, mpint *k, ECpoint *s);
ECpoint* betoec(ECdomain*, uchar*, int, ECpoint*);
ECpoint* strtoec(ECdomain *, char *, char **, ECpoint*);
ECpoint* strtoec(ECdomain *, char *, char **, ECpoint *);
ECpriv* ecgen(ECdomain *, ECpriv*);
int ecverify(ECdomain *, ECpoint *);
int ecpubverify(ECdomain *, ECpub *);
@ -472,8 +457,5 @@ mpint* dh_new(DHstate *dh, mpint *p, mpint *g);
/* calculate shared key: k = pub ^ x % p */
mpint* dh_finish(DHstate *dh, mpint *pub);
/* constant-time comparison similar to memcmp(2) */
int constcmp(uchar *x, uchar *y, int len);
/* password-based key derivation function 2 (RFC 2898) */
void pbkdf2_hmac_sha1(uchar *p, ulong plen, uchar *s, ulong slen, ulong rounds, uchar *d, ulong dlen);