diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2016-02-01 21:34:49 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2016-02-01 21:34:49 +0100 |
| commit | a291bbdeddfd41a2f0907ecbd7b819f0eedffdaf (patch) | |
| tree | c5dd22efd770099846596d546dd36ba4b2d7ffc6 /sys/src/cmd/auth | |
| parent | 0bfac109a491e61d7cd585060b88e1251da1e928 (diff) | |
libsec: ecdsa client support for tlshand, cleanups
Diffstat (limited to 'sys/src/cmd/auth')
| -rw-r--r-- | sys/src/cmd/auth/factotum/ecdsa.c | 12 | ||||
| -rw-r--r-- | sys/src/cmd/auth/rsa2csr.c | 2 | ||||
| -rw-r--r-- | sys/src/cmd/auth/rsa2x509.c | 2 |
3 files changed, 5 insertions, 11 deletions
diff --git a/sys/src/cmd/auth/factotum/ecdsa.c b/sys/src/cmd/auth/factotum/ecdsa.c index 31cc0853d..1c48c1a1b 100644 --- a/sys/src/cmd/auth/factotum/ecdsa.c +++ b/sys/src/cmd/auth/factotum/ecdsa.c @@ -42,7 +42,7 @@ decryptkey(Fsstate *fss, char *key, char *password) st->p.d = betomp(keyenc + 1, 32, nil); st->p.x = mpnew(0); st->p.y = mpnew(0); - ecmul(&dom, dom.G, st->p.d, &st->p); + ecmul(&dom, &dom.G, st->p.d, &st->p); return RpcOk; } @@ -56,14 +56,8 @@ ecdsainit(Proto *, Fsstate *fss) char *key, *password; Attr *attr; - if(dom.p == nil){ - dom.p = strtomp("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F", nil, 16, nil); - dom.a = uitomp(0, nil); - dom.b = uitomp(7, nil); - dom.n = strtomp("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141", nil, 16, nil); - dom.h = uitomp(1, nil); - dom.G = strtoec(&dom, "0279BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798", nil, nil); - } + if(dom.p == nil) + ecdominit(&dom, secp256k1); fss->ps = nil; if((iscli = isclient(_strfindattr(fss->attr, "role"))) < 0) return failure(fss, nil); diff --git a/sys/src/cmd/auth/rsa2csr.c b/sys/src/cmd/auth/rsa2csr.c index ebf3ab8b8..e4107a2d7 100644 --- a/sys/src/cmd/auth/rsa2csr.c +++ b/sys/src/cmd/auth/rsa2csr.c @@ -34,7 +34,7 @@ main(int argc, char **argv) if((key = getkey(argc-1, argv+1, 1, nil)) == nil) sysfatal("%r"); - cert = X509req(key, argv[0], &len); + cert = X509rsareq(key, argv[0], &len); if(cert == nil) sysfatal("X509req: %r"); diff --git a/sys/src/cmd/auth/rsa2x509.c b/sys/src/cmd/auth/rsa2x509.c index 476e09b46..3e07bb88f 100644 --- a/sys/src/cmd/auth/rsa2x509.c +++ b/sys/src/cmd/auth/rsa2x509.c @@ -41,7 +41,7 @@ main(int argc, char **argv) if((key = getkey(argc-1, argv+1, 1, nil)) == nil) sysfatal("%r"); - cert = X509gen(key, argv[0], valid, &len); + cert = X509rsagen(key, argv[0], valid, &len); if(cert == nil) sysfatal("X509gen: %r"); |