Print this page
8927 sadb_x_kmc_t's KM cookie should be 64-bits
Reviewed by: Jason King <jason.king@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Yuri Pankov <yuripv@gmx.com>
*** 20,29 ****
--- 20,32 ----
*/
/*
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
+ /*
+ * Copyright 2017 Joyent, Inc.
+ */
#ifndef _NET_PFKEYV2_H
#define _NET_PFKEYV2_H
/*
*** 475,488 ****
union {
struct {
uint32_t sadb_x_kmc_ucookie; /* KMP-specific */
uint32_t sadb_x_kmc_ureserved; /* Must be zero */
} sadb_x_kmc_actual;
! uint64_t sadb_x_kmc_alignment;
} sadb_x_kmc_u;
#define sadb_x_kmc_cookie sadb_x_kmc_u.sadb_x_kmc_actual.sadb_x_kmc_ucookie
#define sadb_x_kmc_reserved sadb_x_kmc_u.sadb_x_kmc_actual.sadb_x_kmc_ureserved
} sadb_x_kmc_t;
typedef struct sadb_x_pair {
union {
/* Union is for guaranteeing 64-bit alignment. */
--- 478,492 ----
union {
struct {
uint32_t sadb_x_kmc_ucookie; /* KMP-specific */
uint32_t sadb_x_kmc_ureserved; /* Must be zero */
} sadb_x_kmc_actual;
! uint64_t sadb_x_kmc_ucookie64;
} sadb_x_kmc_u;
#define sadb_x_kmc_cookie sadb_x_kmc_u.sadb_x_kmc_actual.sadb_x_kmc_ucookie
#define sadb_x_kmc_reserved sadb_x_kmc_u.sadb_x_kmc_actual.sadb_x_kmc_ureserved
+ #define sadb_x_kmc_cookie64 sadb_x_kmc_u.sadb_x_kmc_ucookie64
} sadb_x_kmc_t;
typedef struct sadb_x_pair {
union {
/* Union is for guaranteeing 64-bit alignment. */
*** 832,842 ****
#define SADB_X_ALGTYPE_MAX 3
/* Key management protocol for sadb_x_kmc above... */
! #define SADB_X_KMP_MANUAL 0
#define SADB_X_KMP_IKE 1
#define SADB_X_KMP_KINK 2
#define SADB_X_KMP_MAX 2
--- 836,846 ----
#define SADB_X_ALGTYPE_MAX 3
/* Key management protocol for sadb_x_kmc above... */
! #define SADB_X_KMP_MANUAL 0 /* Cookie is ignored. */
#define SADB_X_KMP_IKE 1
#define SADB_X_KMP_KINK 2
#define SADB_X_KMP_MAX 2