pk11hpke.h (nss-3.61) | : | pk11hpke.h (nss-3.62) | ||
---|---|---|---|---|
skipping to change at line 12 | skipping to change at line 12 | |||
* License, v. 2.0. If a copy of the MPL was not distributed with this | * License, v. 2.0. If a copy of the MPL was not distributed with this | |||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | |||
#ifndef _PK11_HPKE_H_ | #ifndef _PK11_HPKE_H_ | |||
#define _PK11_HPKE_H_ 1 | #define _PK11_HPKE_H_ 1 | |||
#include "blapit.h" | #include "blapit.h" | |||
#include "seccomon.h" | #include "seccomon.h" | |||
#ifdef NSS_ENABLE_DRAFT_HPKE | #ifdef NSS_ENABLE_DRAFT_HPKE | |||
#define HPKE_DRAFT_VERSION 5 | #define HPKE_DRAFT_VERSION 7 | |||
#define CLEANUP \ | #define CLEANUP \ | |||
PORT_Assert(rv == SECSuccess); \ | PORT_Assert(rv == SECSuccess); \ | |||
cleanup | cleanup | |||
/* Error code must already be set. */ | /* Error code must already be set. */ | |||
#define CHECK_RV(rv) \ | #define CHECK_RV(rv) \ | |||
if ((rv) != SECSuccess) { \ | if ((rv) != SECSuccess) { \ | |||
goto cleanup; \ | goto cleanup; \ | |||
} | } | |||
skipping to change at line 45 | skipping to change at line 45 | |||
goto cleanup; \ | goto cleanup; \ | |||
} | } | |||
#endif /* NSS_ENABLE_DRAFT_HPKE */ | #endif /* NSS_ENABLE_DRAFT_HPKE */ | |||
typedef enum { | typedef enum { | |||
HpkeModeBase = 0, | HpkeModeBase = 0, | |||
HpkeModePsk = 1, | HpkeModePsk = 1, | |||
} HpkeModeId; | } HpkeModeId; | |||
/* https://tools.ietf.org/html/draft-irtf-cfrg-hpke-05#section-7.1 */ | /* https://tools.ietf.org/html/draft-irtf-cfrg-hpke-07#section-7.1 */ | |||
typedef enum { | typedef enum { | |||
HpkeDhKemX25519Sha256 = 0x20, | HpkeDhKemX25519Sha256 = 0x20, | |||
} HpkeKemId; | } HpkeKemId; | |||
typedef enum { | typedef enum { | |||
HpkeKdfHkdfSha256 = 1, | HpkeKdfHkdfSha256 = 1, | |||
HpkeKdfHkdfSha384 = 2, | ||||
HpkeKdfHkdfSha512 = 3, | ||||
} HpkeKdfId; | } HpkeKdfId; | |||
typedef enum { | typedef enum { | |||
HpkeAeadAes128Gcm = 1, | HpkeAeadAes128Gcm = 1, | |||
HpkeAeadChaCha20Poly1305 = 3, | HpkeAeadChaCha20Poly1305 = 3, | |||
} HpkeAeadId; | } HpkeAeadId; | |||
typedef struct hpkeKemParamsStr { | typedef struct hpkeKemParamsStr { | |||
HpkeKemId id; | HpkeKemId id; | |||
unsigned int Nsk; | unsigned int Nsk; | |||
End of changes. 3 change blocks. | ||||
2 lines changed or deleted | 4 lines changed or added |