mirror of
https://github.com/matter-labs/teepot.git
synced 2025-07-21 07:03:56 +02:00
chore: remove unused rand
dependency and update crates
- Removed `rand` dependency from multiple `.toml` files and updated relevant imports to use `rand_core::OsRng`. - Updated OpenTelemetry dependencies to latest versions and refactored SDK initialization to use `SdkLoggerProvider`. - Bumped versions of several dependencies including `clap`, `awc`, `ring`, and `smallvec` for compatibility and features. Signed-off-by: Harald Hoyer <harald@matterlabs.dev>
This commit is contained in:
parent
a430e2f93b
commit
f822c70721
7 changed files with 140 additions and 120 deletions
|
@ -36,7 +36,6 @@ opentelemetry_sdk.workspace = true
|
|||
p256.workspace = true
|
||||
pgp.workspace = true
|
||||
pkcs8.workspace = true
|
||||
rand.workspace = true
|
||||
reqwest.workspace = true
|
||||
rsa.workspace = true
|
||||
rustls.workspace = true
|
||||
|
|
|
@ -10,7 +10,7 @@ use config::{
|
|||
};
|
||||
use opentelemetry::KeyValue;
|
||||
use opentelemetry_otlp::WithExportConfig;
|
||||
use opentelemetry_sdk::{logs::LoggerProvider, runtime, Resource};
|
||||
use opentelemetry_sdk::{logs::SdkLoggerProvider, Resource};
|
||||
use opentelemetry_semantic_conventions::{
|
||||
attribute::{SERVICE_NAME, SERVICE_VERSION},
|
||||
SCHEMA_URL,
|
||||
|
@ -259,23 +259,24 @@ fn init_telemetry(
|
|||
}),
|
||||
);
|
||||
// Configure OpenTelemetry resource
|
||||
let resource = Resource::from_schema_url(
|
||||
[
|
||||
KeyValue::new(SERVICE_NAME, config.crate_name.clone()),
|
||||
KeyValue::new(SERVICE_VERSION, config.pkg_version.clone()),
|
||||
],
|
||||
SCHEMA_URL,
|
||||
);
|
||||
let resource = Resource::builder()
|
||||
.with_schema_url(
|
||||
[
|
||||
KeyValue::new(SERVICE_NAME, config.crate_name.clone()),
|
||||
KeyValue::new(SERVICE_VERSION, config.pkg_version.clone()),
|
||||
],
|
||||
SCHEMA_URL,
|
||||
)
|
||||
.build();
|
||||
|
||||
// Configure the OTLP exporter
|
||||
let logging_provider = LoggerProvider::builder()
|
||||
let logging_provider = SdkLoggerProvider::builder()
|
||||
.with_batch_exporter(
|
||||
opentelemetry_otlp::LogExporter::builder()
|
||||
.with_tonic()
|
||||
.with_endpoint(&config.otlp.endpoint)
|
||||
.with_protocol(protocol_from_string(&config.otlp.protocol)?)
|
||||
.build()?,
|
||||
runtime::Tokio,
|
||||
)
|
||||
.with_resource(resource)
|
||||
.build();
|
||||
|
|
|
@ -13,10 +13,9 @@ use const_oid::{
|
|||
use intel_tee_quote_verification_rs::tee_qv_get_collateral;
|
||||
use p256::{ecdsa::DerSignature, pkcs8::EncodePrivateKey};
|
||||
use pkcs8::der;
|
||||
use rand::rngs::OsRng;
|
||||
use rustls::pki_types::PrivatePkcs8KeyDer;
|
||||
use sha2::{Digest, Sha256};
|
||||
use signature::Signer;
|
||||
use signature::{rand_core::OsRng, Signer};
|
||||
use std::{str::FromStr, time::Duration};
|
||||
use tracing::debug;
|
||||
use x509_cert::{
|
||||
|
@ -223,7 +222,7 @@ where
|
|||
S::VerifyingKey: EncodePublicKey,
|
||||
{
|
||||
// Generate a keypair.
|
||||
let mut rng = rand::rngs::OsRng;
|
||||
let mut rng = OsRng;
|
||||
let signing_key = p256::ecdsa::SigningKey::random(&mut rng);
|
||||
let verifying_key = signing_key.verifying_key();
|
||||
let verifying_key_der = verifying_key
|
||||
|
|
|
@ -14,6 +14,7 @@ use num_integer::Integer;
|
|||
use num_traits::ToPrimitive;
|
||||
use rsa::{
|
||||
pkcs1::{DecodeRsaPrivateKey, EncodeRsaPrivateKey, LineEnding},
|
||||
rand_core::OsRng,
|
||||
traits::PublicKeyParts,
|
||||
BigUint, Pkcs1v15Sign, RsaPrivateKey,
|
||||
};
|
||||
|
@ -268,7 +269,7 @@ impl PrivateKey for RS256PrivateKey {
|
|||
type Error = rsa::errors::Error;
|
||||
|
||||
fn generate(exponent: u8) -> Result<Self, Self::Error> {
|
||||
let mut rng = rand::rngs::OsRng;
|
||||
let mut rng = OsRng;
|
||||
let exp = BigUint::from(exponent);
|
||||
let key = RsaPrivateKey::new_with_exp(&mut rng, 384 * 8, &exp)?;
|
||||
Ok(Self::new(key))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue