@@ -51,7 +51,6 @@ const {
51
51
52
52
const {
53
53
getArrayBufferOrView,
54
- getDefaultEncoding,
55
54
jobPromise,
56
55
toBuf,
57
56
kHandle,
@@ -97,10 +96,6 @@ function DiffieHellman(sizeOrKey, keyEncoding, generator, genEncoding) {
97
96
keyEncoding = false ;
98
97
}
99
98
100
- const encoding = getDefaultEncoding ( ) ;
101
- keyEncoding = keyEncoding || encoding ;
102
- genEncoding = genEncoding || encoding ;
103
-
104
99
if ( typeof sizeOrKey !== 'number' )
105
100
sizeOrKey = toBuf ( sizeOrKey , keyEncoding ) ;
106
101
@@ -148,7 +143,6 @@ DiffieHellmanGroup.prototype.generateKeys =
148
143
149
144
function dhGenerateKeys ( encoding ) {
150
145
const keys = this [ kHandle ] . generateKeys ( ) ;
151
- encoding = encoding || getDefaultEncoding ( ) ;
152
146
return encode ( keys , encoding ) ;
153
147
}
154
148
@@ -158,9 +152,6 @@ DiffieHellmanGroup.prototype.computeSecret =
158
152
dhComputeSecret ;
159
153
160
154
function dhComputeSecret ( key , inEnc , outEnc ) {
161
- const encoding = getDefaultEncoding ( ) ;
162
- inEnc = inEnc || encoding ;
163
- outEnc = outEnc || encoding ;
164
155
key = getArrayBufferOrView ( key , 'key' , inEnc ) ;
165
156
const ret = this [ kHandle ] . computeSecret ( key ) ;
166
157
if ( typeof ret === 'string' )
@@ -175,7 +166,6 @@ DiffieHellmanGroup.prototype.getPrime =
175
166
176
167
function dhGetPrime ( encoding ) {
177
168
const prime = this [ kHandle ] . getPrime ( ) ;
178
- encoding = encoding || getDefaultEncoding ( ) ;
179
169
return encode ( prime , encoding ) ;
180
170
}
181
171
@@ -186,7 +176,6 @@ DiffieHellmanGroup.prototype.getGenerator =
186
176
187
177
function dhGetGenerator ( encoding ) {
188
178
const generator = this [ kHandle ] . getGenerator ( ) ;
189
- encoding = encoding || getDefaultEncoding ( ) ;
190
179
return encode ( generator , encoding ) ;
191
180
}
192
181
@@ -197,7 +186,6 @@ DiffieHellmanGroup.prototype.getPublicKey =
197
186
198
187
function dhGetPublicKey ( encoding ) {
199
188
const key = this [ kHandle ] . getPublicKey ( ) ;
200
- encoding = encoding || getDefaultEncoding ( ) ;
201
189
return encode ( key , encoding ) ;
202
190
}
203
191
@@ -208,21 +196,18 @@ DiffieHellmanGroup.prototype.getPrivateKey =
208
196
209
197
function dhGetPrivateKey ( encoding ) {
210
198
const key = this [ kHandle ] . getPrivateKey ( ) ;
211
- encoding = encoding || getDefaultEncoding ( ) ;
212
199
return encode ( key , encoding ) ;
213
200
}
214
201
215
202
216
203
DiffieHellman . prototype . setPublicKey = function setPublicKey ( key , encoding ) {
217
- encoding = encoding || getDefaultEncoding ( ) ;
218
204
key = getArrayBufferOrView ( key , 'key' , encoding ) ;
219
205
this [ kHandle ] . setPublicKey ( key ) ;
220
206
return this ;
221
207
} ;
222
208
223
209
224
210
DiffieHellman . prototype . setPrivateKey = function setPrivateKey ( key , encoding ) {
225
- encoding = encoding || getDefaultEncoding ( ) ;
226
211
key = getArrayBufferOrView ( key , 'key' , encoding ) ;
227
212
this [ kHandle ] . setPrivateKey ( key ) ;
228
213
return this ;
@@ -251,15 +236,12 @@ ECDH.prototype.generateKeys = function generateKeys(encoding, format) {
251
236
ECDH . prototype . getPublicKey = function getPublicKey ( encoding , format ) {
252
237
const f = getFormat ( format ) ;
253
238
const key = this [ kHandle ] . getPublicKey ( f ) ;
254
- encoding = encoding || getDefaultEncoding ( ) ;
255
239
return encode ( key , encoding ) ;
256
240
} ;
257
241
258
242
ECDH . convertKey = function convertKey ( key , curve , inEnc , outEnc , format ) {
259
243
validateString ( curve , 'curve' ) ;
260
- const encoding = inEnc || getDefaultEncoding ( ) ;
261
- key = getArrayBufferOrView ( key , 'key' , encoding ) ;
262
- outEnc = outEnc || encoding ;
244
+ key = getArrayBufferOrView ( key , 'key' , inEnc ) ;
263
245
const f = getFormat ( format ) ;
264
246
const convertedKey = _ECDHConvertKey ( key , curve , f ) ;
265
247
return encode ( convertedKey , outEnc ) ;
0 commit comments