Security-58286.260.20.tar.gz

[apple/security.git] / OSX / libsecurity_smime / lib / cmsutil.c

diff --git a/OSX/libsecurity_smime/lib/cmsutil.c b/OSX/libsecurity_smime/lib/cmsutil.c
index 73587d852ada556fde4d1115daed7fc1a2180847..c0f890547526e66c10e063d249964e263d0906f4 100644 (file)
--- a/OSX/libsecurity_smime/lib/cmsutil.c
+++ b/OSX/libsecurity_smime/lib/cmsutil.c
@@ -269,12 +269,18 @@ SecCmsUtilMakeSignatureAlgorithm(SECOidTag hashalg, SECOidTag encalg)
        }
       case SEC_OID_EC_PUBLIC_KEY:
        switch(hashalg) {
        }
       case SEC_OID_EC_PUBLIC_KEY:
        switch(hashalg) {

-         /* 
+         /*

           * Note this is only used when signing and verifying signed attributes,
           * In which case we really do want the combined ECDSA_WithSHA1 alg...
           */
          case SEC_OID_SHA1:
            return SEC_OID_ECDSA_WithSHA1;
           * Note this is only used when signing and verifying signed attributes,
           * In which case we really do want the combined ECDSA_WithSHA1 alg...
           */
          case SEC_OID_SHA1:
            return SEC_OID_ECDSA_WithSHA1;

+         case SEC_OID_SHA256:
+           return SEC_OID_ECDSA_WITH_SHA256;
+         case SEC_OID_SHA384:
+           return SEC_OID_ECDSA_WITH_SHA384;
+         case SEC_OID_SHA512:
+           return SEC_OID_ECDSA_WITH_SHA512;

          default:
            return SEC_OID_UNKNOWN;
        }
          default:
            return SEC_OID_UNKNOWN;
        }