Handle NaN and Inf edge cases as specified by posix, instead of barfing.

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

diff --git a/sys/include/libsec.h b/sys/include/libsec.h
index cd4d4d402422ff502e0cfbc177706ed7323cf6a8..de0717c007aff6fbf5a107228206d0a19e045df1 100644 (file)
--- a/sys/include/libsec.h
+++ b/sys/include/libsec.h
@@ -24,27 +24,25 @@ struct AESstate
        ulong   offset;
        int     rounds;
        int     keybytes;
+       void    *ekey;                          /* expanded encryption round key */
+       void    *dkey;                          /* expanded decryption round key */
        uchar   key[AESmaxkey];                 /* unexpanded key */
-       ulong   ekey[4*(AESmaxrounds + 1)];     /* encryption key */
-       ulong   dkey[4*(AESmaxrounds + 1)];     /* decryption key */
        uchar   ivec[AESbsize];                 /* initialization vector */
-       uchar   mackey[3 * AESbsize];   /* 3 XCBC mac 96 keys */
+       uchar   storage[512];                   /* storage for expanded keys */
 };
 
 /* block ciphers */
-void   aes_encrypt(ulong rk[], int Nr, uchar pt[16], uchar ct[16]);
-void   aes_decrypt(ulong rk[], int Nr, uchar ct[16], uchar pt[16]);
+extern void (*aes_encrypt)(ulong rk[], int Nr, uchar pt[16], uchar ct[16]);
+extern void (*aes_decrypt)(ulong rk[], int Nr, uchar ct[16], uchar pt[16]);
+
+void   setupAESstate(AESstate *s, uchar key[], int nkey, uchar *ivec);
 
-void   setupAESstate(AESstate *s, uchar key[], int keybytes, uchar *ivec);
 void   aesCBCencrypt(uchar *p, int len, AESstate *s);
 void   aesCBCdecrypt(uchar *p, int len, AESstate *s);
 void   aesCFBencrypt(uchar *p, int len, AESstate *s);
 void   aesCFBdecrypt(uchar *p, int len, AESstate *s);
 void   aesOFBencrypt(uchar *p, int len, AESstate *s);
 
-void   setupAESXCBCstate(AESstate *s);
-uchar* aesXCBCmac(uchar *p, int len, AESstate *s);
-
 typedef struct AESGCMstate AESGCMstate;
 struct AESGCMstate
 {
@@ -377,6 +375,7 @@ int         asn1encodeRSApub(RSApub *pk, uchar *buf, int len);
 int            asn1encodedigest(DigestState* (*fun)(uchar*, ulong, uchar*, DigestState*),
                        uchar *digest, uchar *buf, int len);
 
+int            X509digestSPKI(uchar *, int, DigestState* (*)(uchar*, ulong, uchar*, DigestState*), uchar *);
 
 /*
  * elgamal
@@ -458,7 +457,6 @@ void                dsaprivfree(DSApriv*);
 DSAsig*                dsasigalloc(void);
 void           dsasigfree(DSAsig*);
 DSApub*                dsaprivtopub(DSApriv*);
-DSApriv*       asn1toDSApriv(uchar*, int);
 
 /*
  * TLS
@@ -502,8 +500,8 @@ uchar       *readcert(char *filename, int *pcertlen);
 PEMChain*readcertchain(char *filename);
 
 /* aes_xts.c */
-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);
+void aes_xts_encrypt(AESstate *tweak, AESstate *ecb, uvlong sectorNumber, uchar *input, uchar *output, ulong len);
+void aes_xts_decrypt(AESstate *tweak, AESstate *ecb, uvlong sectorNumber, uchar *input, uchar *output, ulong len);
 
 typedef struct ECpoint{
        int inf;