From 94c4ba7b93310ade282f214e8e0c289b93620858 Mon Sep 17 00:00:00 2001 From: jakcron Date: Tue, 1 Dec 2015 13:04:50 +0800 Subject: [PATCH] [makerom] Altered encryption preferences for different keychains. --- makerom/user_settings.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/makerom/user_settings.c b/makerom/user_settings.c index 8eada633..2d2753ca 100644 --- a/makerom/user_settings.c +++ b/makerom/user_settings.c @@ -175,16 +175,24 @@ int SetArgument(int argc, int i, char *argv[], user_settings *set) PrintArgReqParam(argv[i], 1); return USR_ARG_REQ_PARAM; } - if (strcasecmp(argv[i + 1], "test") == 0 || strcasecmp(argv[i + 1], "t") == 0) + if (strcasecmp(argv[i + 1], "test") == 0 || strcasecmp(argv[i + 1], "t") == 0) { set->common.keys.keyset = pki_TEST; - //else if(strcasecmp(argv[i+1],"beta") == 0 || strcasecmp(argv[i+1],"b") == 0) + set->common.rsfSet.Option.EnableCrypt = false; // prefer unencrypted output + } + //else if(strcasecmp(argv[i+1],"beta") == 0 || strcasecmp(argv[i+1],"b") == 0) { // set->common.keys.keyset = pki_BETA; - else if (strcasecmp(argv[i + 1], "debug") == 0 || strcasecmp(argv[i + 1], "development") == 0 || strcasecmp(argv[i + 1], "d") == 0) + //} + else if (strcasecmp(argv[i + 1], "debug") == 0 || strcasecmp(argv[i + 1], "development") == 0 || strcasecmp(argv[i + 1], "d") == 0) { set->common.keys.keyset = pki_DEVELOPMENT; - else if (strcasecmp(argv[i + 1], "retail") == 0 || strcasecmp(argv[i + 1], "production") == 0 || strcasecmp(argv[i + 1], "p") == 0) + set->common.rsfSet.Option.EnableCrypt = true; // prefer encrypted output + } + else if (strcasecmp(argv[i + 1], "retail") == 0 || strcasecmp(argv[i + 1], "production") == 0 || strcasecmp(argv[i + 1], "p") == 0) { set->common.keys.keyset = pki_PRODUCTION; - //else if(strcasecmp(argv[i+1],"custom") == 0 || strcasecmp(argv[i+1],"c") == 0) + set->common.rsfSet.Option.EnableCrypt = true; // prefer encrypted output + } + //else if(strcasecmp(argv[i+1],"custom") == 0 || strcasecmp(argv[i+1],"c") == 0) { // set->common.keys.keyset = pki_CUSTOM; + //} else { fprintf(stderr, "[SETTING ERROR] Unrecognised target '%s'\n", argv[i + 1]); return USR_BAD_ARG;