libmp: remove include of libsec.h

[plan9front.git] / sys / include / libsec.h

diff --git a/sys/include/libsec.h b/sys/include/libsec.h
index 9a6a6a54c76563fe6580bc5986e9fa5a04c19ab0..09db4f0f09606309fe545a8a9484ab054de82b9b 100644 (file)
--- a/sys/include/libsec.h
+++ b/sys/include/libsec.h
@@ -70,6 +70,70 @@ void bfCBCdecrypt(uchar*, int, BFstate*);
 void   bfECBencrypt(uchar*, int, BFstate*);
 void   bfECBdecrypt(uchar*, int, BFstate*);
 
+/*
+ * Chacha definitions
+ */
+
+enum
+{
+       ChachaBsize=    64,
+       ChachaKeylen=   256/8,
+       ChachaIVlen=    96/8,
+};
+
+typedef struct Chachastate Chachastate;
+struct Chachastate
+{
+       union{
+               u32int  input[16];
+               struct {
+                       u32int  constant[4];
+                       u32int  key[8];
+                       u32int  counter;
+                       u32int  iv[3];
+               };
+       };
+       int     rounds;
+       int     ivwords;
+};
+
+void   setupChachastate(Chachastate*, uchar*, ulong, uchar*, ulong, int);
+void   chacha_setiv(Chachastate *, uchar*);
+void   chacha_setblock(Chachastate*, u64int);
+void   chacha_encrypt(uchar*, ulong, Chachastate*);
+void   chacha_encrypt2(uchar*, uchar*, ulong, Chachastate*);
+
+void   ccpoly_encrypt(uchar *dat, ulong ndat, uchar *aad, ulong naad, uchar tag[16], Chachastate *cs);
+int    ccpoly_decrypt(uchar *dat, ulong ndat, uchar *aad, ulong naad, uchar tag[16], Chachastate *cs);
+
+/*
+ * Salsa definitions
+ */
+enum
+{
+       SalsaBsize=     64,
+       SalsaKeylen=    256/8,
+       SalsaIVlen=     64/8,
+       XSalsaIVlen=    192/8,
+};
+
+typedef struct Salsastate Salsastate;
+struct Salsastate
+{
+       u32int  input[16];
+       u32int  key[8];
+       int     rounds;
+       int     ivwords;
+};
+
+void   setupSalsastate(Salsastate*, uchar*, ulong, uchar*, ulong, int);
+void   salsa_setiv(Salsastate*, uchar*);
+void   salsa_setblock(Salsastate*, u64int);
+void   salsa_encrypt(uchar*, ulong, Salsastate*);
+void   salsa_encrypt2(uchar*, uchar*, ulong, Salsastate*);
+
+void   hsalsa(uchar h[32], uchar *key, ulong keylen, uchar nonce[16], int rounds);
+
 /*
  * DES definitions
  */
@@ -141,7 +205,7 @@ enum
        SHA2_512dlen=   64,     /* SHA-512 digest length */
        MD4dlen=        16,     /* MD4 digest length */
        MD5dlen=        16,     /* MD5 digest length */
-       AESdlen=        16,     /* TODO: see rfc */
+       Poly1305dlen=   16,     /* Poly1305 digest length */
 
        Hmacblksz       = 64,   /* in bytes; from rfc2104 */
 };
@@ -167,7 +231,6 @@ typedef struct DigestState SHA2_384state;
 typedef struct DigestState SHA2_512state;
 typedef struct DigestState MD5state;
 typedef struct DigestState MD4state;
-typedef struct DigestState AEShstate;
 
 DigestState*   md4(uchar*, ulong, uchar*, DigestState*);
 DigestState*   md5(uchar*, ulong, uchar*, DigestState*);
@@ -176,7 +239,6 @@ DigestState*        sha2_224(uchar*, ulong, uchar*, DigestState*);
 DigestState*   sha2_256(uchar*, ulong, uchar*, DigestState*);
 DigestState*   sha2_384(uchar*, ulong, uchar*, DigestState*);
 DigestState*   sha2_512(uchar*, ulong, uchar*, DigestState*);
-DigestState*   aes(uchar*, ulong, uchar*, DigestState*);
 DigestState*   hmac_x(uchar *p, ulong len, uchar *key, ulong klen,
                        uchar *digest, DigestState *s,
                        DigestState*(*x)(uchar*, ulong, uchar*, DigestState*),
@@ -187,12 +249,13 @@ DigestState*      hmac_sha2_224(uchar*, ulong, uchar*, ulong, uchar*, DigestState*);
 DigestState*   hmac_sha2_256(uchar*, ulong, uchar*, ulong, uchar*, DigestState*);
 DigestState*   hmac_sha2_384(uchar*, ulong, uchar*, ulong, uchar*, DigestState*);
 DigestState*   hmac_sha2_512(uchar*, ulong, uchar*, ulong, uchar*, DigestState*);
-DigestState*   hmac_aes(uchar*, ulong, uchar*, ulong, uchar*, DigestState*);
 char*          md5pickle(MD5state*);
 MD5state*      md5unpickle(char*);
 char*          sha1pickle(SHA1state*);
 SHA1state*     sha1unpickle(char*);
 
+DigestState*   poly1305(uchar*, ulong, uchar*, ulong, uchar*, DigestState*);
+
 /*
  * random number generation
  */
@@ -276,9 +339,11 @@ RSApriv*   asn1toRSApriv(uchar*, int);
 void           asn1dump(uchar *der, int len);
 uchar*         decodePEM(char *s, char *type, int *len, char **new_s);
 PEMChain*      decodepemchain(char *s, char *type);
-uchar*         X509gen(RSApriv *priv, char *subj, ulong valid[2], int *certlen);
-uchar*         X509req(RSApriv *priv, char *subj, int *certlen);
-char*          X509verify(uchar *cert, int ncert, RSApub *pk);
+uchar*         X509rsagen(RSApriv *priv, char *subj, ulong valid[2], int *certlen);
+uchar*         X509rsareq(RSApriv *priv, char *subj, int *certlen);
+char*          X509rsaverifydigest(uchar *sig, int siglen, uchar *edigest, int edigestlen, RSApub *pk);
+char*          X509rsaverify(uchar *cert, int ncert, RSApub *pk);
+
 void           X509dump(uchar *cert, int ncert);
 
 /*
@@ -375,8 +440,10 @@ typedef struct TLSconn{
        char    dir[40];        /* connection directory */
        uchar   *cert;  /* certificate (local on input, remote on output) */
        uchar   *sessionID;
+       uchar   *psk;
        int     certlen;
        int     sessionIDlen;
+       int     psklen;
        int     (*trace)(char*fmt, ...);
        PEMChain*chain; /* optional extra certificate evidence for servers to present */
        char    *sessionType;
@@ -384,6 +451,7 @@ typedef struct TLSconn{
        int     sessionKeylen;
        char    *sessionConst;
        char    *serverName;
+       char    *pskID;
 } TLSconn;
 
 /* tlshand.c */
@@ -419,11 +487,14 @@ typedef struct ECdomain{
        mpint *p;
        mpint *a;
        mpint *b;
-       ECpoint *G;
+       ECpoint G;
        mpint *n;
        mpint *h;
 } ECdomain;
 
+void   ecdominit(ECdomain *, void (*init)(mpint *p, mpint *a, mpint *b, mpint *x, mpint *y, mpint *n, mpint *h));
+void   ecdomfree(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);
@@ -436,6 +507,18 @@ int        ecdsaverify(ECdomain *, ECpub *, uchar *, int, mpint *, mpint *);
 void   base58enc(uchar *, char *, int);
 int    base58dec(char *, uchar *, int);
 
+ECpub* ecdecodepub(ECdomain *dom, uchar *, int);
+int    ecencodepub(ECdomain *dom, ECpub *, uchar *, int);
+void   ecpubfree(ECpub *);
+
+ECpub* X509toECpub(uchar *cert, int ncert, ECdomain *dom);
+char*  X509ecdsaverifydigest(uchar *sig, int siglen, uchar *edigest, int edigestlen, ECdomain *dom, ECpub *pub);
+char*  X509ecdsaverify(uchar *sig, int siglen, ECdomain *dom, ECpub *pub);
+
+/* curves */
+void   secp256r1(mpint *p, mpint *a, mpint *b, mpint *x, mpint *y, mpint *n, mpint *h);
+void   secp256k1(mpint *p, mpint *a, mpint *b, mpint *x, mpint *y, mpint *n, mpint *h);
+
 DigestState*   ripemd160(uchar *, ulong, uchar *, DigestState *);
 
 /*
@@ -458,8 +541,20 @@ mpint* dh_new(DHstate *dh, mpint *p, mpint *q, mpint *g);
 /* calculate shared key: k = y**x % p */
 mpint* dh_finish(DHstate *dh, mpint *y);
 
-/* 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);
-
 /* Curve25519 elliptic curve, public key function */
 void curve25519(uchar mypublic[32], uchar secret[32], uchar basepoint[32]);
+
+/* Curve25519 diffie hellman */
+void curve25519_dh_new(uchar x[32], uchar y[32]);
+void curve25519_dh_finish(uchar x[32], uchar y[32], uchar z[32]);
+
+/* password-based key derivation function 2 (rfc2898) */
+void pbkdf2_x(uchar *p, ulong plen, uchar *s, ulong slen, ulong rounds, uchar *d, ulong dlen,
+       DigestState* (*x)(uchar*, ulong, uchar*, ulong, uchar*, DigestState*), int xlen);
+
+/* hmac-based key derivation function (rfc5869) */
+void hkdf_x(uchar *salt, ulong nsalt, uchar *info, ulong ninfo, uchar *key, ulong nkey, uchar *d, ulong dlen,
+       DigestState* (*x)(uchar*, ulong, uchar*, ulong, uchar*, DigestState*), int xlen);
+
+/* timing safe memcmp() */
+int tsmemcmp(void*, void*, ulong);