diff options
| author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-09-20 18:02:04 +0200 |
|---|---|---|
| committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-09-20 18:02:04 +0200 |
| commit | 6e4913fc128b8b7d80ddc5efa903f0be62dca771 (patch) | |
| tree | 707bc7381272b67d7f48e990e976691542cfa941 /lib/cryptohi | |
| parent | 88078d268cdba2c8d9d3be89e07e3352548e81d0 (diff) | |
| download | nss-hg-6e4913fc128b8b7d80ddc5efa903f0be62dca771.tar.gz | |
Bug 957105 - Curve25519 TLS, r=mt
Diffstat (limited to 'lib/cryptohi')
| -rw-r--r-- | lib/cryptohi/seckey.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/cryptohi/seckey.c b/lib/cryptohi/seckey.c index c47c1023e..a64b5ca8c 100644 --- a/lib/cryptohi/seckey.c +++ b/lib/cryptohi/seckey.c @@ -1967,19 +1967,18 @@ seckey_SetPointEncoding(PLArenaPool *arena, SECKEYPublicKey *pubKey) tag = SECOID_FindOIDTag(&oid); switch (tag) { + case SEC_OID_CURVE25519: + pubKey->u.ec.encoding = ECPoint_XOnly; + break; case SEC_OID_SECG_EC_SECP256R1: /* fall through */ case SEC_OID_SECG_EC_SECP384R1: /* fall through */ case SEC_OID_SECG_EC_SECP521R1: - pubKey->u.ec.encoding = ECPoint_Uncompressed; - break; - case SEC_OID_CURVE25519: - pubKey->u.ec.encoding = ECPoint_XOnly; - break; + /* fall through */ default: - /* unsupported curve */ - return SECFailure; + /* unknown curve, default to uncompressed */ + pubKey->u.ec.encoding = ECPoint_Uncompressed; } return SECSuccess; } |