diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2015-08-21 02:43:31 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2015-08-21 02:43:31 +0200 |
| commit | 63b18e79252845d09abbad44672eabd9233a911b (patch) | |
| tree | a71e5f93e01bf695bca43cc148ebf9a2c9a738c7 /sys/include | |
| parent | e48a5832b26f817ab06db2d42f88288373b78fac (diff) | |
introduce AES key into nvram and keyfs
Diffstat (limited to 'sys/include')
| -rw-r--r-- | sys/include/authsrv.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/include/authsrv.h b/sys/include/authsrv.h index d8fbf36bc..1808f1716 100644 --- a/sys/include/authsrv.h +++ b/sys/include/authsrv.h @@ -20,6 +20,7 @@ enum AERRLEN= 64, /* errstr max size in previous proto */ DOMLEN= 48, /* authentication domain name length */ DESKEYLEN= 7, /* encrypt/decrypt des key length */ + AESKEYLEN= 16, CHALLEN= 8, /* plan9 sk1 challenge length */ NETCHLEN= 16, /* max network challenge length (used in AS protocol) */ CONFIGLEN= 14, @@ -115,6 +116,7 @@ struct OMSchapreply struct Authkey { char des[DESKEYLEN]; + uchar aes[AESKEYLEN]; }; /* @@ -132,7 +134,7 @@ extern int convM2PR(char*, int, Passwordreq*, Ticket*); /* * convert ascii password to DES key */ -extern int passtokey(Authkey*, char*); +extern void passtokey(Authkey*, char*); /* * Nvram interface @@ -147,7 +149,7 @@ enum { /* storage layout */ struct Nvrsafe { - char machkey[DESKEYLEN]; /* was file server's authid's des key */ + char machkey[DESKEYLEN]; /* file server's authid's des key */ uchar machsum; char authkey[DESKEYLEN]; /* authid's des key from password */ uchar authsum; @@ -159,8 +161,11 @@ struct Nvrsafe uchar configsum; char authid[ANAMELEN]; /* auth userid, e.g., bootes */ uchar authidsum; - char authdom[DOMLEN]; /* auth domain, e.g., cs.bell-labs.com */ + char authdom[DOMLEN]; /* auth domain, e.g., cs.bell-labs.com */ uchar authdomsum; + + uchar aesmachkey[AESKEYLEN]; + uchar aesmachsum; }; extern uchar nvcsum(void*, int); |