Update sdls default props

ammos-cryptolib/kmc_sdls/kmc_sdls_python/kmc_sdls_python_scripts/kmc_sdls_test_app.properties

@@ -1,10 +1,11 @@
 # Sample DCS SDLS Test Application Properties File
-# See the DCS SIS for complete descriptions of each supported property.
+# See the DCS SIS for descriptions of each supported property.
 
 # SADB Configuration Parameters
 cryptolib.sadb.type=mariadb
 # cryptolib.sadb.mariadb.fqdn=crypto123.example.com
 cryptolib.sadb.mariadb.fqdn=
+cryptolib.sadb.mariadb.port=3306
 cryptolib.sadb.mariadb.username=testuser2
 # Password not necessary when using mTLS
 cryptolib.sadb.mariadb.password=
@@ -27,6 +28,15 @@ cryptolib.crypto.kmccryptoservice.mtls.clientkey=/opt/ammos/kmc/test/etc/ammos-c
 cryptolib.crypto.kmccryptoservice.cacert=/etc/pki/tls/certs/ammos-ca-bundle.crt
 cryptolib.crypto.kmccryptoservice.verifyserver=true
 
+#CAM Properties
+#cryptolib.cam.enabled=true
+#cryptolib.cam.login_method=NONE
+#cryptolib.cam.cookie_file=/path/to/cookie_file
+#cryptolib.cam.keytab_file=/path/to/keytab_file
+#cryptolib.cam.access_manager_uri=https://localhost:443/cam
+#cryptolib.cam.username=testuser2
+#cryptolib.cam.cam_home=/ammos/css
+
 # CryptoLib Global Behavioral Properties for TC
 cryptolib.tc.create_ecf=true
 cryptolib.tc.vcid_bitmask=0x3f
@@ -36,8 +46,8 @@ cryptolib.tc.process_pdus=false
 cryptolib.tc.check_fecf=false
 cryptolib.tc.on_rollover_increment_nontransmitted_counter=true
 
-#Managed Parameters
-#cryptolib.tc.<scid>.<vcid>.<tfvn>.<property>
+# Managed Parameters for TC
+# cryptolib.tc.<scid>.<vcid>.<tfvn>.<property>
 cryptolib.tc.44.0.0.has_segmentation_header=false
 cryptolib.tc.44.0.0.has_pus_header=false
 cryptolib.tc.44.0.0.has_ecf=true

ammos-cryptolib/kmc_sdls/kmc_sdls_python/kmc_sdls_python_scripts/kmc_sdls_test_app.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2021, by the California Institute of Technology.
+# Copyright 2026, by the California Institute of Technology.
 # ALL RIGHTS RESERVED. United States Government Sponsorship acknowledged.
 # Any commercial use must be negotiated with the Office of Technology
 # Transfer at the California Institute of Technology.
@@ -19,7 +19,7 @@
 from abc import abstractmethod, ABC
 from dataclasses import dataclass, field
 
-# Import the KMC SDLS Client
+# Import the DCS SDLS Client
 from gov.nasa.jpl.ammos.kmc.sdlsclient import KmcSdlsClient
 
 
@@ -30,7 +30,7 @@ class ArgumentException(Exception):
 
 def build_options_parser():
     arg_parser = argparse.ArgumentParser(
-        description='Simple KMC SDLS Python Test Application that will Apply and Process Security on a given frame')
+        description='Simple DCS SDLS Python Test Application that will Apply and Process Security on a given frame')
     arg_parser.add_argument("-f", "--frame",
                             dest="frame",
                             help="Hex frame string representation of telecommand transfer-frame to apply & process SDLS layering on.")

kmc-resources/crypto-client/etc/kmc-crypto.cfg

@@ -1,5 +1,5 @@
 #
-# Configuration file for KMC Crypto Client
+# Configuration file for DCS Crypto Client
 #
 
 # Specify a KMS and/or Crypto Keystore to use as source(s) of keys.
@@ -10,30 +10,31 @@
 # crypto_keystore_type can be BCFKS, PKCS12, JCEKS, or JKS. FIPS should use BCFKS keystore.
 # crypto_key_password is not used by PKCS12 keystore
 #crypto_keystore_location=KEYSTORE_PATH
-#crypto_keystore_type=PKCS12
+#crypto_keystore_type=BCFKS
 #crypto_keystore_password=PASSWORD_OF_KEYSTORE
 #crypto_key_password=PASSWORD_OF_ALL_KEYS
 
-crypto_service_uri=https://fully-qualified-domain-name:8443/crypto-service
+# Crypto Service to be used by the DCS Crypto CLIs:
+#crypto_service_uri=https://fully-qualified-domain-name:8443/crypto-service
 
-# access to Crypto Service: either SSO or mTLS
+# Access to Crypto Service: SSO or mTLS
 #crypto_service_sso_cookie_file=$HOME/.cam_cookie_file
 #crypto_service_mtls_client_type=PEM
 #crypto_service_mtls_client_key=key_file.pem
 #crypto_service_mtls_client_cert=cert_file.pem
 
-# keystore for authenticating with KMS when TLS is used (FIPS should use .bcfks)
-#keystore_file=/etc/pki/tls/private/ammos-server-keystore.bcfks
-keystore_file=/etc/pki/tls/private/ammos-server-keystore.p12
+# Keystore for authenticating to KMS when mTLS is used (FIPS should use .bcfks)
+#keystore_file=/opt/ammos/kmc/test/etc/ammos-client-keystore.p12
+keystore_file=/opt/ammos/kmc/test/etc/ammos-client-keystore.bcfks
 keystore_password=changeit
 
-# parameters for connection to KMS
+# Parameters for connection to KMS
 # default cipher suites: TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
 #additional_cipher_suites="TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384"
 connection_timeout_connect=5000
 connection_timeout_read=30000
 
-# key cache (time-to-live TTL in minutes)
+# Key cache (time-to-live TTL in minutes)
 key_cache_enable=true
 key_cache_ttl=1440
 

kmc-resources/crypto-service/kmc-crypto-service.properties

@@ -1,5 +1,4 @@
-# Only uncomment/set values to be overridden!  Values shown are KMC Crypto 
-# Service Defaults
+# Only uncomment/set values to be overridden! Values shown are DCS Crypto Service Defaults
 # Documentation: https://docs.spring.io/spring-boot/docs/2.7.17/reference/html/application-properties.html
 
 #spring.main.banner-mode=off

kmc-resources/crypto-service/kmc-crypto.cfg

@@ -1,5 +1,5 @@
 #
-# Configuration file for KMC Crypto Service
+# Configuration file for DCS Crypto Service
 #
 
 # Specify a KMS and/or Crypto Keystore to use as source(s) of keys.
@@ -9,30 +9,24 @@
 
 # crypto_keystore_type can be BCFKS, PKCS12, JCEKS, or JKS. FIPS should use BCFKS keystore.
 # crypto_key_password is not used by PKCS12 keystore.
-#crypto_keystore_location=/ammos/kmc-crypto-service/etc/KEYSTORE_FILE
-#crypto_keystore_type=PKCS12
+#crypto_keystore_location=/opt/ammos/kmc/services/crypto-service/etc/KEYSTORE_FILE
+#crypto_keystore_type=BCFKS
 #crypto_keystore_password=PASSWORD_OF_KEYSTORE
 #crypto_key_password=PASSWORD_OF_ALL_KEYS
 
-# access to Crypto Service: either SSO or mTLS
-#crypto_service_sso_cookie_file=$HOME/.cam_cookie_file
-#crypto_service_mtls_client_type=PEM
-#crypto_service_mtls_client_key=key_file.pem
-#crypto_service_mtls_client_cert=cert_file.pem
-
-# keystore for authenticating with KMS when TLS is used (FIPS operation 
-# requires .bcfks)
-keystore_file=/etc/pki/tls/private/ammos-server-keystore.bcfks
+# Keystore for authenticating to KMS when mTLS is used
+# FIPS operation requires .bcfks
 #keystore_file=/etc/pki/tls/private/ammos-server-keystore.p12
+keystore_file=/etc/pki/tls/private/ammos-server-keystore.bcfks
 keystore_password=changeit
 
-# parameters for connection to KMS
-# default cipher suites: TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
-#additional_cipher_suites="TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384"
+# Parameters for connection to KMS
+# Default cipher suites: TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+# Additional_cipher_suites="TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384"
 connection_timeout_connect=5000
 connection_timeout_read=30000
 
-# key cache (time-to-live TTL in minutes)
+# Key cache (time-to-live TTL in minutes)
 key_cache_enable=true
 key_cache_ttl=1440