CVS commit: src/crypto/external/cpl
Module Name:src Committed By: riastradh Date: Fri Nov 22 03:16:39 UTC 2024 Added Files: src/crypto/external/cpl/tpm-tools/lib/libtpm_unseal: tpm_unseal.expsym src/crypto/external/cpl/trousers/lib/libtspi: tspi.expsym Log Message: crypto/external/cpl tpm goo: Add expected symbols list. NOTE: This looks like it's full of unintentional crud, but I see no upstream version script / symbol map _or_ -fvisibility=hidden. So we might have to clean this up ourselves somehow... PR lib/58838: shared libraries in base should all have expsym lists To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/crypto/external/cpl/tpm-tools/lib/libtpm_unseal/tpm_unseal.expsym cvs rdiff -u -r0 -r1.1 \ src/crypto/external/cpl/trousers/lib/libtspi/tspi.expsym Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/cpl
Module Name:src Committed By: riastradh Date: Fri Nov 22 03:16:39 UTC 2024 Added Files: src/crypto/external/cpl/tpm-tools/lib/libtpm_unseal: tpm_unseal.expsym src/crypto/external/cpl/trousers/lib/libtspi: tspi.expsym Log Message: crypto/external/cpl tpm goo: Add expected symbols list. NOTE: This looks like it's full of unintentional crud, but I see no upstream version script / symbol map _or_ -fvisibility=hidden. So we might have to clean this up ourselves somehow... PR lib/58838: shared libraries in base should all have expsym lists To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/crypto/external/cpl/tpm-tools/lib/libtpm_unseal/tpm_unseal.expsym cvs rdiff -u -r0 -r1.1 \ src/crypto/external/cpl/trousers/lib/libtspi/tspi.expsym Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/crypto/external/cpl/tpm-tools/lib/libtpm_unseal/tpm_unseal.expsym diff -u /dev/null src/crypto/external/cpl/tpm-tools/lib/libtpm_unseal/tpm_unseal.expsym:1.1 --- /dev/null Fri Nov 22 03:16:39 2024 +++ src/crypto/external/cpl/tpm-tools/lib/libtpm_unseal/tpm_unseal.expsym Fri Nov 22 03:16:39 2024 @@ -0,0 +1,7 @@ +hContext +tpmUnsealFile +tpmUnsealShred +tpmUnsealStrerror +tpm_errno +tpm_error_buf +tspi_error_strings Index: src/crypto/external/cpl/trousers/lib/libtspi/tspi.expsym diff -u /dev/null src/crypto/external/cpl/trousers/lib/libtspi/tspi.expsym:1.1 --- /dev/null Fri Nov 22 03:16:39 2024 +++ src/crypto/external/cpl/trousers/lib/libtspi/tspi.expsym Fri Nov 22 03:16:39 2024 @@ -0,0 +1,1032 @@ +Decode_UINT16 +Decode_UINT32 +Decode_UINT64 +DisplayNewPINWindow +DisplayPINWindow +HMAC_Auth +Hash_TSS_KEY +Hash_TSS_PRIVKEY_DIGEST +Init_AuthNonce +LoadBlob_AUTH +LoadBlob_LOADKEY_INFO +LoadBlob_TSS_KEY +LoadBlob_TSS_PRIVKEY_DIGEST +NULL_UUID +OSAP_Calc +RPC_ActivateTPMIdentity +RPC_ActivateTPMIdentity_TP +RPC_AuthorizeMigrationKey +RPC_AuthorizeMigrationKey_TP +RPC_CMK_ApproveMA +RPC_CMK_ApproveMA_TP +RPC_CMK_ConvertMigration +RPC_CMK_ConvertMigration_TP +RPC_CMK_CreateBlob +RPC_CMK_CreateBlob_TP +RPC_CMK_CreateKey +RPC_CMK_CreateKey_TP +RPC_CMK_CreateTicket +RPC_CMK_CreateTicket_TP +RPC_CMK_SetRestrictions +RPC_CMK_SetRestrictions_TP +RPC_CertifyKey +RPC_CertifyKey_TP +RPC_CertifySelfTest +RPC_CertifySelfTest_TP +RPC_ChangeAuth +RPC_ChangeAuthAsymFinish +RPC_ChangeAuthAsymFinish_TP +RPC_ChangeAuthAsymStart +RPC_ChangeAuthAsymStart_TP +RPC_ChangeAuthOwner +RPC_ChangeAuthOwner_TP +RPC_ChangeAuth_TP +RPC_CloseContext +RPC_CloseContext_TP +RPC_ConvertMigrationBlob +RPC_ConvertMigrationBlob_TP +RPC_CreateCounter +RPC_CreateCounter_TP +RPC_CreateEndorsementKeyPair +RPC_CreateEndorsementKeyPair_TP +RPC_CreateMaintenanceArchive +RPC_CreateMaintenanceArchive_TP +RPC_CreateMigrationBlob +RPC_CreateMigrationBlob_TP +RPC_CreateRevocableEndorsementKeyPair +RPC_CreateRevocableEndorsementKeyPair_TP +RPC_CreateWrapKey +RPC_CreateWrapKey_TP +RPC_DSAP +RPC_DSAP_TP +RPC_Delegate_CreateKeyDelegation +RPC_Delegate_CreateKeyDelegation_TP +RPC_Delegate_CreateOwnerDelegation +RPC_Delegate_CreateOwnerDelegation_TP +RPC_Delegate_LoadOwnerDelegation +RPC_Delegate_LoadOwnerDelegation_TP +RPC_Delegate_Manage +RPC_Delegate_Manage_TP +RPC_Delegate_ReadTable +RPC_Delegate_ReadTable_TP +RPC_Delegate_UpdateVerificationCount +RPC_Delegate_UpdateVerificationCount_TP +RPC_Delegate_VerifyDelegation +RPC_Delegate_VerifyDelegation_TP +RPC_DirRead +RPC_DirRead_TP +RPC_DirWriteAuth +RPC_DirWriteAuth_TP +RPC_DisableForceClear +RPC_DisableForceClear_TP +RPC_DisableOwnerClear +RPC_DisableOwnerClear_TP +RPC_DisablePubekRead +RPC_DisablePubekRead_TP +RPC_EnumRegisteredKeys +RPC_EnumRegisteredKeys2 +RPC_EnumRegisteredKeys2_TP +RPC_EnumRegisteredKeys_TP +RPC_Error +RPC_EstablishTransport +RPC_EstablishTransport_TP +RPC_EvictKey +RPC_EvictKey_TP +RPC_ExecuteTransport +RPC_ExecuteTransport_TP +RPC_Extend +RPC_Extend_TP +RPC_FieldUpgrade +RPC_FieldUpgrade_TP +RPC_FlushSpecific +RPC_FlushSpecific_TP +RPC_ForceClear +RPC_ForceClear_TP +RPC_FreeMemory +RPC_FreeMemory_TP +RPC_GetAuditDigest +RPC_GetAuditDigestSigned +RPC_GetAuditDigestSigned_TP +RPC_GetAuditDigest_TP +RPC_GetCapability +RPC_GetCapabilityOwner +RPC_GetCapabilityOwner_TP +RPC_GetCapabilitySigned +RPC_GetCapabilitySigned_TP +RPC_GetCapability_TP +RPC_GetCredential +RPC_GetCredential_TP +RPC_GetPcrEvent +RPC_GetPcrEventLog +RPC_GetPcrEventLog_TP +RPC_GetPcrEvent_TP +RPC_GetPcrEventsByPcr +RPC_GetPcrEventsByPcr_TP +RPC_GetPubKey +RPC_GetPubKey_TP +RPC_GetRandom +RPC_GetRandom_TP +RPC_GetRegisteredKey +RPC_GetRegisteredKeyBlob +RPC_GetRegisteredKeyBlob_TP +RPC_GetRegisteredKeyByPublicInfo +RPC_GetRegisteredKeyByPublicInfo_TP +RPC_GetRegisteredKey_TP +RPC_GetTPMCapability +RPC_GetTPMCapability_TP +RPC_GetTestResult +RPC_GetTestResult_TP +RPC_IncrementCounter +RPC_IncrementCounter_TP +RPC_KeyControlOwner +RPC_KeyControlOwner_TP +RPC_KillMaintenanceFeature +RPC_KillMaintenanceFeature_TP
CVS commit: src/crypto/external/cpl/trousers
Module Name:src
Committed By: riastradh
Date: Thu Aug 10 06:56:12 UTC 2023
Modified Files:
src/crypto/external/cpl/trousers/bin/tcsd: Makefile
src/crypto/external/cpl/trousers/dist/src/include: tcsd.h
trousers_types.h
src/crypto/external/cpl/trousers/lib/libtcs: Makefile
src/crypto/external/cpl/trousers/lib/libtspi: Makefile
Log Message:
trousers: Make this build again.
- Downgrade address-of-packed-member errors to warnings. Not sure if
this is safe, but there's too many to audit.
- Silence deprecation warnings for openssl3.
- Address removal of const qualifier in iconv.
- Nix unused definitions in a .h file, which cause trouble now that
-fno-common is the default.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/cpl/trousers/bin/tcsd/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/cpl/trousers/dist/src/include/tcsd.h \
src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/cpl/trousers/lib/libtcs/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/cpl/trousers/lib/libtspi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/cpl/trousers/bin/tcsd/Makefile
diff -u src/crypto/external/cpl/trousers/bin/tcsd/Makefile:1.2 src/crypto/external/cpl/trousers/bin/tcsd/Makefile:1.3
--- src/crypto/external/cpl/trousers/bin/tcsd/Makefile:1.2 Mon Jan 7 15:18:03 2019
+++ src/crypto/external/cpl/trousers/bin/tcsd/Makefile Thu Aug 10 06:56:12 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/01/07 15:18:03 christos Exp $
+# $NetBSD: Makefile,v 1.3 2023/08/10 06:56:12 riastradh Exp $
.include "../Makefile.inc"
.PATH.c: ${DIST}/src/tcsd
@@ -6,6 +6,8 @@
CPPFLAGS+=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"/var\" -DETC_PREFIX=\"/etc\"
CPPFLAGS+=-DTSS_BUILD_PS -DTSS_BUILD_PCR_EVENTS
+COPTS.tcsd_threads.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+
BINDIR=/usr/sbin
PROG=tcsd
SRCS=\
Index: src/crypto/external/cpl/trousers/dist/src/include/tcsd.h
diff -u src/crypto/external/cpl/trousers/dist/src/include/tcsd.h:1.3 src/crypto/external/cpl/trousers/dist/src/include/tcsd.h:1.4
--- src/crypto/external/cpl/trousers/dist/src/include/tcsd.h:1.3 Mon Jan 7 15:18:03 2019
+++ src/crypto/external/cpl/trousers/dist/src/include/tcsd.h Thu Aug 10 06:56:12 2023
@@ -170,7 +170,7 @@ void *tcsd_thread_run(void *);
void thread_signal_init();
/* signal handling */
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(__NetBSD__)
struct sigaction tcsd_sa_int;
struct sigaction tcsd_sa_chld;
#endif
Index: src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h
diff -u src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h:1.3 src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h:1.4
--- src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h:1.3 Mon Jan 7 15:18:03 2019
+++ src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h Thu Aug 10 06:56:12 2023
@@ -118,9 +118,9 @@ typedef struct tdTSS_KEY {
BYTE *encData;
} TSS_KEY;
-#if (defined (__linux) || defined (linux) || defined (SOLARIS) || defined (__GLIBC__))
+#if (defined (__linux) || defined (linux) || defined (SOLARIS) || defined (__GLIBC__) || defined (__NetBSD__))
#define BSD_CONST
-#elif defined (__OpenBSD__) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__APPLE__)
+#elif defined (__OpenBSD__) || defined (__FreeBSD__) || defined (__APPLE__)
#define BSD_CONST const
#endif
Index: src/crypto/external/cpl/trousers/lib/libtcs/Makefile
diff -u src/crypto/external/cpl/trousers/lib/libtcs/Makefile:1.1 src/crypto/external/cpl/trousers/lib/libtcs/Makefile:1.2
--- src/crypto/external/cpl/trousers/lib/libtcs/Makefile:1.1 Sat Jan 28 02:15:26 2012
+++ src/crypto/external/cpl/trousers/lib/libtcs/Makefile Thu Aug 10 06:56:12 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/01/28 02:15:26 christos Exp $
+# $NetBSD: Makefile,v 1.2 2023/08/10 06:56:12 riastradh Exp $
LIBISPRIVATE=yes
.include "../Makefile.inc"
@@ -18,6 +18,8 @@ CPPFLAGS+=-DTSS_BUILD_PCR_EXTEND -DTSS_B
CPPFLAGS+=-DTSS_BUILD_AUDIT -DTSS_BUILD_SEALX -DTSS_BUILD_TSS12
CPPFLAGS+=-DTSS_BUILD_DELEGATION -DTSS_BUILD_QUOTE2 -DTSS_BUILD_CMK
+COPTS.tcs_key.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+
LIB=tcs
SRCS=\
crypto.c \
Index: src/crypto/external/cpl/trousers/lib/libtspi/Makefile
diff -u src/crypto/external/cpl/trousers/lib/libtspi/Makefile:1.3 src/crypto/external/cpl/trousers/lib/libtspi/Makefile:1.4
--- src/crypto/external/cpl/trousers/lib/libtspi/Makefile:1.3 Mon Jan 7 15:43:17 2019
+++ src/crypto/external/cpl/trousers/lib/libtspi/Makefile Thu Aug 10 06:56:12 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/01/07 15:43:17 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/08/10 06:56:12 riastradh Exp $
.include "../Makefile.inc"
CPPFLAGS+=-
CVS commit: src/crypto/external/cpl/trousers
Module Name:src Committed By: riastradh Date: Thu Aug 10 06:56:12 UTC 2023 Modified Files: src/crypto/external/cpl/trousers/bin/tcsd: Makefile src/crypto/external/cpl/trousers/dist/src/include: tcsd.h trousers_types.h src/crypto/external/cpl/trousers/lib/libtcs: Makefile src/crypto/external/cpl/trousers/lib/libtspi: Makefile Log Message: trousers: Make this build again. - Downgrade address-of-packed-member errors to warnings. Not sure if this is safe, but there's too many to audit. - Silence deprecation warnings for openssl3. - Address removal of const qualifier in iconv. - Nix unused definitions in a .h file, which cause trouble now that -fno-common is the default. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/external/cpl/trousers/bin/tcsd/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/cpl/trousers/dist/src/include/tcsd.h \ src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h cvs rdiff -u -r1.1 -r1.2 src/crypto/external/cpl/trousers/lib/libtcs/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/cpl/trousers/lib/libtspi/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
