Changeset 100490 in vbox

Timestamp:

Jul 10, 2023 10:04:25 PM (22 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

158261

Message:

Forward ported r158258 from 6.1: Added RTAsn1DynType_SetToObjId for use in constructing a RTCRX509SUBJECTPUBLICKEYINFO structure for OpenSSL. bugref:10479 ticketf:21621

Location:

trunk

Files:

: 5 edited

. (modified) (1 prop)
include/iprt/asn1.h (modified) (1 diff)
include/iprt/mangling.h (modified) (1 diff)
src/VBox (modified) (1 prop)
src/VBox/Runtime/common/asn1/asn1-ut-dyntype.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk

Property svn:mergeinfo

old	new
10	10	/branches/VBox-5.2:119536,120083,120099,120213,120221,120239,123597-123598,123600-123601,123755,124260,124263,124271,124273,124277-124279,124284-124286,124288-124290,125768,125779-125780,125812
11	11	/branches/VBox-6.0:130474-130475,130477,130479,131352
12		/branches/VBox-6.1:139660,139797,141521,141567-141568,141588-141590,141592-141595,141652,141920,142071,158257
	12	/branches/VBox-6.1:139660,139797,141521,141567-141568,141588-141590,141592-141595,141652,141920,142071,158257-158258
13	13	/branches/VBox-7.0:156229,156768
14	14	/branches/aeichner/vbox-chromium-cleanup:129816,129818-129851,129853-129861,129871-129872,129876,129880,129882,130013-130015,130036,130094-130095

trunk/include/iprt/asn1.h

r100416	r100490
1523	1523	RTASN1TYPE_STANDARD_PROTOTYPES(RTASN1DYNTYPE, RTDECL, RTAsn1DynType, u.Core);
1524	1524	RTDECL(int) RTAsn1DynType_SetToNull(PRTASN1DYNTYPE pThis);
	1525	RTDECL(int) RTAsn1DynType_SetToObjId(PRTASN1DYNTYPE pThis, PCRTASN1OBJID pSrc, PCRTASN1ALLOCATORVTABLE pAllocator);
1525	1526
1526	1527

trunk/include/iprt/mangling.h

r100442	r100490
3215	3215	# define RTAsn1SetOfCores_DecodeAsn1 RT_MANGLER(RTAsn1SetOfCores_DecodeAsn1)
3216	3216	# define RTAsn1DynType_SetToNull RT_MANGLER(RTAsn1DynType_SetToNull)
	3217	# define RTAsn1DynType_SetToObjId RT_MANGLER(RTAsn1DynType_SetToObjId)
3217	3218	# define RTAsn1DynType_CheckSanity RT_MANGLER(RTAsn1DynType_CheckSanity)
3218	3219	# define RTAsn1DynType_Clone RT_MANGLER(RTAsn1DynType_Clone)

trunk/src/VBox

Property svn:mergeinfo

old	new
10	10	/branches/VBox-5.2/src/VBox:119536,120083,120099,120213,120221,120239,123597-123598,123600-123601,123755,124263,124273,124277-124279,124284-124286,124288-124290,125768,125779-125780,125812,127158-127159,127162-127167,127180
11	11	/branches/VBox-6.0/src/VBox:130474-130475,130477,130479,131352
12		/branches/VBox-6.1/src/VBox:141521,141567-141568,141588-141590,141592-141595,141652,141920,158257
	12	/branches/VBox-6.1/src/VBox:141521,141567-141568,141588-141590,141592-141595,141652,141920,158257-158258
13	13	/branches/VBox-7.0/src/VBox:156229,156768
14	14	/branches/aeichner/vbox-chromium-cleanup/src/VBox:129818-129851,129853-129861,129871-129872,129876,129880,129882,130013-130015,130094-130095

trunk/src/VBox/Runtime/common/asn1/asn1-ut-dyntype.cpp

-              r98103
+              r100490
+RTDECL(int) RTAsn1DynType_SetToObjId(PRTASN1DYNTYPE pThis, PCRTASN1OBJID pSrc, PCRTASN1ALLOCATORVTABLE pAllocator)
+{
+    RTAsn1DynType_Delete(pThis);
+    pThis->enmType = RTASN1TYPE_OBJID;
+    return RTAsn1ObjId_Clone(&pThis->u.ObjId, pSrc, pAllocator);
+}
 RTDECL(int) RTAsn1DynType_Enum(PRTASN1DYNTYPE pThis, PFNRTASN1ENUMCALLBACK pfnCallback, uint32_t uDepth, void *pvUser)
+{

Note: See TracChangeset for help on using the changeset viewer.

Changeset 100490 in vbox

Legend:

trunk

trunk/include/iprt/asn1.h

trunk/include/iprt/mangling.h

trunk/src/VBox

trunk/src/VBox/Runtime/common/asn1/asn1-ut-dyntype.cpp

Download in other formats: