Changeset 51856 in vbox for trunk/include

Timestamp:

Jul 3, 2014 6:39:21 PM (10 years ago)

Author:

vboxsync

Message:

Added the odd sha-2 algorithms to RTCrDigest and extended the testcases to cover them. Added VBOX_WITH_ALT_HASH_CODE for avoiding the OpenSSL code even for VBoxRT.dll/so/dylib.

Location:

trunk/include/iprt

Files:

• crypto/digest.h (modified) (2 diffs)
• crypto/x509.h (modified) (2 diffs)
• mangling.h (modified) (1 diff)
• types.h (modified) (1 diff)

trunk/include/iprt/crypto/digest.h

@@ -146 +146 @@
  *                          algortihms are available if not specified.
  */
-PCRTCRDIGESTDESC RTCrDigestFindByObjIdString(const char *pszObjId, void *ppvOpaque);
+RTDECL(PCRTCRDIGESTDESC) RTCrDigestFindByObjIdString(const char *pszObjId, void *ppvOpaque);
 
 /**
@@ -160 +160 @@
  *                          algortihms are available if not specified.
  */
-PCRTCRDIGESTDESC RTCrDigestFindByObjId(PCRTASN1OBJID pObjId, void *ppvOpaque);
+RTDECL(PCRTCRDIGESTDESC) RTCrDigestFindByObjId(PCRTASN1OBJID pObjId, void *ppvOpaque);
 
+RTDECL(PCRTCRDIGESTDESC) RTCrDigestFindByType(RTDIGESTTYPE enmDigestType);
 RTDECL(int) RTCrDigestCreateByObjIdString(PRTCRDIGEST phDigest, const char *pszObjId);
 RTDECL(int) RTCrDigestCreateByObjId(PRTCRDIGEST phDigest, PCRTASN1OBJID pObjId);
-
+RTDECL(int) RTCrDigestCreateByType(PRTCRDIGEST phDigest, RTDIGESTTYPE enmDigestType);
 
 

trunk/include/iprt/crypto/x509.h

@@ -93 +93 @@
                                                                         PCRTCRX509ALGORITHMIDENTIFIER pEncryptedDigest);
 
-/** @name Digest Algorithm OIDs.
+/** @name Typical Digest Algorithm OIDs.
  * @{ */
 #define RTCRX509ALGORITHMIDENTIFIERID_MD2               "1.2.840.113549.2.2"
@@ -103 +103 @@
 #define RTCRX509ALGORITHMIDENTIFIERID_SHA512            "2.16.840.1.101.3.4.2.3"
 #define RTCRX509ALGORITHMIDENTIFIERID_SHA224            "2.16.840.1.101.3.4.2.4"
+#define RTCRX509ALGORITHMIDENTIFIERID_SHA512T224        "2.16.840.1.101.3.4.2.5"
+#define RTCRX509ALGORITHMIDENTIFIERID_SHA512T256        "2.16.840.1.101.3.4.2.6"
 #define RTCRX509ALGORITHMIDENTIFIERID_WHIRLPOOL         "1.0.10118.3.0.55"
 /** @} */

trunk/include/iprt/mangling.h

@@ -2320 +2320 @@
 # define RTCrDigestCreateByObjId                        RT_MANGLER(RTCrDigestCreateByObjId)
 # define RTCrDigestCreateByObjIdString                  RT_MANGLER(RTCrDigestCreateByObjIdString)
+# define RTCrDigestCreateByType                         RT_MANGLER(RTCrDigestCreateByType)
+# define RTCrDigestFindByObjId                          RT_MANGLER(RTCrDigestFindByObjId)
+# define RTCrDigestFindByObjIdString                    RT_MANGLER(RTCrDigestFindByObjIdString)
+# define RTCrDigestFindByType                           RT_MANGLER(RTCrDigestFindByType)
 # define RTCrRsaDigestInfo_DecodeAsn1                   RT_MANGLER(RTCrRsaDigestInfo_DecodeAsn1)
 # define RTCrRsaOtherPrimeInfo_DecodeAsn1               RT_MANGLER(RTCrRsaOtherPrimeInfo_DecodeAsn1)

trunk/include/iprt/types.h

@@ -2348 +2348 @@
     /** SHA-512 checksum. */
     RTDIGESTTYPE_SHA512,
+    /** SHA-512/224 checksum. */
+    RTDIGESTTYPE_SHA512T224,
+    /** SHA-512/256 checksum. */
+    RTDIGESTTYPE_SHA512T256,
     /** End of valid types. */
     RTDIGESTTYPE_END,