aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2016-05-25 23:56:29 -0400
committerRob Austein <sra@hactrn.net>2016-05-25 23:56:29 -0400
commit5352d1bd1a5411064e8ac511240da2c8ed68a8c6 (patch)
tree3cefb208b28dcc14b471e8136113e325bd58a2b8
parent8e6b461094305f47a1f0145eed636ca95cb5c8e5 (diff)
Doh, helps if one actually **uses** the argument one just parsed.
-rw-r--r--last_gasp_pin_internal.h4
-rwxr-xr-xutils/last_gasp_default_pin2
2 files changed, 3 insertions, 3 deletions
diff --git a/last_gasp_pin_internal.h b/last_gasp_pin_internal.h
index 62dc1e5..96dc879 100644
--- a/last_gasp_pin_internal.h
+++ b/last_gasp_pin_internal.h
@@ -4,6 +4,6 @@
static const hal_ks_pin_t hal_last_gasp_pin = {
100000,
- {0xb0, 0x1a, 0xfb, 0xa8, 0xe9, 0x03, 0x99, 0xd5, 0xf6, 0xff, 0x33, 0x06, 0x7b, 0x64, 0xf2, 0x01, 0x0a, 0x13, 0x21, 0x9a, 0xf9, 0xe3, 0xfd, 0x26, 0x49, 0xe7, 0xbb, 0xca, 0xc0, 0xf0, 0x2e, 0x7d},
- {0xc1, 0x87, 0x1d, 0xf2, 0x4c, 0xf4, 0xd9, 0xe7, 0x68, 0xfa, 0x62, 0xec, 0xac, 0x2d, 0xb7, 0x10}
+ {0xb8, 0x47, 0xcb, 0x83, 0xdd, 0x93, 0xf7, 0xd7, 0x53, 0x3f, 0xcb, 0xae, 0xc2, 0x19, 0xcd, 0xb9, 0x4e, 0x9d, 0x4e, 0x71, 0x30, 0xcd, 0x01, 0x05, 0x87, 0x6d, 0xa7, 0x03, 0x8d, 0x46, 0x36, 0xf1, 0xcf, 0x55, 0x1f, 0x36, 0x22, 0x9d, 0xc3, 0x18, 0xcd, 0x43, 0x49, 0x14, 0x0b, 0x79, 0x85, 0xf9, 0xd0, 0xa5, 0xb0, 0x9f, 0x43, 0x95, 0xf8, 0xae, 0x01, 0xa0, 0x82, 0xaf, 0xc6, 0xf2, 0x8f, 0xf4},
+ {0x37, 0x6e, 0x15, 0x14, 0x5a, 0xd4, 0x35, 0xaf, 0x1c, 0x81, 0xc2, 0x80, 0x97, 0x18, 0x8d, 0x81}
};
diff --git a/utils/last_gasp_default_pin b/utils/last_gasp_default_pin
index c2ca965..70379ad 100755
--- a/utils/last_gasp_default_pin
+++ b/utils/last_gasp_default_pin
@@ -72,7 +72,7 @@ salt = urandom(16)
pin = PBKDF2(password = args.pin,
salt = salt,
- dkLen = 32,
+ dkLen = args.derived_key_length,
count = args.iterations,
prf = HMAC_SHA256)
76' href='#n176'>176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279