tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix OS 26 build errors

Browse Source 
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
This commit is contained in:
Daniel D’Aquino
2025-09-17 17:17:43 -07:00
parent de528f3f70
commit a3ef36120e
8 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
damus/Core/NIPs/NIP04/NIP04.swift
View File

@@ -12,11 +12,11 @@ struct NIP04 {}
extension NIP04 {
/// Encrypts a message using NIP-04.
static func encrypt_message(message: String, privkey: Privkey, to_pk: Pubkey, encoding: EncEncoding = .base64) -> String? {
let iv = random_bytes(count: 16).bytes
let iv = random_bytes(count: 16).byteArray
guard let shared_sec = get_shared_secret(privkey: privkey, pubkey: to_pk) else {
return nil
}
let utf8_message = Data(message.utf8).bytes
let utf8_message = Data(message.utf8).byteArray
guard let enc_message = aes_encrypt(data: utf8_message, iv: iv, shared_sec: shared_sec) else {
return nil
}

8
damus/Core/Nostr/NostrEvent.swift
View File

@@ -321,7 +321,7 @@ func sign_id(privkey: String, id: String) -> String {
// Extra params for custom signing
var aux_rand = random_bytes(count: 64).bytes
var aux_rand = random_bytes(count: 64).byteArray
var digest = try! id.bytes
// API allows for signing variable length messages
@@ -786,15 +786,15 @@ func validate_event(ev: NostrEvent) -> ValidationResult {
let ctx = secp256k1.Context.raw
var xonly_pubkey = secp256k1_xonly_pubkey.init()
var ev_pubkey = ev.pubkey.id.bytes
var ev_pubkey = ev.pubkey.id.byteArray
var ok = secp256k1_xonly_pubkey_parse(ctx, &xonly_pubkey, &ev_pubkey) != 0
if !ok {
return .bad_sig
}
var sig = ev.sig.data.bytes
var idbytes = id.id.bytes
var sig = ev.sig.data.byteArray
var idbytes = id.id.byteArray
ok = secp256k1_schnorrsig_verify(ctx, &sig, &idbytes, 32, &xonly_pubkey) > 0
return ok ? .ok : .bad_sig