mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-21 09:17:29 +00:00
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
10 lines
495 B
C
10 lines
495 B
C
#pragma once
|
|
#include "CryptoEngine.h"
|
|
#if !MESHTASTIC_EXCLUDE_PKI
|
|
|
|
int aes_ccm_ae(const uint8_t *key, size_t key_len, const uint8_t *nonce, size_t M, const uint8_t *plain, size_t plain_len,
|
|
const uint8_t *aad, size_t aad_len, uint8_t *crypt, uint8_t *auth);
|
|
|
|
bool aes_ccm_ad(const uint8_t *key, size_t key_len, const uint8_t *nonce, size_t M, const uint8_t *crypt, size_t crypt_len,
|
|
const uint8_t *aad, size_t aad_len, const uint8_t *auth, uint8_t *plain);
|
|
#endif |