← Back to branch summary

~ubuntu-branches/ubuntu/maverick/openssl/maverick

« back to all changes in this revision

Viewing changes to engines/e_chil.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2010-03-25 20:30:52 UTC
  • mto: (11.1.13 sid)
  • mto: This revision was merged to the branch mainline in revision 44.
  • Revision ID: james.westby@ubuntu.com-20100325203052-swtzp9v2wnp1wlbx
Tags: upstream-0.9.8n
Import upstream version 0.9.8n

Show diffs side-by-side

added added

removed removed

Lines of Context:
engines/e_chil.c
1204
1204
        pem_password_cb *callback = NULL;
1205
1205
        void *callback_data = NULL;
1206
1206
        UI_METHOD *ui_method = NULL;
 
1207
        /* Despite what the documentation says prompt_info can be
 
1208
         * an empty string.
 
1209
         */
 
1210
        if (prompt_info && !*prompt_info)
 
1211
                prompt_info = NULL;
1207
1212
 
1208
1213
        if (cactx)
1209
1214
                {
1305
1310
                {
1306
1311
                char answer;
1307
1312
                char buf[BUFSIZ];
1308
 
 
1309
 
                if (wrong_info)
 
1313
                /* Despite what the documentation says wrong_info can be
 
1314
                 * an empty string.
 
1315
                 */
 
1316
                if (wrong_info && *wrong_info)
1310
1317
                        BIO_snprintf(buf, sizeof(buf)-1,
1311
1318
                                "Current card: \"%s\"\n", wrong_info);
1312
1319
                ok = UI_dup_info_string(ui, buf);