Security-59306.61.1.tar.gz

[apple/security.git] / OSX / libsecurity_cms / lib / CMSEncoder.cpp

diff --git a/OSX/libsecurity_cms/lib/CMSEncoder.cpp b/OSX/libsecurity_cms/lib/CMSEncoder.cpp
index de3b2c1ef43975381be7a239e46bf42939b1409f..27d6810dacc5626d29b60c7363f84c8b2ba46665 100644 (file)
--- a/OSX/libsecurity_cms/lib/CMSEncoder.cpp
+++ b/OSX/libsecurity_cms/lib/CMSEncoder.cpp
@@ -25,8 +25,8 @@
  * CMSEncoder.cpp - encode, sign, and/or encrypt CMS messages. 
  */
  
  * CMSEncoder.cpp - encode, sign, and/or encrypt CMS messages. 
  */
  

-#include "CMSEncoder.h"
-#include "CMSPrivate.h"
+#include <Security/CMSEncoder.h>
+#include <Security/CMSPrivate.h>

 #include "CMSUtils.h"
 #include <Security/SecBase.h>
 #include <Security/SecCmsEncoder.h>
 #include "CMSUtils.h"
 #include <Security/SecBase.h>
 #include <Security/SecCmsEncoder.h>


@@ -468,6 +468,9 @@ static OSStatus cmsSetupForSignedData(
                case kCMSCertificateChainWithRoot:
                        chainMode = SecCmsCMCertChainWithRoot;
                        break;
                case kCMSCertificateChainWithRoot:
                        chainMode = SecCmsCMCertChainWithRoot;
                        break;

+               case kCMSCertificateChainWithRootOrFail:
+                       chainMode = SecCmsCMCertChainWithRootOrFail;
+                       break;

                default:
                        break;
        }
                default:
                        break;
        }


@@ -1101,6 +1104,7 @@ OSStatus CMSEncoderSetCertificateChainMode(
                case kCMSCertificateSignerOnly:
                case kCMSCertificateChain:
                case kCMSCertificateChainWithRoot:
                case kCMSCertificateSignerOnly:
                case kCMSCertificateChain:
                case kCMSCertificateChainWithRoot:

+               case kCMSCertificateChainWithRootOrFail:

                        break;
                default:
                        return errSecParam;
                        break;
                default:
                        return errSecParam;