diff options
Diffstat (limited to 'utils/imxtools/sbtools/misc.c')
-rw-r--r-- | utils/imxtools/sbtools/misc.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/utils/imxtools/sbtools/misc.c b/utils/imxtools/sbtools/misc.c index b36ab7902f..b3ca23cf77 100644 --- a/utils/imxtools/sbtools/misc.c +++ b/utils/imxtools/sbtools/misc.c | |||
@@ -118,7 +118,6 @@ bool parse_key(char **pstr, struct crypto_key_t *key) | |||
118 | while(isspace(*str)) | 118 | while(isspace(*str)) |
119 | str++; | 119 | str++; |
120 | /* CRYPTO_KEY: 32 hex characters | 120 | /* CRYPTO_KEY: 32 hex characters |
121 | * CRYPTO_USBOTP: usbotp(vid:pid) where vid and pid are hex numbers | ||
122 | * CRYPTO_XOR_KEY: 256 hex characters */ | 121 | * CRYPTO_XOR_KEY: 256 hex characters */ |
123 | if(isxdigit(str[0]) && strlen(str) >= 256 && isxdigit(str[32])) | 122 | if(isxdigit(str[0]) && strlen(str) >= 256 && isxdigit(str[32])) |
124 | { | 123 | { |
@@ -151,30 +150,7 @@ bool parse_key(char **pstr, struct crypto_key_t *key) | |||
151 | return true; | 150 | return true; |
152 | } | 151 | } |
153 | else | 152 | else |
154 | { | 153 | return false; |
155 | const char *prefix = "usbotp("; | ||
156 | if(strlen(str) < strlen(prefix)) | ||
157 | return false; | ||
158 | if(strncmp(str, prefix, strlen(prefix)) != 0) | ||
159 | return false; | ||
160 | str += strlen(prefix); | ||
161 | /* vid */ | ||
162 | long vid = strtol(str, &str, 16); | ||
163 | if(vid < 0 || vid > 0xffff) | ||
164 | return false; | ||
165 | if(*str++ != ':') | ||
166 | return false; | ||
167 | /* pid */ | ||
168 | long pid = strtol(str, &str, 16); | ||
169 | if(pid < 0 || pid > 0xffff) | ||
170 | return false; | ||
171 | if(*str++ != ')') | ||
172 | return false; | ||
173 | *pstr = str; | ||
174 | key->method = CRYPTO_USBOTP; | ||
175 | key->u.vid_pid = vid << 16 | pid; | ||
176 | return true; | ||
177 | } | ||
178 | } | 154 | } |
179 | 155 | ||
180 | void add_keys(key_array_t ka, int kac) | 156 | void add_keys(key_array_t ka, int kac) |
@@ -278,9 +254,6 @@ void print_key(void *user, misc_printf_t printf, struct crypto_key_t *key, bool | |||
278 | case CRYPTO_KEY: | 254 | case CRYPTO_KEY: |
279 | print_hex(user, printf, key->u.key, 16, false); | 255 | print_hex(user, printf, key->u.key, 16, false); |
280 | break; | 256 | break; |
281 | case CRYPTO_USBOTP: | ||
282 | printf(user, "USB-OTP(%04x:%04x)", key->u.vid_pid >> 16, key->u.vid_pid & 0xffff); | ||
283 | break; | ||
284 | case CRYPTO_NONE: | 257 | case CRYPTO_NONE: |
285 | printf(user, "none"); | 258 | printf(user, "none"); |
286 | break; | 259 | break; |