Compare commits
	
		
			6 Commits
		
	
	
		
			d80ce6d52b
			...
			9a5387b931
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 9a5387b931 | |||
| bf7d8707f4 | |||
| 07de221c62 | |||
| f5cb2e0925 | |||
| 7fb7904418 | |||
| f0407edacc | 
| @ -56,11 +56,14 @@ snpguest --help > /dev/null \ | |||||||
| } | } | ||||||
| 
 | 
 | ||||||
| try_countdown=20; | try_countdown=20; | ||||||
|  | echo -n Trying $server | ||||||
| while [[ $try_countdown -gt 0 ]]; do | while [[ $try_countdown -gt 0 ]]; do | ||||||
|  |   echo -n . | ||||||
|   curl --max-time 1 -k "https://$server" > /dev/null 2>&1 && break |   curl --max-time 1 -k "https://$server" > /dev/null 2>&1 && break | ||||||
|   sleep 1 |   sleep 1 | ||||||
|   ((try_countdown--)) |   ((try_countdown--)) | ||||||
| done | done | ||||||
|  | echo | ||||||
| 
 | 
 | ||||||
| openssl s_client -connect "$server" </dev/null \ | openssl s_client -connect "$server" </dev/null \ | ||||||
|   | sed -n '/BEGIN CERTIFICATE/,/END CERTIFICATE/p' > "$server_crt" |   | sed -n '/BEGIN CERTIFICATE/,/END CERTIFICATE/p' > "$server_crt" | ||||||
| @ -100,9 +103,9 @@ echo_blue "Verifying AMD signature in attestation report..." | |||||||
| chip_id_hash=$( snpguest display report "$server_report" \ | chip_id_hash=$( snpguest display report "$server_report" \ | ||||||
|   | grep "Chip ID:" -A 4 | tail -3 | tr '\n' ' ' | sed 's/\s//g' \ |   | grep "Chip ID:" -A 4 | tail -3 | tr '\n' ' ' | sed 's/\s//g' \ | ||||||
|   | md5sum | awk '{ print $1 }') |   | md5sum | awk '{ print $1 }') | ||||||
| microcode=$( snpguest display report "$server_report" | | tcb_hash=$(grep -e "Committed TCB" -e "Reported TCB" -A 10 "$server_report" | | ||||||
|     grep "Launch TCB:" -A 6 | grep "Microcode:" | awk '{ print $2 }' ) |   md5sum | awk '{ print $1 }') | ||||||
| vcek_path="${cert_dir}/${chip_id_hash}-${microcode}.vcek.pem" | vcek_path="${cert_dir}/${chip_id_hash}-${tcb_hash}.vcek.pem" | ||||||
| amd_certs_dir="${cert_dir}/amd_certs_${server}" | amd_certs_dir="${cert_dir}/amd_certs_${server}" | ||||||
| mkdir -p "$amd_certs_dir" | mkdir -p "$amd_certs_dir" | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -398,32 +398,32 @@ pub fn calculate_nanolp( | |||||||
| 
 | 
 | ||||||
| lazy_static! { | lazy_static! { | ||||||
|     static ref DEFAULT_DTRFS: Dtrfs = Dtrfs { |     static ref DEFAULT_DTRFS: Dtrfs = Dtrfs { | ||||||
|         name: "dtrfs-6.13.8-arch1-1".to_string(), |         name: "dtrfs-6.14.2-arch1-1".to_string(), | ||||||
|         vendor: "ghe0".to_string(), |         vendor: "ghe0".to_string(), | ||||||
|         dtrfs_url: "http://registry.detee.ltd/detee-archtop-6.13.8-arch1-1.cpio.gz".to_string(), |         dtrfs_url: "http://registry.detee.ltd/detee-archtop-6.14.2-arch1-1.cpio.gz".to_string(), | ||||||
|         dtrfs_sha: "b5f408d00e2b93dc594fed3a7f2466a9878802ff1c7ae502247471cd06728a45".to_string(), |         dtrfs_sha: "d207644ee60d54009b6ecdfb720e2ec251cde31774dd249fcc7435aca0377990".to_string(), | ||||||
|         kernel_url: "http://registry.detee.ltd/vmlinuz-linux-6.13.8-arch1-1".to_string(), |         kernel_url: "http://registry.detee.ltd/vmlinuz-linux-6.14.2-arch1-1".to_string(), | ||||||
|         kernel_sha: "e49c8587287b21df7600c04326fd7393524453918c14d67f73757dc769a13542".to_string() |         kernel_sha: "e765e56166ef321b53399b9638584d1279821dbe3d46191c1f66bbaa075e7919".to_string() | ||||||
|     }; |     }; | ||||||
|     static ref DEFAULT_ARCHLINUX: Distro = Distro { |     static ref DEFAULT_ARCHLINUX: Distro = Distro { | ||||||
|         name: "archlinux_2025-02-21".to_string(), |         name: "archlinux_2025-04-03".to_string(), | ||||||
|         vendor: "gheorghe".to_string(), |         vendor: "gheorghe".to_string(), | ||||||
|         template_url: "http://registry.detee.ltd/detee_arch_2025-02-21.fsa".to_string(), |         template_url: "http://registry.detee.ltd/detee_arch_2025-04-03.fsa".to_string(), | ||||||
|         template_sha: "257edbf1e3b949b895c422befc8890c85dfae1ad3d35661010c9aaa173ba9fc4" |         template_sha: "7fdb19d9325c63d246140c984dc3764538f6ea329ed877e947993ea7bc8c2067" | ||||||
|             .to_string() |             .to_string() | ||||||
|     }; |     }; | ||||||
|     static ref DEFAULT_UBUNTU: Distro = Distro { |     static ref DEFAULT_UBUNTU: Distro = Distro { | ||||||
|         name: "ubuntu_2025-02-28".to_string(), |         name: "ubuntu_2025-04-03".to_string(), | ||||||
|         vendor: "gheorghe".to_string(), |         vendor: "gheorghe".to_string(), | ||||||
|         template_url: "http://registry.detee.ltd/detee_ubuntu_2025-02-28.fsa".to_string(), |         template_url: "http://registry.detee.ltd/detee_ubuntu_2025-04-03.fsa".to_string(), | ||||||
|         template_sha: "faa8bd38d02ca9b6ee69d7f5128ed9ccab42bdbfa69f688b9947e8e5c9e5d133" |         template_sha: "324895a7a1788e43253cf9699aa446df1a5519fe072917cedcc4ed356546e34a" | ||||||
|             .to_string() |             .to_string() | ||||||
|     }; |     }; | ||||||
|     static ref DEFAULT_FEDORA: Distro = Distro { |     static ref DEFAULT_FEDORA: Distro = Distro { | ||||||
|         name: "fedora_2025-02-21".to_string(), |         name: "fedora_2025-04-03".to_string(), | ||||||
|         vendor: "gheorghe".to_string(), |         vendor: "gheorghe".to_string(), | ||||||
|         template_url: "http://registry.detee.ltd/detee_fedora_2025-02-21.fsa".to_string(), |         template_url: "http://registry.detee.ltd/detee_fedora_2025-04-03.fsa".to_string(), | ||||||
|         template_sha: "c0fdd08d465939077ef8ed746903005fc190af12cdf70917cc8c6f872da85777" |         template_sha: "75a98c3744552bbf5f8e9c6a271cd0f382e1d9a846f5d577767b39293b8efda9" | ||||||
|             .to_string() |             .to_string() | ||||||
|     }; |     }; | ||||||
|     static ref ALTERNATIVE_INIT: Vec<Dtrfs> = vec![ |     static ref ALTERNATIVE_INIT: Vec<Dtrfs> = vec![ | ||||||
| @ -438,36 +438,36 @@ lazy_static! { | |||||||
|                 .to_string() |                 .to_string() | ||||||
|         }, |         }, | ||||||
|         Dtrfs { |         Dtrfs { | ||||||
|             name: "dtrfs-6.13.6-arch1-1".to_string(), |             name: "dtrfs-6.13.8-arch1-1".to_string(), | ||||||
|             vendor: "ghe0".to_string(), |             vendor: "ghe0".to_string(), | ||||||
|             dtrfs_url: "http://registry.detee.ltd/detee-archtop-6.13.6-arch1-1.cpio.gz".to_string(), |             dtrfs_url: "http://registry.detee.ltd/detee-archtop-6.13.8-arch1-1.cpio.gz".to_string(), | ||||||
|             dtrfs_sha: "de48048fb42fe4054611f14e51ce175ca90645734fe41349642f036b8bca8fcd" |             dtrfs_sha: "b5f408d00e2b93dc594fed3a7f2466a9878802ff1c7ae502247471cd06728a45" | ||||||
|                 .to_string(), |                 .to_string(), | ||||||
|             kernel_url: "http://registry.detee.ltd/vmlinuz-linux-6.13.6-arch1-1".to_string(), |             kernel_url: "http://registry.detee.ltd/vmlinuz-linux-6.13.8-arch1-1".to_string(), | ||||||
|             kernel_sha: "7efaca6c348cd4136afe3ece0beec346da713029347a0d4e71e12a0b91570de7" |             kernel_sha: "e49c8587287b21df7600c04326fd7393524453918c14d67f73757dc769a13542" | ||||||
|                 .to_string() |                 .to_string() | ||||||
|         }, |         }, | ||||||
|     ]; |     ]; | ||||||
|     static ref ALTERNATIVE_DISTROS: Vec<Distro> = vec![ |     static ref ALTERNATIVE_DISTROS: Vec<Distro> = vec![ | ||||||
|         Distro { |         Distro { | ||||||
|             name: "archlinux_2025-01-27".to_string(), |             name: "archlinux_2025-02-21".to_string(), | ||||||
|             vendor: "gheorghe".to_string(), |             vendor: "gheorghe".to_string(), | ||||||
|             template_url: "http://registry.detee.ltd/detee_arch_2025-01-27.fsa".to_string(), |             template_url: "http://registry.detee.ltd/detee_arch_2025-02-21.fsa".to_string(), | ||||||
|             template_sha: "c8cc8ef611380c2d1fbab36e44ccfd8d666e344c7aaefe763f7dd6136b672c97" |             template_sha: "257edbf1e3b949b895c422befc8890c85dfae1ad3d35661010c9aaa173ba9fc4" | ||||||
|                 .to_string() |                 .to_string() | ||||||
|         }, |         }, | ||||||
|         Distro { |         Distro { | ||||||
|             name: "ubuntu_2025-02-21".to_string(), |             name: "ubuntu_2025-02-28".to_string(), | ||||||
|             vendor: "gheorghe".to_string(), |             vendor: "gheorghe".to_string(), | ||||||
|             template_url: "http://registry.detee.ltd/detee_ubuntu_2025-02-21.fsa".to_string(), |             template_url: "http://registry.detee.ltd/detee_ubuntu_2025-02-28.fsa".to_string(), | ||||||
|             template_sha: "180e43c46494c8b5cf2b19067995755ade1bbd80396e1fd5e1c4b164ed2fe8cf" |             template_sha: "faa8bd38d02ca9b6ee69d7f5128ed9ccab42bdbfa69f688b9947e8e5c9e5d133" | ||||||
|                 .to_string() |                 .to_string() | ||||||
|         }, |         }, | ||||||
|         Distro { |         Distro { | ||||||
|             name: "fedora_2025-01-28".to_string(), |             name: "fedora_2025-02-21".to_string(), | ||||||
|             vendor: "gheorghe".to_string(), |             vendor: "gheorghe".to_string(), | ||||||
|             template_url: "http://registry.detee.ltd/detee_fedora_2025-01-28.fsa".to_string(), |             template_url: "http://registry.detee.ltd/detee_fedora_2025-02-21.fsa".to_string(), | ||||||
|             template_sha: "68c5be46d668a12e8ff78692843a922315bd5cd9c2bb53accf2685ec3be1fa31" |             template_sha: "c0fdd08d465939077ef8ed746903005fc190af12cdf70917cc8c6f872da85777" | ||||||
|                 .to_string() |                 .to_string() | ||||||
|         } |         } | ||||||
|     ]; |     ]; | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user