moony/blinksocks
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

chore(config.js): default protocol can be "none"

Browse Source
This commit is contained in:
Micooz 2017-03-28 14:07:55 +08:00
parent b0d4660c9a
commit 618f93a2e4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/bootstrap.js vendored
View File

@ -18,13 +18,13 @@ const options = [
['--frame-params [crypto-params]', 'parameters for frame preset, default: \'\'', ''],
['--crypto [crypto]', 'a preset used in crypto middleware, default: \'\'', ''],
['--crypto-params [crypto-params]', 'parameters for crypto, default: \'aes-256-cfb\'', 'aes-256-cfb'],
['--protocol [protocol]', 'a preset used in protocol middleware, default: \'aead\'', 'aead'],
['--protocol-params [protocol-params]', 'parameters for protocol, default: \'aes-256-cbc,sha256\'', 'aes-256-cbc,sha256'],
['--protocol [protocol]', 'a preset used in protocol middleware, default: \'ss-aead\'', 'ss-aead'],
['--protocol-params [protocol-params]', 'parameters for protocol, default: \'aes-256-gcm,ss-subkey\'', 'aes-256-gcm,ss-subkey'],
['--obfs [obfs]', 'a preset used in obfs middleware, default: \'\'', ''],
['--obfs-params [obfs-params]', 'parameters for obfs, default: \'\'', ''],
['--log-level [log-level]', 'log level, default: \'silly\'', 'silly'],
['-q, --quiet', 'force log level to \'error\''],
['--profile', 'collect performance statistics, store at blinksocks.profile.log when exit']
['--profile', 'generate performance statistics, store at blinksocks.profile.log once exit']
];
const examples = `

2
lib/core/config.js
View File

File diff suppressed because one or more lines are too long

2
src/core/config.js
View File

@ -136,7 +136,7 @@ export class Config {
throw Error('\'protocol_params\' must be a string');
}
this.protocol = json.protocol || 'aead';
this.protocol = json.protocol || 'none';
this.protocol_params = json.protocol_params;
// obfs & obfs_params