← Back to branch summary

~ubuntu-branches/ubuntu/trusty/enigmail/trusty-security

« back to all changes in this revision

Viewing changes to extensions/enigmail/src/nsEnigMimeVerify.cpp

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2011-11-16 21:30:26 UTC
  • mfrom: (0.12.7)
  • Revision ID: package-import@ubuntu.com-20111116213026-7i0cpxql4kyjcdg4
Tags: 2:1.3.3-0ubuntu1
* New upstream release v1.3.3
* Add patch to define constants in nsIEnigmail.idl as unsigned long, so
  that the new IDL parser doesn't fall over
  - add debian/patches/new_idl_parser_compat.patch
  - update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
extensions/enigmail/src/nsEnigMimeVerify.cpp
143
143
                       nsIURI* aURI,
144
144
                       nsIMsgWindow* msgWindow,
145
145
                       const nsACString& msgUriSpec,
146
 
                       PRBool pgpMime,
147
 
                       PRBool isSubPart)
 
146
                       EMBool pgpMime,
 
147
                       EMBool isSubPart)
148
148
{
149
149
  nsresult rv;
150
150
 
225
225
                       nsIChannel* aChannel,
226
226
                       nsIMsgWindow* msgWindow,
227
227
                       const nsACString& msgUriSpec,
228
 
                       PRBool pgpMime,
229
 
                       PRBool isSubPart)
 
228
                       EMBool pgpMime,
 
229
                       EMBool isSubPart)
230
230
{
231
231
  nsresult rv;
232
232
 
388
388
  if (NS_FAILED(rv)) return rv;
389
389
 
390
390
  PRUint32 uiFlags = nsIEnigmail::UI_PGP_MIME;
391
 
  PRBool verifyOnly = PR_TRUE;
392
 
  PRBool noOutput = PR_TRUE;
 
391
  EMBool verifyOnly = PR_TRUE;
 
392
  EMBool noOutput = PR_TRUE;
393
393
 
394
394
  rv = enigmailSvc->DecryptMessageEnd(uiFlags,
395
395
                                      outputLen,
584
584
  if (NS_FAILED(rv)) return rv;
585
585
 
586
586
  nsString errorMsg;
587
 
  PRBool verifyOnly = PR_TRUE;
588
 
  PRBool noOutput = PR_TRUE;
589
 
  PRBool noProxy = PR_TRUE;
 
587
  EMBool verifyOnly = PR_TRUE;
 
588
  EMBool noOutput = PR_TRUE;
590
589
  PRUint32 statusFlags;
591
590
  rv = enigmailSvc->DecryptMessageStart(nsnull,
592
591
                                        prompter,
593
592
                                        verifyOnly,
594
593
                                        noOutput,
595
594
                                        mOutBuffer,
596
 
                                        noProxy,
597
595
                                        &statusFlags,
598
596
                                        getter_Copies(errorMsg),
599
597
                                        getter_AddRefs(mPipeTrans) );