ndb/dnstcp: -x specifies the mountmoint

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

diff --git a/sys/include/libsec.h b/sys/include/libsec.h
index d275d6d4766fe42ac521505c255e5a45d73f951b..86cb342e5e35850a7fea6dd4a601d5242623d8ca 100644 (file)
--- a/sys/include/libsec.h
+++ b/sys/include/libsec.h
@@ -70,6 +70,42 @@ 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);
+
 /*
  * DES definitions
  */
@@ -141,6 +177,7 @@ enum
        SHA2_512dlen=   64,     /* SHA-512 digest length */
        MD4dlen=        16,     /* MD4 digest length */
        MD5dlen=        16,     /* MD5 digest length */
+       Poly1305dlen=   16,     /* Poly1305 digest length */
 
        Hmacblksz       = 64,   /* in bytes; from rfc2104 */
 };
@@ -189,6 +226,8 @@ MD5state*   md5unpickle(char*);
 char*          sha1pickle(SHA1state*);
 SHA1state*     sha1unpickle(char*);
 
+DigestState*   poly1305(uchar*, ulong, uchar*, ulong, uchar*, DigestState*);
+
 /*
  * random number generation
  */
@@ -274,6 +313,8 @@ 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*          X509verifydigest(uchar *sig, int siglen, uchar *edigest, int edigestlen, RSApub *pk);
+char*          X509verifydata(uchar *sig, int siglen, uchar *data, int datalen, RSApub *pk);
 char*          X509verify(uchar *cert, int ncert, RSApub *pk);
 void           X509dump(uchar *cert, int ncert);
 
@@ -371,8 +412,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;
@@ -380,6 +423,7 @@ typedef struct TLSconn{
        int     sessionKeylen;
        char    *sessionConst;
        char    *serverName;
+       char    *pskID;
 } TLSconn;
 
 /* tlshand.c */
@@ -454,8 +498,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);