tchanges from plan 9. some clean-up. - plan9port - [fork] Plan 9 from user space
(HTM) git clone git://src.adamsgaard.dk/plan9port
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 1b1434ebcebd9411b0ad3815bc5eb9237a1a8b23
(DIR) parent 127d5444fbeb563f41ad27bd622214dae99b7507
(HTM) Author: rsc <devnull@localhost>
Date: Sun, 26 Dec 2004 23:59:10 +0000
changes from plan 9. some clean-up.
Diffstat:
M src/libsec/port/decodepem.c | 30 +++++++++++++++++++++++++++++-
M src/libsec/port/md5pickle.c | 6 ++++--
M src/libsec/port/readcert.c | 18 +++++++++++++++++-
M src/libsec/port/tlshand.c | 37 ++++++++++++++++++++++++-------
M src/libsec/port/x509.c | 20 ++++++++++++--------
5 files changed, 91 insertions(+), 20 deletions(-)
---
(DIR) diff --git a/src/libsec/port/decodepem.c b/src/libsec/port/decodepem.c
t@@ -6,7 +6,7 @@
#define STRLEN(s) (sizeof(s)-1)
uchar*
-decodepem(char *s, char *type, int *len)
+decodepem(char *s, char *type, int *len, char **news)
{
uchar *d;
char *t, *e, *tt;
t@@ -44,6 +44,8 @@ decodepem(char *s, char *type, int *len)
return nil;
}
+ if(news)
+ *news = tt+1;
n = ((tt - t) * 6 + 7) / 8;
d = malloc(n);
if(d == nil){
t@@ -59,3 +61,29 @@ decodepem(char *s, char *type, int *len)
*len = n;
return d;
}
+
+PEMChain*
+decodepemchain(char *s, char *type)
+{
+ PEMChain *first = nil, *last = nil, *chp;
+ uchar *d;
+ char *e;
+ int n;
+
+ e = strchr(s, '\0');
+ while (s < e) {
+ d = decodepem(s, type, &n, &s);
+ if(d == nil)
+ break;
+ chp = malloc(sizeof(PEMChain));
+ chp->next = nil;
+ chp->pem = d;
+ chp->pemlen = n;
+ if (first == nil)
+ first = chp;
+ else
+ last->next = chp;
+ last = chp;
+ }
+ return first;
+}
(DIR) diff --git a/src/libsec/port/md5pickle.c b/src/libsec/port/md5pickle.c
t@@ -7,11 +7,12 @@ md5pickle(MD5state *s)
char *p;
int m, n;
- m = 4*9+4*((s->blen+3)/3);
+ m = 17+4*9+4*((s->blen+3)/3);
p = malloc(m);
if(p == nil)
return p;
- n = sprint(p, "%8.8ux %8.8ux %8.8ux %8.8ux ",
+ n = sprint(p, "%16.16llux %8.8ux %8.8ux %8.8ux %8.8ux ",
+ s->len,
s->state[0], s->state[1], s->state[2],
s->state[3]);
enc64(p+n, m-n, s->buf, s->blen);
t@@ -26,6 +27,7 @@ md5unpickle(char *p)
s = malloc(sizeof(*s));
if(s == nil)
return nil;
+ s->len = strtoull(p, &p, 16);
s->state[0] = strtoul(p, &p, 16);
s->state[1] = strtoul(p, &p, 16);
s->state[2] = strtoul(p, &p, 16);
(DIR) diff --git a/src/libsec/port/readcert.c b/src/libsec/port/readcert.c
t@@ -40,7 +40,7 @@ readcert(char *filename, int *pcertlen)
werrstr("can't read %s", filename);
return nil;
}
- binary = decodepem(pem, "CERTIFICATE", pcertlen);
+ binary = decodepem(pem, "CERTIFICATE", pcertlen, nil);
free(pem);
if(binary == nil){
werrstr("can't parse %s", filename);
t@@ -49,3 +49,19 @@ readcert(char *filename, int *pcertlen)
return binary;
}
+
+PEMChain *
+readcertchain(char *filename)
+{
+ char *chfile;
+ PEMChain *chp;
+
+ chfile = readfile(filename);
+ if (chfile == nil) {
+ werrstr("can't read %s", filename);
+ return nil;
+ }
+ chp = decodepemchain(chfile, "CERTIFICATE");
+ return chp;
+}
+
(DIR) diff --git a/src/libsec/port/tlshand.c b/src/libsec/port/tlshand.c
t@@ -248,7 +248,7 @@ static uchar compressors[] = {
CompressionNull,
};
-static TlsConnection *tlsServer2(int ctl, int hand, uchar *cert, int ncert, int (*trace)(char*fmt, ...));
+static TlsConnection *tlsServer2(int ctl, int hand, uchar *cert, int ncert, int (*trace)(char*fmt, ...), PEMChain *chain);
static TlsConnection *tlsClient2(int ctl, int hand, uchar *csid, int ncsid, int (*trace)(char*fmt, ...));
static void msgClear(Msg *m);
t@@ -273,7 +273,7 @@ static TlsSec* tlsSecInitc(int cvers, uchar *crandom);
static int tlsSecSecretc(TlsSec *sec, uchar *sid, int nsid, uchar *srandom, uchar *cert, int ncert, int vers, uchar **epm, int *nepm, uchar *kd, int nkd);
static int tlsSecFinished(TlsSec *sec, MD5state md5, SHAstate sha1, uchar *fin, int nfin, int isclient);
static void tlsSecOk(TlsSec *sec);
-static void tlsSecKill(TlsSec *sec);
+/* static void tlsSecKill(TlsSec *sec); */
static void tlsSecClose(TlsSec *sec);
static void setMasterSecret(TlsSec *sec, Bytes *pm);
static void serverMasterSecret(TlsSec *sec, uchar *epm, int nepm);
t@@ -296,14 +296,14 @@ static void* erealloc(void*, int);
static void put32(uchar *p, u32int);
static void put24(uchar *p, int);
static void put16(uchar *p, int);
-static u32int get32(uchar *p);
+/* static u32int get32(uchar *p); */
static int get24(uchar *p);
static int get16(uchar *p);
static Bytes* newbytes(int len);
static Bytes* makebytes(uchar* buf, int len);
static void freebytes(Bytes* b);
static Ints* newints(int len);
-static Ints* makeints(int* buf, int len);
+/* static Ints* makeints(int* buf, int len); */
static void freeints(Ints* b);
//================= client/server ========================
t@@ -337,7 +337,7 @@ tlsServer(int fd, TLSconn *conn)
return -1;
}
fprint(ctl, "fd %d 0x%x", fd, ProtocolVersion);
- tls = tlsServer2(ctl, hand, conn->cert, conn->certlen, conn->trace);
+ tls = tlsServer2(ctl, hand, conn->cert, conn->certlen, conn->trace, conn->chain);
sprint(dname, "#a/tls/%s/data", buf);
data = open(dname, ORDWR);
close(fd);
t@@ -412,15 +412,27 @@ tlsClient(int fd, TLSconn *conn)
return data;
}
+static int
+countchain(PEMChain *p)
+{
+ int i = 0;
+
+ while (p) {
+ i++;
+ p = p->next;
+ }
+ return i;
+}
+
static TlsConnection *
-tlsServer2(int ctl, int hand, uchar *cert, int ncert, int (*trace)(char*fmt, ...))
+tlsServer2(int ctl, int hand, uchar *cert, int ncert, int (*trace)(char*fmt, ...), PEMChain *chp)
{
TlsConnection *c;
Msg m;
Bytes *csid;
uchar sid[SidSize], kd[MaxKeyData];
char *secrets;
- int cipher, compressor, nsid, rv;
+ int cipher, compressor, nsid, rv, numcerts, i;
if(trace)
trace("tlsServer2\n");
t@@ -498,9 +510,12 @@ tlsServer2(int ctl, int hand, uchar *cert, int ncert, int (*trace)(char*fmt, ...
msgClear(&m);
m.tag = HCertificate;
- m.u.certificate.ncert = 1;
+ numcerts = countchain(chp);
+ m.u.certificate.ncert = 1 + numcerts;
m.u.certificate.certs = emalloc(m.u.certificate.ncert * sizeof(Bytes));
m.u.certificate.certs[0] = makebytes(cert, ncert);
+ for (i = 0; i < numcerts && chp; i++, chp = chp->next)
+ m.u.certificate.certs[i+1] = makebytes(chp->pem, chp->pemlen);
if(!msgSend(c, &m, AQueue))
goto Err;
msgClear(&m);
t@@ -1824,6 +1839,7 @@ tlsSecOk(TlsSec *sec)
sec->ok = 1;
}
+/*
static void
tlsSecKill(TlsSec *sec)
{
t@@ -1832,6 +1848,7 @@ tlsSecKill(TlsSec *sec)
factotum_rsa_close(sec->rpc);
sec->ok = -1;
}
+*/
static void
tlsSecClose(TlsSec *sec)
t@@ -2205,11 +2222,13 @@ put16(uchar *p, int x)
p[1] = x;
}
+/*
static u32int
get32(uchar *p)
{
return (p[0]<<24)|(p[1]<<16)|(p[2]<<8)|p[3];
}
+*/
static int
get24(uchar *p)
t@@ -2272,6 +2291,7 @@ newints(int len)
return ans;
}
+/*
static Ints*
makeints(int* buf, int len)
{
t@@ -2282,6 +2302,7 @@ makeints(int* buf, int len)
memmove(ans->data, buf, len*sizeof(int));
return ans;
}
+*/
static void
freeints(Ints* b)
(DIR) diff --git a/src/libsec/port/x509.c b/src/libsec/port/x509.c
t@@ -134,8 +134,10 @@ static int is_oid(Elem* pe, Ints** poid);
static int is_string(Elem* pe, char** pstring);
static int is_time(Elem* pe, char** ptime);
static int decode(uchar* a, int alen, Elem* pelem);
+/*
static int decode_seq(uchar* a, int alen, Elist** pelist);
static int decode_value(uchar* a, int alen, int kind, int isconstr, Value* pval);
+*/
static int encode(Elem e, Bytes** pbytes);
static int oid_lookup(Ints* o, Ints** tab);
static void freevalfields(Value* v);
t@@ -206,7 +208,7 @@ decode(uchar* a, int alen, Elem* pelem)
/*
* Like decode, but continue decoding after first element
* of array ends.
- */
+ *
static int
decode_seq(uchar* a, int alen, Elist** pelist)
{
t@@ -214,6 +216,7 @@ decode_seq(uchar* a, int alen, Elist** pelist)
return seq_decode(&p, &a[alen], -1, 1, pelist);
}
+*/
/*
* Decode the whole array as a BER encoding of an ASN1 value,
t@@ -223,7 +226,7 @@ decode_seq(uchar* a, int alen, Elist** pelist)
* If there's an error, the return string will contain the error.
* Depending on the error, the returned value may or may not
* be nil.
- */
+ *
static int
decode_value(uchar* a, int alen, int kind, int isconstr, Value* pval)
{
t@@ -231,6 +234,7 @@ decode_value(uchar* a, int alen, int kind, int isconstr, Value* pval)
return value_decode(&p, &a[alen], alen, kind, isconstr, pval);
}
+*/
/*
* All of the following decoding routines take arguments:
t@@ -1585,12 +1589,12 @@ static Ints7 oid_md5WithRSAEncryption = {7, 1, 2, 840, 113549, 1, 1, 4 };
static Ints7 oid_sha1WithRSAEncryption ={7, 1, 2, 840, 113549, 1, 1, 5 };
static Ints7 oid_md5 ={6, 1, 2, 840, 113549, 2, 5, 0 };
static Ints *alg_oid_tab[NUMALGS+1] = {
- (Ints*)&oid_rsaEncryption,
- (Ints*)&oid_md2WithRSAEncryption,
- (Ints*)&oid_md4WithRSAEncryption,
- (Ints*)&oid_md5WithRSAEncryption,
- (Ints*)&oid_sha1WithRSAEncryption,
- (Ints*)&oid_md5,
+ (Ints*)(void*)&oid_rsaEncryption,
+ (Ints*)(void*)&oid_md2WithRSAEncryption,
+ (Ints*)(void*)&oid_md4WithRSAEncryption,
+ (Ints*)(void*)&oid_md5WithRSAEncryption,
+ (Ints*)(void*)&oid_sha1WithRSAEncryption,
+ (Ints*)(void*)&oid_md5,
nil
};
static DigestFun digestalg[NUMALGS+1] = { md5, md5, md5, md5, sha1, md5, 0 };