Changeset View
Changeset View
Standalone View
Standalone View
src/crypto/signencryptfilescontroller.cpp
Show First 20 Lines • Show All 471 Lines • ▼ Show 20 Line(s) | 450 | { | |||
---|---|---|---|---|---|
472 | if (cms) { | 472 | if (cms) { | ||
473 | // There is no combined sign / encrypt in gpgsm so we create one sign task | 473 | // There is no combined sign / encrypt in gpgsm so we create one sign task | ||
474 | // and one encrypt task. Which leaves us with the age old dilemma, encrypt | 474 | // and one encrypt task. Which leaves us with the age old dilemma, encrypt | ||
475 | // then sign, or sign then encrypt. Ugly. | 475 | // then sign, or sign then encrypt. Ugly. | ||
476 | if (!cmsSigners.empty()) { | 476 | if (!cmsSigners.empty()) { | ||
477 | result.push_back(createSignEncryptTaskForFileInfo(fi, ascii, std::vector<Key>(), | 477 | result.push_back(createSignEncryptTaskForFileInfo(fi, ascii, std::vector<Key>(), | ||
478 | cmsSigners, outputNames[SignEncryptFilesWizard::SignatureCMS], | 478 | cmsSigners, outputNames[SignEncryptFilesWizard::SignatureCMS], | ||
479 | false)); | 479 | false)); | ||
480 | } else { | 480 | } | ||
481 | if (!cmsRecipients.empty()) { | ||||
481 | result.push_back(createSignEncryptTaskForFileInfo(fi, ascii, cmsRecipients, | 482 | result.push_back(createSignEncryptTaskForFileInfo(fi, ascii, cmsRecipients, | ||
482 | std::vector<Key>(), outputNames[SignEncryptFilesWizard::EncryptedCMS], | 483 | std::vector<Key>(), outputNames[SignEncryptFilesWizard::EncryptedCMS], | ||
483 | false)); | 484 | false)); | ||
484 | } | 485 | } | ||
485 | } | 486 | } | ||
486 | 487 | | |||
487 | return result; | 488 | return result; | ||
488 | } | 489 | } | ||
Show All 23 Lines | 505 | if (pgp || symmetric) { | |||
512 | } | 513 | } | ||
513 | result.push_back(createArchiveSignEncryptTaskForFiles(files, ad, true, ascii, pgpRecipients, pgpSigners, outputNames[outKind], symmetric)); | 514 | result.push_back(createArchiveSignEncryptTaskForFiles(files, ad, true, ascii, pgpRecipients, pgpSigners, outputNames[outKind], symmetric)); | ||
514 | } | 515 | } | ||
515 | if (cms) { | 516 | if (cms) { | ||
516 | if (!cmsSigners.empty()) { | 517 | if (!cmsSigners.empty()) { | ||
517 | result.push_back(createArchiveSignEncryptTaskForFiles(files, ad, false, ascii, | 518 | result.push_back(createArchiveSignEncryptTaskForFiles(files, ad, false, ascii, | ||
518 | std::vector<Key>(), cmsSigners, outputNames[SignEncryptFilesWizard::SignatureCMS], | 519 | std::vector<Key>(), cmsSigners, outputNames[SignEncryptFilesWizard::SignatureCMS], | ||
519 | false)); | 520 | false)); | ||
520 | } else { | 521 | } | ||
522 | if (!cmsRecipients.empty()) { | ||||
521 | result.push_back(createArchiveSignEncryptTaskForFiles(files, ad, false, ascii, | 523 | result.push_back(createArchiveSignEncryptTaskForFiles(files, ad, false, ascii, | ||
522 | cmsRecipients, std::vector<Key>(), outputNames[SignEncryptFilesWizard::EncryptedCMS], | 524 | cmsRecipients, std::vector<Key>(), outputNames[SignEncryptFilesWizard::EncryptedCMS], | ||
523 | false)); | 525 | false)); | ||
524 | } | 526 | } | ||
525 | } | 527 | } | ||
526 | 528 | | |||
527 | return result; | 529 | return result; | ||
528 | } | 530 | } | ||
▲ Show 20 Lines • Show All 206 Lines • Show Last 20 Lines |