From f4aa2c2c93a831ef12864333a5a1c8cbc0f672d3 Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Wed, 27 Jan 2016 14:38:07 -0800 Subject: [PATCH] crypto: remove POINT_CONVERSION_HYBRID from documentation. Compressed points are already rare and, as far as I know, nobody has used the 'hybrid' format anywhere, ever. It's prohibited in X.509 certificates too[1]. This change removes mentions of it from the documentation in the interests of trying to pare-down the complexity of cryptography. [1] https://tools.ietf.org/html/rfc5480#section-2.2 PR-URL: https://github.com/nodejs/node/pull/4956 Reviewed-By: Ben Noordhuis Reviewed-By: Fedor Indutny Reviewed-By: Shigeki Ohtsu --- doc/api/crypto.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/api/crypto.md b/doc/api/crypto.md index 1d4b451be0d682..7a85f20a81bd62 100644 --- a/doc/api/crypto.md +++ b/doc/api/crypto.md @@ -472,9 +472,9 @@ Generates private and public EC Diffie-Hellman key values, and returns the public key in the specified `format` and `encoding`. This key should be transferred to the other party. -The `format` arguments specifies point encoding and can be `'compressed'`, -`'uncompressed'`, or `'hybrid'`. If `format` is not specified, the point will -be returned in `'uncompressed'` format. +The `format` argument specifies point encoding and can be `'compressed'` or +`'uncompressed'`. If `format` is not specified, the point will be returned in +`'uncompressed'` format. The `encoding` argument can be `'latin1'`, `'hex'`, or `'base64'`. If `encoding` is provided a string is returned; otherwise a [`Buffer`][] @@ -491,9 +491,9 @@ a string is returned; otherwise a [`Buffer`][] is returned. Returns the EC Diffie-Hellman public key in the specified `encoding` and `format`. -The `format` argument specifies point encoding and can be `'compressed'`, -`'uncompressed'`, or `'hybrid'`. If `format` is not specified the point will be -returned in `'uncompressed'` format. +The `format` argument specifies point encoding and can be `'compressed'` or +`'uncompressed'`. If `format` is not specified the point will be returned in +`'uncompressed'` format. The `encoding` argument can be `'latin1'`, `'hex'`, or `'base64'`. If `encoding` is specified, a string is returned; otherwise a [`Buffer`][] is