Print this page
12513 SMB 3.1.1 support for server

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/smbsrv/smbinfo.h
          +++ new/usr/src/uts/common/smbsrv/smbinfo.h
↓ open down ↓ 13 lines elided ↑ open up ↑
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  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 (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  23   23   * Copyright 2018 Nexenta Systems, Inc.  All rights reserved.
       24 + * Copyright 2020 RackTop Systems, Inc.
  24   25   */
  25   26  
  26   27  #ifndef _SMBSRV_SMBINFO_H
  27   28  #define _SMBSRV_SMBINFO_H
  28   29  
  29   30  #include <sys/types.h>
  30   31  #include <sys/uuid.h>
  31   32  #include <smbsrv/netbios.h>
  32   33  #include <netinet/in.h>
  33   34  #include <smbsrv/smb_inet.h>
↓ open down ↓ 116 lines elided ↑ open up ↑
 150  151          int32_t skc_oplock_enable;
 151  152          int32_t skc_sync_enable;
 152  153          int32_t skc_secmode;
 153  154          int32_t skc_netbios_enable;
 154  155          int32_t skc_ipv6_enable;
 155  156          int32_t skc_print_enable;
 156  157          int32_t skc_traverse_mounts;
 157  158          uint32_t skc_max_protocol;      /* SMB_VERS_... */
 158  159          uint32_t skc_min_protocol;      /* SMB_VERS_... */
 159  160          smb_cfg_val_t skc_encrypt; /* EncryptData and RejectUnencryptedAccess */
      161 +        uint16_t skc_encrypt_cipher;    /* 3.1.1 encryption cipher */
 160  162          uint32_t skc_execflags;
 161  163          uint32_t skc_negtok_len;
 162  164          smb_version_t skc_version;
 163  165          uint16_t skc_initial_credits;
 164  166          uint16_t skc_maximum_credits;
 165  167          uuid_t skc_machine_uuid;
 166  168          uchar_t skc_negtok[SMB_PI_MAX_NEGTOK];
 167  169          char skc_native_os[SMB_PI_MAX_NATIVE_OS];
 168  170          char skc_native_lm[SMB_PI_MAX_LANMAN];
 169  171          char skc_nbdomain[NETBIOS_NAME_SZ];
↓ open down ↓ 54 lines elided ↑ open up ↑
 224  226  /*
 225  227   * Defined SMB1, SMB2(+) protocol versions, as returned by
 226  228   * smb_config_get_max_protocol()
 227  229   */
 228  230  #define SMB_VERS_1              1       /* arbitrary value < 0x200 */
 229  231  #define SMB_VERS_2_BASE         0x200   /* for (SMB2 or higher?) tests */
 230  232  #define SMB_VERS_2_002          0x202   /* "2.002" */
 231  233  #define SMB_VERS_2_1            0x210   /* "2.1" */
 232  234  #define SMB_VERS_3_0            0x300   /* "3.0" */
 233  235  #define SMB_VERS_3_02           0x302   /* "3.02" */
      236 +#define SMB_VERS_3_11           0x311   /* "3.11" */
      237 +
      238 +#define SMB3_HASH_SHA512        1
      239 +
      240 +#define SMB3_CIPHER_NONE        0
      241 +#define SMB3_CIPHER_AES128_CCM  1
      242 +#define SMB3_CIPHER_AES128_GCM  2
 234  243  
 235  244  #ifdef __cplusplus
 236  245  }
 237  246  #endif
 238  247  
 239  248  #endif /* _SMBSRV_SMBINFO_H */
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX