Commit 2454accb authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Backport SHA2 support for capi engine 



Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent 1e9446bf

engines/e_capi.c

+32 −0
Original line number Diff line number Diff line
@@ -114,6 +114,26 @@ 
#  define CERT_SYSTEM_STORE_CURRENT_USER                  0x00010000

# endif



# ifndef ALG_SID_SHA_256

#  define ALG_SID_SHA_256                 12

# endif

# ifndef ALG_SID_SHA_384

#  define ALG_SID_SHA_384                 13

# endif

# ifndef ALG_SID_SHA_512

#  define ALG_SID_SHA_512                 14

# endif



# ifndef CALG_SHA_256

#  define CALG_SHA_256            (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_256)

# endif

# ifndef CALG_SHA_384

#  define CALG_SHA_384            (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_384)

# endif

# ifndef CALG_SHA_512

#  define CALG_SHA_512            (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_512)

# endif



# include <openssl/engine.h>

# include <openssl/pem.h>

# include <openssl/x509v3.h>
@@ -800,6 +820,18 @@ int capi_rsa_sign(int dtype, const unsigned char *m, unsigned int m_len, 
    }

/* Convert the signature type to a CryptoAPI algorithm ID */

    switch (dtype) {

    case NID_sha256:

        alg = CALG_SHA_256;

        break;



    case NID_sha384:

        alg = CALG_SHA_384;

        break;



    case NID_sha512:

        alg = CALG_SHA_512;

        break;



    case NID_sha1:

        alg = CALG_SHA1;

        break;