crypto: simplify diffiehellman getFormat function

danbev · MylesBorins · commit 391d2f830a3b · 2018-05-04T11:51:12.000-04:00
This commit aims to simplify the getFormat function in diffiehellman.js. PR-URL: #20246 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/lib/internal/crypto/diffiehellman.js b/lib/internal/crypto/diffiehellman.js
@@ -219,21 +219,15 @@ function encode(buffer, encoding) {
 }
 
 function getFormat(format) {
- let f;
 if (format) {
 if (format === 'compressed')
- f = POINT_CONVERSION_COMPRESSED;
- else if (format === 'hybrid')
- f = POINT_CONVERSION_HYBRID;
- // Default
- else if (format === 'uncompressed')
- f = POINT_CONVERSION_UNCOMPRESSED;
- else
+ return POINT_CONVERSION_COMPRESSED;
+ if (format === 'hybrid')
+ return POINT_CONVERSION_HYBRID;
+ if (format !== 'uncompressed')
 throw new ERR_CRYPTO_ECDH_INVALID_FORMAT(format);
- } else {
- f = POINT_CONVERSION_UNCOMPRESSED;
 }
- return f;
+ return POINT_CONVERSION_UNCOMPRESSED;
 }
 
 module.exports = {

-Original file line number
+Diff line change
+}
 functiongetFormat(format){
 -letf;
 if(format){
 if(format==='compressed')
 -f=POINT_CONVERSION_COMPRESSED;
 -elseif(format==='hybrid')
 -f=POINT_CONVERSION_HYBRID;
 -// Default
 -elseif(format==='uncompressed')
 -f=POINT_CONVERSION_UNCOMPRESSED;
 -else
 +returnPOINT_CONVERSION_COMPRESSED;
 +if(format==='hybrid')
 +returnPOINT_CONVERSION_HYBRID;
 +if(format!=='uncompressed')
 thrownewERR_CRYPTO_ECDH_INVALID_FORMAT(format);
 -}else{
 -f=POINT_CONVERSION_UNCOMPRESSED;
+}
 -returnf;
 +returnPOINT_CONVERSION_UNCOMPRESSED;
+}
 module.exports={