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>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/inet/sadb.h
          +++ new/usr/src/uts/common/inet/sadb.h
↓ open down ↓ 14 lines elided ↑ open up ↑
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  23   23   * Use is subject to license terms.
  24   24   * Copyright (c) 2012 Nexenta Systems, Inc. All rights reserved.
       25 + * Copyright 2017 Joyent, Inc.
  25   26   */
  26   27  
  27   28  #ifndef _INET_SADB_H
  28   29  #define _INET_SADB_H
  29   30  
  30   31  #ifdef  __cplusplus
  31   32  extern "C" {
  32   33  #endif
  33   34  
  34   35  #include <inet/ipsec_info.h>
↓ open down ↓ 205 lines elided ↑ open up ↑
 240  241          uint_t ipsa_hardalloc;  /* Allocations allowed (hard). */
 241  242          uint_t ipsa_alloc;      /* Allocations made. */
 242  243  
 243  244          uint_t ipsa_type;       /* Type of security association. (AH/etc.) */
 244  245          uint_t ipsa_state;      /* State of my association. */
 245  246          uint_t ipsa_replay_wsize; /* Size of replay window */
 246  247          uint32_t ipsa_flags;    /* Flags for security association. */
 247  248          uint32_t ipsa_spi;      /* Security parameters index. */
 248  249          uint32_t ipsa_replay;   /* Highest seen replay value for this SA. */
 249  250          uint32_t ipsa_kmp;      /* key management proto */
 250      -        uint32_t ipsa_kmc;      /* key management cookie */
      251 +        uint64_t ipsa_kmc;      /* key management cookie (now 64-bit) */
 251  252  
 252  253          boolean_t ipsa_haspeer;         /* Has peer in another table. */
 253  254  
 254  255          /*
 255  256           * Address storage.
 256  257           * The source address can be INADDR_ANY, IN6ADDR_ANY, etc.
 257  258           *
 258  259           * Address families (per sys/socket.h) guide us.  We could have just
 259  260           * used sockaddr_storage
 260  261           */
↓ open down ↓ 422 lines elided ↑ open up ↑
 683  684          sadb_x_kmc_t *kmcext;
 684  685          sadb_sa_t *assoc;
 685  686          uint32_t spi;
 686  687          struct sockaddr_in *src;
 687  688          struct sockaddr_in6 *src6;
 688  689          struct sockaddr_in *dst;
 689  690          struct sockaddr_in6 *dst6;
 690  691          sa_family_t af;
 691  692          uint32_t *srcaddr, *dstaddr;
 692  693          uint32_t ifindex;
 693      -        uint32_t kmc, kmp;
      694 +        uint32_t kmp;
      695 +        uint64_t kmc;
 694  696          char *didstr, *sidstr;
 695  697          uint16_t didtype, sidtype;
 696  698          sadbp_t *spp;
 697  699          sadb_t *sp;
 698  700          isaf_t  *inbound, *outbound;
 699  701          uint32_t outhash;
 700  702          uint32_t inhash;
 701  703          ipsa_match_fn_t matchers[IPSA_NMATCH];
 702  704  };
 703  705  
↓ open down ↓ 276 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX