diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/src/apps/apps.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/lib/libssl/src/apps/apps.c b/src/lib/libssl/src/apps/apps.c index 2035d51373..0536aa6134 100644 --- a/src/lib/libssl/src/apps/apps.c +++ b/src/lib/libssl/src/apps/apps.c | |||
| @@ -310,8 +310,8 @@ ui_read(UI * ui, UI_STRING * uis) | |||
| 310 | if (UI_get_input_flags(uis) & UI_INPUT_FLAG_DEFAULT_PWD && | 310 | if (UI_get_input_flags(uis) & UI_INPUT_FLAG_DEFAULT_PWD && |
| 311 | UI_get0_user_data(ui)) { | 311 | UI_get0_user_data(ui)) { |
| 312 | switch (UI_get_string_type(uis)) { | 312 | switch (UI_get_string_type(uis)) { |
| 313 | case UIT_PROMPT: | 313 | case UIT_PROMPT: |
| 314 | case UIT_VERIFY: | 314 | case UIT_VERIFY: |
| 315 | { | 315 | { |
| 316 | const char *password = | 316 | const char *password = |
| 317 | ((PW_CB_DATA *) UI_get0_user_data(ui))->password; | 317 | ((PW_CB_DATA *) UI_get0_user_data(ui))->password; |
| @@ -320,6 +320,7 @@ ui_read(UI * ui, UI_STRING * uis) | |||
| 320 | return 1; | 320 | return 1; |
| 321 | } | 321 | } |
| 322 | } | 322 | } |
| 323 | break; | ||
| 323 | default: | 324 | default: |
| 324 | break; | 325 | break; |
| 325 | } | 326 | } |
| @@ -333,14 +334,15 @@ ui_write(UI * ui, UI_STRING * uis) | |||
| 333 | if (UI_get_input_flags(uis) & UI_INPUT_FLAG_DEFAULT_PWD && | 334 | if (UI_get_input_flags(uis) & UI_INPUT_FLAG_DEFAULT_PWD && |
| 334 | UI_get0_user_data(ui)) { | 335 | UI_get0_user_data(ui)) { |
| 335 | switch (UI_get_string_type(uis)) { | 336 | switch (UI_get_string_type(uis)) { |
| 336 | case UIT_PROMPT: | 337 | case UIT_PROMPT: |
| 337 | case UIT_VERIFY: | 338 | case UIT_VERIFY: |
| 338 | { | 339 | { |
| 339 | const char *password = | 340 | const char *password = |
| 340 | ((PW_CB_DATA *) UI_get0_user_data(ui))->password; | 341 | ((PW_CB_DATA *) UI_get0_user_data(ui))->password; |
| 341 | if (password && password[0] != '\0') | 342 | if (password && password[0] != '\0') |
| 342 | return 1; | 343 | return 1; |
| 343 | } | 344 | } |
| 345 | break; | ||
| 344 | default: | 346 | default: |
| 345 | break; | 347 | break; |
| 346 | } | 348 | } |
| @@ -1370,16 +1372,16 @@ index_name_cmp(const OPENSSL_CSTRING * a, const OPENSSL_CSTRING * b) | |||
| 1370 | return (strcmp(a[DB_name], b[DB_name])); | 1372 | return (strcmp(a[DB_name], b[DB_name])); |
| 1371 | } | 1373 | } |
| 1372 | 1374 | ||
| 1373 | static | 1375 | static IMPLEMENT_LHASH_HASH_FN(index_serial, OPENSSL_CSTRING) |
| 1374 | IMPLEMENT_LHASH_HASH_FN(index_serial, OPENSSL_CSTRING) | 1376 | static IMPLEMENT_LHASH_COMP_FN(index_serial, OPENSSL_CSTRING) |
| 1375 | static IMPLEMENT_LHASH_COMP_FN(index_serial, OPENSSL_CSTRING) | 1377 | static IMPLEMENT_LHASH_HASH_FN(index_name, OPENSSL_CSTRING) |
| 1376 | static IMPLEMENT_LHASH_HASH_FN(index_name, OPENSSL_CSTRING) | 1378 | static IMPLEMENT_LHASH_COMP_FN(index_name, OPENSSL_CSTRING) |
| 1377 | static IMPLEMENT_LHASH_COMP_FN(index_name, OPENSSL_CSTRING) | 1379 | |
| 1378 | #undef BSIZE | 1380 | #undef BSIZE |
| 1379 | #define BSIZE 256 | 1381 | #define BSIZE 256 |
| 1380 | 1382 | ||
| 1381 | BIGNUM * | 1383 | BIGNUM * |
| 1382 | load_serial(char *serialfile, int create, ASN1_INTEGER ** retai) | 1384 | load_serial(char *serialfile, int create, ASN1_INTEGER ** retai) |
| 1383 | { | 1385 | { |
| 1384 | BIO *in = NULL; | 1386 | BIO *in = NULL; |
| 1385 | BIGNUM *ret = NULL; | 1387 | BIGNUM *ret = NULL; |
