Merge pull request #9817 from mitake/no-password

*: support creating a user without password

CHANGELOG-3.4.md

@@ -57,6 +57,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.3.0...v3.4.0) and
 - Add [consistency check in snapshot status](https://github.com/etcd-io/etcd/pull/10109). If consistency check on snapshot file fails, `snapshot status` returns `"snapshot file integrity check failed..."` error.
 - Add [`Verify` function to perform corruption check on WAL contents](https://github.com/etcd-io/etcd/pull/10603).
 - Improve [heartbeat send failure logging](https://github.com/etcd-io/etcd/pull/10663).
+- Support [users with no password](https://github.com/etcd-io/etcd/pull/9817) for reducing security risk introduced by leaked password. The users can only be authenticated with CommonName based auth.
 
 ### Breaking Changes
 

Documentation/dev-guide/api_reference_v3.md

@@ -246,6 +246,7 @@ Empty field.
 | ----- | ----------- | ---- |
 | name |  | string |
 | password |  | string |
+| options |  | authpb.UserAddOptions |
 
 
 
@@ -1001,6 +1002,15 @@ User is a single entry in the bucket authUsers
 | name |  | bytes |
 | password |  | bytes |
 | roles |  | (slice of) string |
+| options |  | UserAddOptions |
+
+
+
+##### message `UserAddOptions` (auth/authpb/auth.proto)
+
+| Field | Description | Type |
+| ----- | ----------- | ---- |
+| no_password |  | bool |
 
 
 

Documentation/dev-guide/apispec/swagger/rpc.swagger.json

@@ -1219,6 +1219,15 @@
         "READWRITE"
       ]
     },
+    "authpbUserAddOptions": {
+      "type": "object",
+      "properties": {
+        "no_password": {
+          "type": "boolean",
+          "format": "boolean"
+        }
+      }
+    },
     "etcdserverpbAlarmMember": {
       "type": "object",
       "properties": {
@@ -1420,6 +1429,9 @@
         "name": {
           "type": "string"
         },
+        "options": {
+          "$ref": "#/definitions/authpbUserAddOptions"
+        },
         "password": {
           "type": "string"
         }

auth/authpb/auth.pb.go

@@ -8,6 +8,7 @@
 		auth.proto
 
 	It has these top-level messages:
+		UserAddOptions
 		User
 		Permission
 		Role
@@ -59,19 +60,29 @@ var Permission_Type_value = map[string]int32{
 func (x Permission_Type) String() string {
 	return proto.EnumName(Permission_Type_name, int32(x))
 }
-func (Permission_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptorAuth, []int{1, 0} }
+func (Permission_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptorAuth, []int{2, 0} }
+
+type UserAddOptions struct {
+	NoPassword bool `protobuf:"varint,1,opt,name=no_password,json=noPassword,proto3" json:"no_password,omitempty"`
+}
+
+func (m *UserAddOptions) Reset()                    { *m = UserAddOptions{} }
+func (m *UserAddOptions) String() string            { return proto.CompactTextString(m) }
+func (*UserAddOptions) ProtoMessage()               {}
+func (*UserAddOptions) Descriptor() ([]byte, []int) { return fileDescriptorAuth, []int{0} }
 
 // User is a single entry in the bucket authUsers
 type User struct {
-	Name     []byte   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Name     []byte          `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Password []byte   `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"`
+	Password []byte          `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"`
-	Roles    []string `protobuf:"bytes,3,rep,name=roles" json:"roles,omitempty"`
+	Roles    []string        `protobuf:"bytes,3,rep,name=roles" json:"roles,omitempty"`
+	Options  *UserAddOptions `protobuf:"bytes,4,opt,name=options" json:"options,omitempty"`
 }
 
 func (m *User) Reset()                    { *m = User{} }
 func (m *User) String() string            { return proto.CompactTextString(m) }
 func (*User) ProtoMessage()               {}
-func (*User) Descriptor() ([]byte, []int) { return fileDescriptorAuth, []int{0} }
+func (*User) Descriptor() ([]byte, []int) { return fileDescriptorAuth, []int{1} }
 
 // Permission is a single entity
 type Permission struct {
@@ -83,7 +94,7 @@ type Permission struct {
 func (m *Permission) Reset()                    { *m = Permission{} }
 func (m *Permission) String() string            { return proto.CompactTextString(m) }
 func (*Permission) ProtoMessage()               {}
-func (*Permission) Descriptor() ([]byte, []int) { return fileDescriptorAuth, []int{1} }
+func (*Permission) Descriptor() ([]byte, []int) { return fileDescriptorAuth, []int{2} }
 
 // Role is a single entry in the bucket authRoles
 type Role struct {
@@ -94,14 +105,43 @@ type Role struct {
 func (m *Role) Reset()                    { *m = Role{} }
 func (m *Role) String() string            { return proto.CompactTextString(m) }
 func (*Role) ProtoMessage()               {}
-func (*Role) Descriptor() ([]byte, []int) { return fileDescriptorAuth, []int{2} }
+func (*Role) Descriptor() ([]byte, []int) { return fileDescriptorAuth, []int{3} }
 
 func init() {
+	proto.RegisterType((*UserAddOptions)(nil), "authpb.UserAddOptions")
 	proto.RegisterType((*User)(nil), "authpb.User")
 	proto.RegisterType((*Permission)(nil), "authpb.Permission")
 	proto.RegisterType((*Role)(nil), "authpb.Role")
 	proto.RegisterEnum("authpb.Permission_Type", Permission_Type_name, Permission_Type_value)
 }
+func (m *UserAddOptions) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalTo(dAtA)
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *UserAddOptions) MarshalTo(dAtA []byte) (int, error) {
+	var i int
+	_ = i
+	var l int
+	_ = l
+	if m.NoPassword {
+		dAtA[i] = 0x8
+		i++
+		if m.NoPassword {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i++
+	}
+	return i, nil
+}
+
 func (m *User) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -144,6 +184,16 @@ func (m *User) MarshalTo(dAtA []byte) (int, error) {
 			i += copy(dAtA[i:], s)
 		}
 	}
+	if m.Options != nil {
+		dAtA[i] = 0x22
+		i++
+		i = encodeVarintAuth(dAtA, i, uint64(m.Options.Size()))
+		n1, err := m.Options.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
+		}
+		i += n1
+	}
 	return i, nil
 }
 
@@ -227,6 +277,15 @@ func encodeVarintAuth(dAtA []byte, offset int, v uint64) int {
 	dAtA[offset] = uint8(v)
 	return offset + 1
 }
+func (m *UserAddOptions) Size() (n int) {
+	var l int
+	_ = l
+	if m.NoPassword {
+		n += 2
+	}
+	return n
+}
+
 func (m *User) Size() (n int) {
 	var l int
 	_ = l
@@ -244,6 +303,10 @@ func (m *User) Size() (n int) {
 			n += 1 + l + sovAuth(uint64(l))
 		}
 	}
+	if m.Options != nil {
+		l = m.Options.Size()
+		n += 1 + l + sovAuth(uint64(l))
+	}
 	return n
 }
 
@@ -293,6 +356,76 @@ func sovAuth(x uint64) (n int) {
 func sozAuth(x uint64) (n int) {
 	return sovAuth(uint64((x << 1) ^ uint64((int64(x) >> 63))))
 }
+func (m *UserAddOptions) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowAuth
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: UserAddOptions: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: UserAddOptions: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field NoPassword", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowAuth
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.NoPassword = bool(v != 0)
+		default:
+			iNdEx = preIndex
+			skippy, err := skipAuth(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if skippy < 0 {
+				return ErrInvalidLengthAuth
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func (m *User) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
@@ -413,6 +546,39 @@ func (m *User) Unmarshal(dAtA []byte) error {
 			}
 			m.Roles = append(m.Roles, string(dAtA[iNdEx:postIndex]))
 			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Options", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowAuth
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthAuth
+			}
+			postIndex := iNdEx + msglen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Options == nil {
+				m.Options = &UserAddOptions{}
+			}
+			if err := m.Options.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipAuth(dAtA[iNdEx:])
@@ -785,23 +951,27 @@ var (
 func init() { proto.RegisterFile("auth.proto", fileDescriptorAuth) }
 
 var fileDescriptorAuth = []byte{
-	// 288 bytes of a gzipped FileDescriptorProto
+	// 338 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xc1, 0x4a, 0xc3, 0x30,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0xcf, 0x4e, 0xea, 0x40,
-	0x1c, 0xc6, 0x9b, 0xb6, 0x1b, 0xed, 0x5f, 0x27, 0x25, 0x0c, 0x0c, 0x13, 0x42, 0xe9, 0xa9, 0x78,
+	0x14, 0xc6, 0x3b, 0xb4, 0x70, 0xdb, 0xc3, 0x85, 0x90, 0x13, 0x72, 0x6f, 0x83, 0x49, 0x6d, 0xba,
-	0xa8, 0xb0, 0x5d, 0xbc, 0x2a, 0xf6, 0x20, 0x78, 0x90, 0x50, 0xf1, 0x28, 0x1d, 0x0d, 0x75, 0x6c,
+	0x6a, 0x5c, 0x54, 0x85, 0x8d, 0x5b, 0x8c, 0x2c, 0x5c, 0x49, 0x26, 0x18, 0x97, 0xa4, 0xa4, 0x13,
-	0x6d, 0x4a, 0x32, 0x91, 0xbe, 0x89, 0x07, 0x1f, 0x68, 0xc7, 0x3d, 0x82, 0xab, 0x2f, 0x22, 0x4d,
+	0x24, 0xc0, 0x4c, 0x33, 0x83, 0x31, 0x6c, 0x7c, 0x0e, 0x17, 0x3e, 0x10, 0x4b, 0x1e, 0x41, 0xf0,
-	0x64, 0x43, 0xdc, 0xed, 0xfb, 0xbe, 0xff, 0x97, 0xe4, 0x97, 0x3f, 0x40, 0xfe, 0xb6, 0x7e, 0x4d,
+	0x45, 0x4c, 0x67, 0xf8, 0x13, 0xa2, 0xbb, 0xef, 0x7c, 0xe7, 0xfb, 0x66, 0x7e, 0x99, 0x01, 0x48,
-	0x1a, 0x29, 0xd6, 0x02, 0x0f, 0x7b, 0xdd, 0xcc, 0x27, 0xe3, 0x52, 0x94, 0x42, 0x47, 0x57, 0xbd,
+	0x5f, 0x16, 0xcf, 0x49, 0x2e, 0xc5, 0x42, 0x60, 0xa5, 0xd0, 0xf9, 0xa8, 0xd5, 0x1c, 0x8b, 0xb1,
-	0x32, 0xd3, 0xe8, 0x01, 0xdc, 0x27, 0xc5, 0x25, 0xc6, 0xe0, 0xd6, 0x79, 0xc5, 0x09, 0x0a, 0x51,
+	0xd0, 0xd6, 0x65, 0xa1, 0xcc, 0x36, 0xba, 0x86, 0xfa, 0xa3, 0x62, 0xb2, 0x9b, 0x65, 0x0f, 0xf9,
-	0x7c, 0xca, 0xb4, 0xc6, 0x13, 0xf0, 0x9a, 0x5c, 0xa9, 0x77, 0x21, 0x0b, 0x62, 0xeb, 0x7c, 0xef,
+	0x62, 0x22, 0xb8, 0xc2, 0x73, 0xa8, 0x72, 0x31, 0xcc, 0x53, 0xa5, 0x5e, 0x85, 0xcc, 0x7c, 0x12,
-	0xf1, 0x18, 0x06, 0x52, 0xac, 0xb8, 0x22, 0x4e, 0xe8, 0xc4, 0x3e, 0x33, 0x26, 0xfa, 0x44, 0x00,
+	0x92, 0xd8, 0xa5, 0xc0, 0x45, 0x7f, 0xe7, 0x44, 0x6f, 0xe0, 0x14, 0x15, 0x44, 0x70, 0x78, 0x3a,
-	0x8f, 0x5c, 0x56, 0x0b, 0xa5, 0x16, 0xa2, 0xc6, 0x33, 0xf0, 0x1a, 0x2e, 0xab, 0xac, 0x6d, 0xcc,
+	0x67, 0x3a, 0xf1, 0x97, 0x6a, 0x8d, 0x2d, 0x70, 0x0f, 0xcd, 0x92, 0xf6, 0x0f, 0x33, 0x36, 0xa1,
-	0xc5, 0x67, 0xd3, 0xf3, 0xc4, 0xd0, 0x24, 0x87, 0x56, 0xd2, 0x8f, 0xd9, 0xbe, 0x88, 0x03, 0x70,
+	0x2c, 0xc5, 0x8c, 0x29, 0xdf, 0x0e, 0xed, 0xd8, 0xa3, 0x66, 0xc0, 0x2b, 0xf8, 0x23, 0xcc, 0xcd,
-	0x96, 0xbc, 0xfd, 0x7d, 0xb0, 0x97, 0xf8, 0x02, 0x7c, 0x99, 0xd7, 0x25, 0x7f, 0xe1, 0x75, 0x41,
+	0xbe, 0x13, 0x92, 0xb8, 0xda, 0xfe, 0x97, 0x18, 0xe0, 0xe4, 0x94, 0x8b, 0xee, 0x63, 0xd1, 0x07,
-	0x1c, 0x03, 0xa2, 0x83, 0xb4, 0x2e, 0xa2, 0x4b, 0x70, 0xf5, 0x31, 0x0f, 0x5c, 0x96, 0xde, 0xdc,
+	0x01, 0xe8, 0x33, 0x39, 0x9f, 0x28, 0x35, 0x11, 0x1c, 0x3b, 0xe0, 0xe6, 0x4c, 0xce, 0x07, 0xcb,
-	0x05, 0x16, 0xf6, 0x61, 0xf0, 0xcc, 0xee, 0xb3, 0x34, 0x40, 0x78, 0x04, 0x7e, 0x1f, 0x1a, 0x6b,
+	0xdc, 0xa0, 0xd4, 0xdb, 0xff, 0xf7, 0x27, 0x1c, 0x53, 0x49, 0xb1, 0xa6, 0x87, 0x20, 0x36, 0xc0,
-	0x47, 0x19, 0xb8, 0x4c, 0xac, 0xf8, 0xd1, 0xcf, 0x5e, 0xc3, 0x68, 0xc9, 0xdb, 0x03, 0x16, 0xb1,
+	0x9e, 0xb2, 0xe5, 0x0e, 0xb1, 0x90, 0x78, 0x06, 0x9e, 0x4c, 0xf9, 0x98, 0x0d, 0x19, 0xcf, 0x7c,
-	0x43, 0x27, 0x3e, 0x99, 0xe2, 0xff, 0xc0, 0xec, 0x6f, 0xf1, 0x96, 0x6c, 0x76, 0xd4, 0xda, 0xee,
+	0xdb, 0xa0, 0x6b, 0xa3, 0xc7, 0xb3, 0xe8, 0x02, 0x1c, 0x5d, 0x73, 0xc1, 0xa1, 0xbd, 0xee, 0x5d,
-	0xa8, 0xb5, 0xe9, 0x28, 0xda, 0x76, 0x14, 0x7d, 0x75, 0x14, 0x7d, 0x7c, 0x53, 0x6b, 0x3e, 0xd4,
+	0xc3, 0x42, 0x0f, 0xca, 0x4f, 0xf4, 0x7e, 0xd0, 0x6b, 0x10, 0xac, 0x81, 0x57, 0x98, 0x66, 0x2c,
-	0x3b, 0x9e, 0xfd, 0x04, 0x00, 0x00, 0xff, 0xff, 0xcc, 0x76, 0x8d, 0x4f, 0x8f, 0x01, 0x00, 0x00,
+	0x45, 0x03, 0x70, 0xa8, 0x98, 0xb1, 0x5f, 0x9f, 0xe7, 0x06, 0x6a, 0x53, 0xb6, 0x3c, 0x62, 0xf9,
+	0xa5, 0xd0, 0x8e, 0xab, 0x6d, 0xfc, 0x09, 0x4c, 0x4f, 0x83, 0xb7, 0xfe, 0x6a, 0x13, 0x58, 0xeb,
+	0x4d, 0x60, 0xad, 0xb6, 0x01, 0x59, 0x6f, 0x03, 0xf2, 0xb9, 0x0d, 0xc8, 0xfb, 0x57, 0x60, 0x8d,
+	0x2a, 0xfa, 0x23, 0x3b, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x61, 0x66, 0xc6, 0x9d, 0xf4, 0x01,
+	0x00, 0x00,
 }

auth/authpb/auth.proto

@@ -9,11 +9,16 @@ option (gogoproto.unmarshaler_all) = true;
 option (gogoproto.goproto_getters_all) = false;
 option (gogoproto.goproto_enum_prefix_all) = false;
 
+message UserAddOptions {
+  bool no_password = 1;
+};
+
 // User is a single entry in the bucket authUsers
 message User {
   bytes name = 1;
   bytes password = 2;
   repeated string roles = 3;
+  UserAddOptions options = 4;
 }
 
 // Permission is a single entity

auth/store.go

@@ -305,6 +305,10 @@ func (as *authStore) Authenticate(ctx context.Context, username, password string
 		return nil, ErrAuthFailed
 	}
 
+	if user.Options.NoPassword {
+		return nil, ErrAuthFailed
+	}
+
 	// Password checking is already performed in the API layer, so we don't need to check for now.
 	// Staleness of password can be detected with OCC in the API layer, too.
 
@@ -339,6 +343,10 @@ func (as *authStore) CheckPassword(username, password string) (uint64, error) {
 		return 0, ErrAuthFailed
 	}
 
+	if user.Options.NoPassword {
+		return 0, ErrAuthFailed
+	}
+
 	if bcrypt.CompareHashAndPassword(user.Password, []byte(password)) != nil {
 		if as.lg != nil {
 			as.lg.Info("invalid password", zap.String("user-name", username))
@@ -376,18 +384,23 @@ func (as *authStore) UserAdd(r *pb.AuthUserAddRequest) (*pb.AuthUserAddResponse,
 		return nil, ErrUserEmpty
 	}
 
-	hashed, err := bcrypt.GenerateFromPassword([]byte(r.Password), as.bcryptCost)
+	var hashed []byte
-	if err != nil {
+	var err error
-		if as.lg != nil {
+
-			as.lg.Warn(
+	if !r.Options.NoPassword {
-				"failed to bcrypt hash password",
+		hashed, err = bcrypt.GenerateFromPassword([]byte(r.Password), as.bcryptCost)
-				zap.String("user-name", r.Name),
+		if err != nil {
-				zap.Error(err),
+			if as.lg != nil {
-			)
+				as.lg.Warn(
-		} else {
+					"failed to bcrypt hash password",
-			plog.Errorf("failed to hash password: %s", err)
+					zap.String("user-name", r.Name),
+					zap.Error(err),
+				)
+			} else {
+				plog.Errorf("failed to hash password: %s", err)
+			}
+			return nil, err
 		}
-		return nil, err
 	}
 
 	tx := as.be.BatchTx()
@@ -399,9 +412,17 @@ func (as *authStore) UserAdd(r *pb.AuthUserAddRequest) (*pb.AuthUserAddResponse,
 		return nil, ErrUserAlreadyExist
 	}
 
+	options := r.Options
+	if options == nil {
+		options = &authpb.UserAddOptions{
+			NoPassword: false,
+		}
+	}
+
 	newUser := &authpb.User{
 		Name:     []byte(r.Name),
 		Password: hashed,
+		Options:  options,
 	}
 
 	putUser(as.lg, tx, newUser)
@@ -484,6 +505,7 @@ func (as *authStore) UserChangePassword(r *pb.AuthUserChangePasswordRequest) (*p
 		Name:     []byte(r.Name),
 		Roles:    user.Roles,
 		Password: hashed,
+		Options:  user.Options,
 	}
 
 	putUser(as.lg, tx, updatedUser)
@@ -613,6 +635,7 @@ func (as *authStore) UserRevokeRole(r *pb.AuthUserRevokeRoleRequest) (*pb.AuthUs
 	updatedUser := &authpb.User{
 		Name:     user.Name,
 		Password: user.Password,
+		Options:  user.Options,
 	}
 
 	for _, role := range user.Roles {
@@ -744,6 +767,7 @@ func (as *authStore) RoleDelete(r *pb.AuthRoleDeleteRequest) (*pb.AuthRoleDelete
 		updatedUser := &authpb.User{
 			Name:     user.Name,
 			Password: user.Password,
+			Options:  user.Options,
 		}
 
 		for _, role := range user.Roles {

auth/store_test.go

@@ -114,7 +114,7 @@ func setupAuthStore(t *testing.T) (store *authStore, teardownfunc func(t *testin
 		t.Fatal(err)
 	}
 
-	ua := &pb.AuthUserAddRequest{Name: "foo", Password: "bar"}
+	ua := &pb.AuthUserAddRequest{Name: "foo", Password: "bar", Options: &authpb.UserAddOptions{NoPassword: false}}
 	_, err = as.UserAdd(ua) // add a non-existing user
 	if err != nil {
 		t.Fatal(err)
@@ -129,7 +129,7 @@ func setupAuthStore(t *testing.T) (store *authStore, teardownfunc func(t *testin
 }
 
 func enableAuthAndCreateRoot(as *authStore) error {
-	_, err := as.UserAdd(&pb.AuthUserAddRequest{Name: "root", Password: "root"})
+	_, err := as.UserAdd(&pb.AuthUserAddRequest{Name: "root", Password: "root", Options: &authpb.UserAddOptions{NoPassword: false}})
 	if err != nil {
 		return err
 	}
@@ -151,7 +151,7 @@ func TestUserAdd(t *testing.T) {
 	as, tearDown := setupAuthStore(t)
 	defer tearDown(t)
 
-	ua := &pb.AuthUserAddRequest{Name: "foo"}
+	ua := &pb.AuthUserAddRequest{Name: "foo", Options: &authpb.UserAddOptions{NoPassword: false}}
 	_, err := as.UserAdd(ua) // add an existing user
 	if err == nil {
 		t.Fatalf("expected %v, got %v", ErrUserAlreadyExist, err)
@@ -160,7 +160,7 @@ func TestUserAdd(t *testing.T) {
 		t.Fatalf("expected %v, got %v", ErrUserAlreadyExist, err)
 	}
 
-	ua = &pb.AuthUserAddRequest{Name: ""}
+	ua = &pb.AuthUserAddRequest{Name: "", Options: &authpb.UserAddOptions{NoPassword: false}}
 	_, err = as.UserAdd(ua) // add a user with empty name
 	if err != ErrUserEmpty {
 		t.Fatal(err)
@@ -390,7 +390,7 @@ func TestListUsers(t *testing.T) {
 	as, tearDown := setupAuthStore(t)
 	defer tearDown(t)
 
-	ua := &pb.AuthUserAddRequest{Name: "user1", Password: "pwd1"}
+	ua := &pb.AuthUserAddRequest{Name: "user1", Password: "pwd1", Options: &authpb.UserAddOptions{NoPassword: false}}
 	_, err := as.UserAdd(ua) // add a non-existing user
 	if err != nil {
 		t.Fatal(err)
@@ -633,7 +633,7 @@ func TestAuthInfoFromCtxRace(t *testing.T) {
 		ctx := metadata.NewIncomingContext(context.Background(), metadata.New(map[string]string{rpctypes.TokenFieldNameGRPC: "test"}))
 		as.AuthInfoFromCtx(ctx)
 	}()
-	as.UserAdd(&pb.AuthUserAddRequest{Name: "test"})
+	as.UserAdd(&pb.AuthUserAddRequest{Name: "test", Options: &authpb.UserAddOptions{NoPassword: false}})
 	<-donec
 }
 
@@ -669,7 +669,7 @@ func TestIsAdminPermitted(t *testing.T) {
 func TestRecoverFromSnapshot(t *testing.T) {
 	as, _ := setupAuthStore(t)
 
-	ua := &pb.AuthUserAddRequest{Name: "foo"}
+	ua := &pb.AuthUserAddRequest{Name: "foo", Options: &authpb.UserAddOptions{NoPassword: false}}
 	_, err := as.UserAdd(ua) // add an existing user
 	if err == nil {
 		t.Fatalf("expected %v, got %v", ErrUserAlreadyExist, err)
@@ -678,7 +678,7 @@ func TestRecoverFromSnapshot(t *testing.T) {
 		t.Fatalf("expected %v, got %v", ErrUserAlreadyExist, err)
 	}
 
-	ua = &pb.AuthUserAddRequest{Name: ""}
+	ua = &pb.AuthUserAddRequest{Name: "", Options: &authpb.UserAddOptions{NoPassword: false}}
 	_, err = as.UserAdd(ua) // add a user with empty name
 	if err != ErrUserEmpty {
 		t.Fatal(err)
@@ -734,7 +734,7 @@ func TestHammerSimpleAuthenticate(t *testing.T) {
 	// create lots of users
 	for i := 0; i < 50; i++ {
 		u := fmt.Sprintf("user-%d", i)
-		ua := &pb.AuthUserAddRequest{Name: u, Password: "123"}
+		ua := &pb.AuthUserAddRequest{Name: u, Password: "123", Options: &authpb.UserAddOptions{NoPassword: false}}
 		if _, err := as.UserAdd(ua); err != nil {
 			t.Fatal(err)
 		}
@@ -779,7 +779,7 @@ func TestRolesOrder(t *testing.T) {
 	}
 
 	username := "user"
-	_, err = as.UserAdd(&pb.AuthUserAddRequest{Name: username, Password: "pass"})
+	_, err = as.UserAdd(&pb.AuthUserAddRequest{Name: username, Password: "pass", Options: &authpb.UserAddOptions{NoPassword: false}})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -848,3 +848,21 @@ func testAuthInfoFromCtxWithRoot(t *testing.T, opts string) {
 		t.Errorf("expected user name 'root', got %+v", ai)
 	}
 }
+
+func TestUserNoPasswordAdd(t *testing.T) {
+	as, tearDown := setupAuthStore(t)
+	defer tearDown(t)
+
+	username := "usernopass"
+	ua := &pb.AuthUserAddRequest{Name: username, Options: &authpb.UserAddOptions{NoPassword: true}}
+	_, err := as.UserAdd(ua)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	ctx := context.WithValue(context.WithValue(context.TODO(), AuthenticateParamIndex{}, uint64(1)), AuthenticateParamSimpleTokenPrefix{}, "dummy")
+	_, err = as.Authenticate(ctx, username, "")
+	if err != ErrAuthFailed {
+		t.Fatalf("expected %v, got %v", ErrAuthFailed, err)
+	}
+}

clientv3/auth.go

@@ -52,6 +52,8 @@ const (
 	PermReadWrite = authpb.READWRITE
 )
 
+type UserAddOptions authpb.UserAddOptions
+
 type Auth interface {
 	// AuthEnable enables auth of an etcd cluster.
 	AuthEnable(ctx context.Context) (*AuthEnableResponse, error)
@@ -62,6 +64,9 @@ type Auth interface {
 	// UserAdd adds a new user to an etcd cluster.
 	UserAdd(ctx context.Context, name string, password string) (*AuthUserAddResponse, error)
 
+	// UserAddWithOptions adds a new user to an etcd cluster with some options.
+	UserAddWithOptions(ctx context.Context, name string, password string, opt *UserAddOptions) (*AuthUserAddResponse, error)
+
 	// UserDelete deletes a user from an etcd cluster.
 	UserDelete(ctx context.Context, name string) (*AuthUserDeleteResponse, error)
 
@@ -123,7 +128,12 @@ func (auth *authClient) AuthDisable(ctx context.Context) (*AuthDisableResponse,
 }
 
 func (auth *authClient) UserAdd(ctx context.Context, name string, password string) (*AuthUserAddResponse, error) {
-	resp, err := auth.remote.UserAdd(ctx, &pb.AuthUserAddRequest{Name: name, Password: password}, auth.callOpts...)
+	resp, err := auth.remote.UserAdd(ctx, &pb.AuthUserAddRequest{Name: name, Password: password, Options: &authpb.UserAddOptions{NoPassword: false}}, auth.callOpts...)
+	return (*AuthUserAddResponse)(resp), toErr(ctx, err)
+}
+
+func (auth *authClient) UserAddWithOptions(ctx context.Context, name string, password string, options *UserAddOptions) (*AuthUserAddResponse, error) {
+	resp, err := auth.remote.UserAdd(ctx, &pb.AuthUserAddRequest{Name: name, Password: password, Options: (*authpb.UserAddOptions)(options)}, auth.callOpts...)
 	return (*AuthUserAddResponse)(resp), toErr(ctx, err)
 }
 

etcdctl/ctlv3/command/user_command.go

@@ -21,6 +21,7 @@ import (
 
 	"github.com/bgentry/speakeasy"
 	"github.com/spf13/cobra"
+	"go.etcd.io/etcd/clientv3"
 )
 
 var (
@@ -48,6 +49,7 @@ func NewUserCommand() *cobra.Command {
 var (
 	passwordInteractive bool
 	passwordFromFlag    string
+	noPassword          bool
 )
 
 func newUserAddCommand() *cobra.Command {
@@ -59,6 +61,7 @@ func newUserAddCommand() *cobra.Command {
 
 	cmd.Flags().BoolVar(&passwordInteractive, "interactive", true, "Read password from stdin instead of interactive terminal")
 	cmd.Flags().StringVar(&passwordFromFlag, "new-user-password", "", "Supply password from the command line flag")
+	cmd.Flags().BoolVar(&noPassword, "no-password", false, "Create a user without password (CN based auth only)")
 
 	return &cmd
 }
@@ -128,28 +131,37 @@ func userAddCommandFunc(cmd *cobra.Command, args []string) {
 	var password string
 	var user string
 
-	if passwordFromFlag != "" {
+	options := &clientv3.UserAddOptions{
-		user = args[0]
+		NoPassword: false,
-		password = passwordFromFlag
-	} else {
-		splitted := strings.SplitN(args[0], ":", 2)
-		if len(splitted) < 2 {
-			user = args[0]
-			if !passwordInteractive {
-				fmt.Scanf("%s", &password)
-			} else {
-				password = readPasswordInteractive(args[0])
-			}
-		} else {
-			user = splitted[0]
-			password = splitted[1]
-			if len(user) == 0 {
-				ExitWithError(ExitBadArgs, fmt.Errorf("empty user name is not allowed"))
-			}
-		}
 	}
 
-	resp, err := mustClientFromCmd(cmd).Auth.UserAdd(context.TODO(), user, password)
+	if !noPassword {
+		if passwordFromFlag != "" {
+			user = args[0]
+			password = passwordFromFlag
+		} else {
+			splitted := strings.SplitN(args[0], ":", 2)
+			if len(splitted) < 2 {
+				user = args[0]
+				if !passwordInteractive {
+					fmt.Scanf("%s", &password)
+				} else {
+					password = readPasswordInteractive(args[0])
+				}
+			} else {
+				user = splitted[0]
+				password = splitted[1]
+				if len(user) == 0 {
+					ExitWithError(ExitBadArgs, fmt.Errorf("empty user name is not allowed"))
+				}
+			}
+		}
+	} else {
+		user = args[0]
+		options.NoPassword = true
+	}
+
+	resp, err := mustClientFromCmd(cmd).Auth.UserAddWithOptions(context.TODO(), user, password, options)
 	if err != nil {
 		ExitWithError(ExitError, err)
 	}

etcdserver/etcdserverpb/rpc.pb.go

@@ -2750,8 +2750,9 @@ func (m *AuthenticateRequest) GetPassword() string {
 }
 
 type AuthUserAddRequest struct {
-	Name     string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Name     string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"`
+	Password string                 `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"`
+	Options  *authpb.UserAddOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
 }
 
 func (m *AuthUserAddRequest) Reset()                    { *m = AuthUserAddRequest{} }
@@ -2773,6 +2774,13 @@ func (m *AuthUserAddRequest) GetPassword() string {
 	return ""
 }
 
+func (m *AuthUserAddRequest) GetOptions() *authpb.UserAddOptions {
+	if m != nil {
+		return m.Options
+	}
+	return nil
+}
+
 type AuthUserGetRequest struct {
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 }
@@ -7613,6 +7621,16 @@ func (m *AuthUserAddRequest) MarshalTo(dAtA []byte) (int, error) {
 		i = encodeVarintRpc(dAtA, i, uint64(len(m.Password)))
 		i += copy(dAtA[i:], m.Password)
 	}
+	if m.Options != nil {
+		dAtA[i] = 0x1a
+		i++
+		i = encodeVarintRpc(dAtA, i, uint64(m.Options.Size()))
+		n44, err := m.Options.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
+		}
+		i += n44
+	}
 	return i, nil
 }
 
@@ -7887,11 +7905,11 @@ func (m *AuthRoleGrantPermissionRequest) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x12
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(m.Perm.Size()))
-		n44, err := m.Perm.MarshalTo(dAtA[i:])
+		n45, err := m.Perm.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n44
+		i += n45
 	}
 	return i, nil
 }
@@ -7951,11 +7969,11 @@ func (m *AuthEnableResponse) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0xa
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size()))
-		n45, err := m.Header.MarshalTo(dAtA[i:])
+		n46, err := m.Header.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n45
+		i += n46
 	}
 	return i, nil
 }
@@ -7979,11 +7997,11 @@ func (m *AuthDisableResponse) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0xa
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size()))
-		n46, err := m.Header.MarshalTo(dAtA[i:])
+		n47, err := m.Header.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n46
+		i += n47
 	}
 	return i, nil
 }
@@ -8007,11 +8025,11 @@ func (m *AuthenticateResponse) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0xa
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size()))
-		n47, err := m.Header.MarshalTo(dAtA[i:])
+		n48, err := m.Header.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n47
+		i += n48
 	}
 	if len(m.Token) > 0 {
 		dAtA[i] = 0x12
@@ -8041,11 +8059,11 @@ func (m *AuthUserAddResponse) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0xa
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size()))
-		n48, err := m.Header.MarshalTo(dAtA[i:])
+		n49, err := m.Header.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n48
+		i += n49
 	}
 	return i, nil
 }
@@ -8069,11 +8087,11 @@ func (m *AuthUserGetResponse) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0xa
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size()))
-		n49, err := m.Header.MarshalTo(dAtA[i:])
+		n50, err := m.Header.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n49
+		i += n50
 	}
 	if len(m.Roles) > 0 {
 		for _, s := range m.Roles {
@@ -8112,11 +8130,11 @@ func (m *AuthUserDeleteResponse) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0xa
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size()))
-		n50, err := m.Header.MarshalTo(dAtA[i:])
+		n51, err := m.Header.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n50
+		i += n51
 	}
 	return i, nil
 }
@@ -8140,11 +8158,11 @@ func (m *AuthUserChangePasswordResponse) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0xa
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size()))
-		n51, err := m.Header.MarshalTo(dAtA[i:])
+		n52, err := m.Header.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n51
+		i += n52
 	}
 	return i, nil
 }
@@ -8168,11 +8186,11 @@ func (m *AuthUserGrantRoleResponse) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0xa
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size()))
-		n52, err := m.Header.MarshalTo(dAtA[i:])
+		n53, err := m.Header.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n52
+		i += n53
 	}
 	return i, nil
 }
@@ -8196,11 +8214,11 @@ func (m *AuthUserRevokeRoleResponse) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0xa
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size()))
-		n53, err := m.Header.MarshalTo(dAtA[i:])
+		n54, err := m.Header.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n53
+		i += n54
 	}
 	return i, nil
 }
@@ -8224,11 +8242,11 @@ func (m *AuthRoleAddResponse) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0xa
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size()))
-		n54, err := m.Header.MarshalTo(dAtA[i:])
+		n55, err := m.Header.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n54
+		i += n55
 	}
 	return i, nil
 }
@@ -8252,11 +8270,11 @@ func (m *AuthRoleGetResponse) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0xa
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size()))
-		n55, err := m.Header.MarshalTo(dAtA[i:])
+		n56, err := m.Header.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n55
+		i += n56
 	}
 	if len(m.Perm) > 0 {
 		for _, msg := range m.Perm {
@@ -8292,11 +8310,11 @@ func (m *AuthRoleListResponse) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0xa
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size()))
-		n56, err := m.Header.MarshalTo(dAtA[i:])
+		n57, err := m.Header.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n56
+		i += n57
 	}
 	if len(m.Roles) > 0 {
 		for _, s := range m.Roles {
@@ -8335,11 +8353,11 @@ func (m *AuthUserListResponse) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0xa
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size()))
-		n57, err := m.Header.MarshalTo(dAtA[i:])
+		n58, err := m.Header.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n57
+		i += n58
 	}
 	if len(m.Users) > 0 {
 		for _, s := range m.Users {
@@ -8378,11 +8396,11 @@ func (m *AuthRoleDeleteResponse) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0xa
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size()))
-		n58, err := m.Header.MarshalTo(dAtA[i:])
+		n59, err := m.Header.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n58
+		i += n59
 	}
 	return i, nil
 }
@@ -8406,11 +8424,11 @@ func (m *AuthRoleGrantPermissionResponse) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0xa
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size()))
-		n59, err := m.Header.MarshalTo(dAtA[i:])
+		n60, err := m.Header.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n59
+		i += n60
 	}
 	return i, nil
 }
@@ -8434,11 +8452,11 @@ func (m *AuthRoleRevokePermissionResponse) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0xa
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size()))
-		n60, err := m.Header.MarshalTo(dAtA[i:])
+		n61, err := m.Header.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n60
+		i += n61
 	}
 	return i, nil
 }
@@ -9521,6 +9539,10 @@ func (m *AuthUserAddRequest) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovRpc(uint64(l))
 	}
+	if m.Options != nil {
+		l = m.Options.Size()
+		n += 1 + l + sovRpc(uint64(l))
+	}
 	return n
 }
 
@@ -17105,6 +17127,39 @@ func (m *AuthUserAddRequest) Unmarshal(dAtA []byte) error {
 			}
 			m.Password = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Options", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowRpc
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthRpc
+			}
+			postIndex := iNdEx + msglen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Options == nil {
+				m.Options = &authpb.UserAddOptions{}
+			}
+			if err := m.Options.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipRpc(dAtA[iNdEx:])
@@ -19781,250 +19836,251 @@ var (
 func init() { proto.RegisterFile("rpc.proto", fileDescriptorRpc) }
 
 var fileDescriptorRpc = []byte{
-	// 3907 bytes of a gzipped FileDescriptorProto
+	// 3928 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x5b, 0x5b, 0x6f, 0x23, 0xc9,
-	0x75, 0x56, 0x93, 0xe2, 0xed, 0xf0, 0x22, 0xaa, 0x24, 0xcd, 0x70, 0x38, 0x33, 0x1a, 0x6d, 0xcd,
+	0x75, 0x56, 0x93, 0xe2, 0xed, 0xf0, 0x22, 0xaa, 0x74, 0x19, 0x0e, 0x67, 0x46, 0xa3, 0xad, 0xd9,
-	0xce, 0xae, 0x76, 0x66, 0x57, 0xb4, 0x65, 0x3b, 0x01, 0x26, 0x89, 0x63, 0x8d, 0xc4, 0x9d, 0xd1,
+	0xd9, 0xd5, 0xce, 0xec, 0x8a, 0x6b, 0xd9, 0x4e, 0x80, 0x49, 0xe2, 0x58, 0x23, 0x71, 0x67, 0xb4,
-	0x4a, 0x23, 0x6a, 0x5b, 0xd4, 0xec, 0x05, 0x46, 0x84, 0x16, 0x59, 0x92, 0x3a, 0x22, 0xbb, 0xe9,
+	0xd2, 0x88, 0xda, 0x16, 0x67, 0xf6, 0x02, 0x23, 0x42, 0x8b, 0x2c, 0x49, 0x1d, 0x91, 0xdd, 0x74,
-	0xee, 0x26, 0x47, 0xda, 0x5c, 0x1c, 0x18, 0x8e, 0x81, 0xe4, 0xd1, 0x06, 0x82, 0xe4, 0x21, 0x4f,
+	0x77, 0x93, 0x23, 0x6d, 0x2e, 0x0e, 0x0c, 0xc7, 0x40, 0xf2, 0x68, 0x03, 0x41, 0xf2, 0x90, 0xa7,
-	0x41, 0x10, 0xf8, 0x21, 0xcf, 0x01, 0xf2, 0x0b, 0xf2, 0x94, 0x0b, 0xf2, 0x07, 0x82, 0x8d, 0x5f,
+	0x20, 0x08, 0xfc, 0x90, 0xe7, 0x00, 0xf9, 0x05, 0x79, 0xca, 0x05, 0xf9, 0x03, 0xc1, 0xc6, 0x2f,
-	0x92, 0x5f, 0x61, 0xd4, 0xad, 0xbb, 0xfa, 0x46, 0x8d, 0xcd, 0xdd, 0x7d, 0x91, 0xba, 0x4e, 0x9d,
+	0xc9, 0xaf, 0x30, 0xea, 0xd6, 0x5d, 0x7d, 0xa3, 0xc6, 0xa6, 0x77, 0x5f, 0xa4, 0xae, 0x53, 0xa7,
-	0x3a, 0xe7, 0xd4, 0xa9, 0xaa, 0x73, 0x4e, 0x7f, 0x5d, 0x84, 0x92, 0x33, 0xea, 0x6d, 0x8c, 0x1c,
+	0xce, 0x39, 0x75, 0xaa, 0xea, 0x9c, 0xd3, 0x5f, 0x17, 0xa1, 0xe4, 0x8c, 0x7a, 0x9b, 0x23, 0xc7,
-	0xdb, 0xb3, 0x51, 0x85, 0x78, 0xbd, 0xbe, 0x4b, 0x9c, 0x09, 0x71, 0x46, 0xa7, 0xcd, 0xe5, 0x73,
+	0xf6, 0x6c, 0x54, 0x21, 0x5e, 0xaf, 0xef, 0x12, 0x67, 0x42, 0x9c, 0xd1, 0x69, 0x73, 0xf9, 0xdc,
-	0xfb, 0xdc, 0x66, 0x1d, 0x2d, 0xfa, 0xc4, 0x79, 0x9a, 0x77, 0x28, 0x4f, 0x6b, 0x38, 0xe9, 0xf5,
+	0x3e, 0xb7, 0x59, 0x47, 0x8b, 0x3e, 0x71, 0x9e, 0xe6, 0x6d, 0xca, 0xd3, 0x1a, 0x4e, 0x7a, 0x3d,
-	0xd8, 0x9f, 0xd1, 0x69, 0xeb, 0x72, 0x22, 0xba, 0xee, 0xb2, 0x2e, 0x63, 0xec, 0x5d, 0xb0, 0x3f,
+	0xf6, 0x67, 0x74, 0xda, 0xba, 0x9c, 0x88, 0xae, 0x3b, 0xac, 0xcb, 0x18, 0x7b, 0x17, 0xec, 0xcf,
-	0xa3, 0x53, 0xf6, 0x4f, 0x74, 0xde, 0x3b, 0xb7, 0xed, 0xf3, 0x01, 0x69, 0x19, 0x23, 0xb3, 0x65,
+	0xe8, 0x94, 0xfd, 0x13, 0x9d, 0x77, 0xcf, 0x6d, 0xfb, 0x7c, 0x40, 0x5a, 0xc6, 0xc8, 0x6c, 0x19,
-	0x58, 0x96, 0xed, 0x19, 0x9e, 0x69, 0x5b, 0x2e, 0xef, 0xc5, 0x7f, 0xa9, 0x41, 0x4d, 0x27, 0xee,
+	0x96, 0x65, 0x7b, 0x86, 0x67, 0xda, 0x96, 0xcb, 0x7b, 0xf1, 0x5f, 0x6a, 0x50, 0xd3, 0x89, 0x3b,
-	0xc8, 0xb6, 0x5c, 0xf2, 0x82, 0x18, 0x7d, 0xe2, 0xa0, 0xfb, 0x00, 0xbd, 0xc1, 0xd8, 0xf5, 0x88,
+	0xb2, 0x2d, 0x97, 0x3c, 0x27, 0x46, 0x9f, 0x38, 0xe8, 0x1e, 0x40, 0x6f, 0x30, 0x76, 0x3d, 0xe2,
-	0x73, 0x62, 0xf6, 0x1b, 0xda, 0x9a, 0xb6, 0x3e, 0xaf, 0x97, 0x04, 0x65, 0xb7, 0x8f, 0xee, 0x42,
+	0x9c, 0x98, 0xfd, 0x86, 0xb6, 0xae, 0x6d, 0xcc, 0xeb, 0x25, 0x41, 0xd9, 0xeb, 0xa3, 0x3b, 0x50,
-	0x69, 0x48, 0x86, 0xa7, 0xbc, 0x37, 0xc3, 0x7a, 0x8b, 0x9c, 0xb0, 0xdb, 0x47, 0x4d, 0x28, 0x3a,
+	0x1a, 0x92, 0xe1, 0x29, 0xef, 0xcd, 0xb0, 0xde, 0x22, 0x27, 0xec, 0xf5, 0x51, 0x13, 0x8a, 0x0e,
-	0x64, 0x62, 0xba, 0xa6, 0x6d, 0x35, 0xb2, 0x6b, 0xda, 0x7a, 0x56, 0xf7, 0xdb, 0x74, 0xa0, 0x63,
+	0x99, 0x98, 0xae, 0x69, 0x5b, 0x8d, 0xec, 0xba, 0xb6, 0x91, 0xd5, 0xfd, 0x36, 0x1d, 0xe8, 0x18,
-	0x9c, 0x79, 0x27, 0x1e, 0x71, 0x86, 0x8d, 0x79, 0x3e, 0x90, 0x12, 0xba, 0xc4, 0x19, 0xe2, 0x9f,
+	0x67, 0xde, 0x89, 0x47, 0x9c, 0x61, 0x63, 0x9e, 0x0f, 0xa4, 0x84, 0x2e, 0x71, 0x86, 0xf8, 0x27,
-	0xe6, 0xa0, 0xa2, 0x1b, 0xd6, 0x39, 0xd1, 0xc9, 0x8f, 0xc6, 0xc4, 0xf5, 0x50, 0x1d, 0xb2, 0x97,
+	0x39, 0xa8, 0xe8, 0x86, 0x75, 0x4e, 0x74, 0xf2, 0xc3, 0x31, 0x71, 0x3d, 0x54, 0x87, 0xec, 0x25,
-	0xe4, 0x9a, 0xa9, 0xaf, 0xe8, 0xf4, 0x91, 0x8f, 0xb7, 0xce, 0xc9, 0x09, 0xb1, 0xb8, 0xe2, 0x0a,
+	0xb9, 0x66, 0xea, 0x2b, 0x3a, 0x7d, 0xe4, 0xe3, 0xad, 0x73, 0x72, 0x42, 0x2c, 0xae, 0xb8, 0x42,
-	0x1d, 0x6f, 0x9d, 0x93, 0xb6, 0xd5, 0x47, 0xcb, 0x90, 0x1b, 0x98, 0x43, 0xd3, 0x13, 0x5a, 0x79,
+	0xc7, 0x5b, 0xe7, 0xa4, 0x6d, 0xf5, 0xd1, 0x32, 0xe4, 0x06, 0xe6, 0xd0, 0xf4, 0x84, 0x56, 0xde,
-	0x23, 0x64, 0xce, 0x7c, 0xc4, 0x9c, 0x6d, 0x00, 0xd7, 0x76, 0xbc, 0x13, 0xdb, 0xe9, 0x13, 0xa7,
+	0x08, 0x99, 0x33, 0x1f, 0x31, 0x67, 0x07, 0xc0, 0xb5, 0x1d, 0xef, 0xc4, 0x76, 0xfa, 0xc4, 0x69,
-	0x91, 0x5b, 0xd3, 0xd6, 0x6b, 0x9b, 0x6f, 0x6f, 0xa8, 0x0b, 0xb1, 0xa1, 0x1a, 0xb4, 0x71, 0x64,
+	0xe4, 0xd6, 0xb5, 0x8d, 0xda, 0xd6, 0xdb, 0x9b, 0xea, 0x42, 0x6c, 0xaa, 0x06, 0x6d, 0x1e, 0xdb,
-	0x3b, 0x5e, 0x87, 0xf2, 0xea, 0x25, 0x57, 0x3e, 0xa2, 0x0f, 0xa1, 0xcc, 0x84, 0x78, 0x86, 0x73,
+	0x8e, 0xd7, 0xa1, 0xbc, 0x7a, 0xc9, 0x95, 0x8f, 0xe8, 0x23, 0x28, 0x33, 0x21, 0x9e, 0xe1, 0x9c,
-	0x4e, 0xbc, 0x46, 0x9e, 0x49, 0x79, 0x74, 0x83, 0x94, 0x2e, 0x63, 0xd6, 0x99, 0x7a, 0xfe, 0x8c,
+	0x13, 0xaf, 0x91, 0x67, 0x52, 0x1e, 0xde, 0x20, 0xa5, 0xcb, 0x98, 0x75, 0xa6, 0x9e, 0x3f, 0x23,
-	0x30, 0x54, 0x5c, 0xe2, 0x98, 0xc6, 0xc0, 0xfc, 0xc2, 0x38, 0x1d, 0x90, 0x46, 0x61, 0x4d, 0x5b,
+	0x0c, 0x15, 0x97, 0x38, 0xa6, 0x31, 0x30, 0xbf, 0x34, 0x4e, 0x07, 0xa4, 0x51, 0x58, 0xd7, 0x36,
-	0x2f, 0xea, 0x21, 0x1a, 0x9d, 0xff, 0x25, 0xb9, 0x76, 0x4f, 0x6c, 0x6b, 0x70, 0xdd, 0x28, 0x32,
+	0x8a, 0x7a, 0x88, 0x46, 0xe7, 0x7f, 0x49, 0xae, 0xdd, 0x13, 0xdb, 0x1a, 0x5c, 0x37, 0x8a, 0x8c,
-	0x86, 0x22, 0x25, 0x74, 0xac, 0xc1, 0x35, 0x5b, 0x34, 0x7b, 0x6c, 0x79, 0xbc, 0xb7, 0xc4, 0x7a,
+	0xa1, 0x48, 0x09, 0x1d, 0x6b, 0x70, 0xcd, 0x16, 0xcd, 0x1e, 0x5b, 0x1e, 0xef, 0x2d, 0xb1, 0xde,
-	0x4b, 0x8c, 0xc2, 0xba, 0xd7, 0xa1, 0x3e, 0x34, 0xad, 0x93, 0xa1, 0xdd, 0x3f, 0xf1, 0x1d, 0x02,
+	0x12, 0xa3, 0xb0, 0xee, 0x0d, 0xa8, 0x0f, 0x4d, 0xeb, 0x64, 0x68, 0xf7, 0x4f, 0x7c, 0x87, 0x00,
-	0xcc, 0x21, 0xb5, 0xa1, 0x69, 0xbd, 0xb4, 0xfb, 0xba, 0x74, 0x0b, 0xe5, 0x34, 0xae, 0xc2, 0x9c,
+	0x73, 0x48, 0x6d, 0x68, 0x5a, 0x2f, 0xec, 0xbe, 0x2e, 0xdd, 0x42, 0x39, 0x8d, 0xab, 0x30, 0x67,
-	0x65, 0xc1, 0x69, 0x5c, 0xa9, 0x9c, 0x1b, 0xb0, 0x44, 0x65, 0xf6, 0x1c, 0x62, 0x78, 0x24, 0x60,
+	0x59, 0x70, 0x1a, 0x57, 0x2a, 0xe7, 0x26, 0x2c, 0x51, 0x99, 0x3d, 0x87, 0x18, 0x1e, 0x09, 0x98,
-	0xae, 0x30, 0xe6, 0xc5, 0xa1, 0x69, 0x6d, 0xb3, 0x9e, 0x10, 0xbf, 0x71, 0x15, 0xe3, 0xaf, 0x0a,
+	0x2b, 0x8c, 0x79, 0x71, 0x68, 0x5a, 0x3b, 0xac, 0x27, 0xc4, 0x6f, 0x5c, 0xc5, 0xf8, 0xab, 0x82,
-	0x7e, 0xe3, 0x2a, 0xcc, 0x8f, 0x37, 0xa0, 0xe4, 0xfb, 0x1c, 0x15, 0x61, 0xfe, 0xa0, 0x73, 0xd0,
+	0xdf, 0xb8, 0x0a, 0xf3, 0xe3, 0x4d, 0x28, 0xf9, 0x3e, 0x47, 0x45, 0x98, 0x3f, 0xec, 0x1c, 0xb6,
-	0xae, 0xcf, 0x21, 0x80, 0xfc, 0xd6, 0xd1, 0x76, 0xfb, 0x60, 0xa7, 0xae, 0xa1, 0x32, 0x14, 0x76,
+	0xeb, 0x73, 0x08, 0x20, 0xbf, 0x7d, 0xbc, 0xd3, 0x3e, 0xdc, 0xad, 0x6b, 0xa8, 0x0c, 0x85, 0xdd,
-	0xda, 0xbc, 0x91, 0xc1, 0xcf, 0x00, 0x02, 0xef, 0xa2, 0x02, 0x64, 0xf7, 0xda, 0x9f, 0xd5, 0xe7,
+	0x36, 0x6f, 0x64, 0xf0, 0x53, 0x80, 0xc0, 0xbb, 0xa8, 0x00, 0xd9, 0xfd, 0xf6, 0xe7, 0xf5, 0x39,
-	0x28, 0xcf, 0xab, 0xb6, 0x7e, 0xb4, 0xdb, 0x39, 0xa8, 0x6b, 0x74, 0xf0, 0xb6, 0xde, 0xde, 0xea,
+	0xca, 0xf3, 0xaa, 0xad, 0x1f, 0xef, 0x75, 0x0e, 0xeb, 0x1a, 0x1d, 0xbc, 0xa3, 0xb7, 0xb7, 0xbb,
-	0xb6, 0xeb, 0x19, 0xca, 0xf1, 0xb2, 0xb3, 0x53, 0xcf, 0xa2, 0x12, 0xe4, 0x5e, 0x6d, 0xed, 0x1f,
+	0xed, 0x7a, 0x86, 0x72, 0xbc, 0xe8, 0xec, 0xd6, 0xb3, 0xa8, 0x04, 0xb9, 0x57, 0xdb, 0x07, 0x2f,
-	0xb7, 0xeb, 0xf3, 0xf8, 0x17, 0x1a, 0x54, 0xc5, 0x7a, 0xf1, 0x33, 0x81, 0xbe, 0x0b, 0xf9, 0x0b,
+	0xdb, 0xf5, 0x79, 0xfc, 0x73, 0x0d, 0xaa, 0x62, 0xbd, 0xf8, 0x99, 0x40, 0xdf, 0x81, 0xfc, 0x05,
-	0x76, 0x2e, 0xd8, 0x56, 0x2c, 0x6f, 0xde, 0x8b, 0x2c, 0x6e, 0xe8, 0xec, 0xe8, 0x82, 0x17, 0x61,
+	0x3b, 0x17, 0x6c, 0x2b, 0x96, 0xb7, 0xee, 0x46, 0x16, 0x37, 0x74, 0x76, 0x74, 0xc1, 0x8b, 0x30,
-	0xc8, 0x5e, 0x4e, 0xdc, 0x46, 0x66, 0x2d, 0xbb, 0x5e, 0xde, 0xac, 0x6f, 0xf0, 0x03, 0xbb, 0xb1,
+	0x64, 0x2f, 0x27, 0x6e, 0x23, 0xb3, 0x9e, 0xdd, 0x28, 0x6f, 0xd5, 0x37, 0xf9, 0x81, 0xdd, 0xdc,
-	0x47, 0xae, 0x5f, 0x19, 0x83, 0x31, 0xd1, 0x69, 0x27, 0x42, 0x30, 0x3f, 0xb4, 0x1d, 0xc2, 0x76,
+	0x27, 0xd7, 0xaf, 0x8c, 0xc1, 0x98, 0xe8, 0xb4, 0x13, 0x21, 0x98, 0x1f, 0xda, 0x0e, 0x61, 0x3b,
-	0x6c, 0x51, 0x67, 0xcf, 0x74, 0x1b, 0xb3, 0x45, 0x13, 0xbb, 0x95, 0x37, 0xf0, 0x2f, 0x35, 0x80,
+	0xb6, 0xa8, 0xb3, 0x67, 0xba, 0x8d, 0xd9, 0xa2, 0x89, 0xdd, 0xca, 0x1b, 0xf8, 0x17, 0x1a, 0xc0,
-	0xc3, 0xb1, 0x97, 0x7e, 0x34, 0x96, 0x21, 0x37, 0xa1, 0x82, 0xc5, 0xb1, 0xe0, 0x0d, 0x76, 0x26,
+	0xd1, 0xd8, 0x4b, 0x3f, 0x1a, 0xcb, 0x90, 0x9b, 0x50, 0xc1, 0xe2, 0x58, 0xf0, 0x06, 0x3b, 0x13,
-	0x88, 0xe1, 0x12, 0xff, 0x4c, 0xd0, 0x06, 0xba, 0x0d, 0x85, 0x91, 0x43, 0x26, 0x27, 0x97, 0x13,
+	0xc4, 0x70, 0x89, 0x7f, 0x26, 0x68, 0x03, 0xdd, 0x82, 0xc2, 0xc8, 0x21, 0x93, 0x93, 0xcb, 0x09,
-	0xa6, 0xa4, 0xa8, 0xe7, 0x69, 0x73, 0x6f, 0x82, 0xde, 0x82, 0x8a, 0x79, 0x6e, 0xd9, 0x0e, 0x39,
+	0x53, 0x52, 0xd4, 0xf3, 0xb4, 0xb9, 0x3f, 0x41, 0x6f, 0x41, 0xc5, 0x3c, 0xb7, 0x6c, 0x87, 0x9c,
-	0xe1, 0xb2, 0x72, 0xac, 0xb7, 0xcc, 0x69, 0xcc, 0x6e, 0x85, 0x85, 0x0b, 0xce, 0xab, 0x2c, 0xfb,
+	0x70, 0x59, 0x39, 0xd6, 0x5b, 0xe6, 0x34, 0x66, 0xb7, 0xc2, 0xc2, 0x05, 0xe7, 0x55, 0x96, 0x03,
-	0x94, 0x84, 0x2d, 0x28, 0x33, 0x53, 0x67, 0x72, 0xdf, 0x7b, 0x81, 0x8d, 0x19, 0x36, 0x2c, 0xee,
+	0x4a, 0xc2, 0x16, 0x94, 0x99, 0xa9, 0x33, 0xb9, 0xef, 0xbd, 0xc0, 0xc6, 0x0c, 0x1b, 0x16, 0x77,
-	0x42, 0x61, 0x35, 0xfe, 0x21, 0xa0, 0x1d, 0x32, 0x20, 0x1e, 0x99, 0x25, 0x7a, 0x28, 0x3e, 0xc9,
+	0xa1, 0xb0, 0x1a, 0xff, 0x00, 0xd0, 0x2e, 0x19, 0x10, 0x8f, 0xcc, 0x12, 0x3d, 0x14, 0x9f, 0x64,
-	0xaa, 0x3e, 0xc1, 0x3f, 0xd7, 0x60, 0x29, 0x24, 0x7e, 0xa6, 0x69, 0x35, 0xa0, 0xd0, 0x67, 0xc2,
+	0x55, 0x9f, 0xe0, 0x9f, 0x69, 0xb0, 0x14, 0x12, 0x3f, 0xd3, 0xb4, 0x1a, 0x50, 0xe8, 0x33, 0x61,
-	0xb8, 0x05, 0x59, 0x5d, 0x36, 0xd1, 0x13, 0x28, 0x0a, 0x03, 0xdc, 0x46, 0x36, 0x65, 0xd3, 0x14,
+	0xdc, 0x82, 0xac, 0x2e, 0x9b, 0xe8, 0x31, 0x14, 0x85, 0x01, 0x6e, 0x23, 0x9b, 0xb2, 0x69, 0x0a,
-	0xb8, 0x4d, 0x2e, 0xfe, 0x65, 0x06, 0x4a, 0x62, 0xa2, 0x9d, 0x11, 0xda, 0x82, 0xaa, 0xc3, 0x1b,
+	0xdc, 0x26, 0x17, 0xff, 0x22, 0x03, 0x25, 0x31, 0xd1, 0xce, 0x08, 0x6d, 0x43, 0xd5, 0xe1, 0x8d,
-	0x27, 0x6c, 0x3e, 0xc2, 0xa2, 0x66, 0x7a, 0x10, 0x7a, 0x31, 0xa7, 0x57, 0xc4, 0x10, 0x46, 0x46,
+	0x13, 0x36, 0x1f, 0x61, 0x51, 0x33, 0x3d, 0x08, 0x3d, 0x9f, 0xd3, 0x2b, 0x62, 0x08, 0x23, 0xa3,
-	0xbf, 0x07, 0x65, 0x29, 0x62, 0x34, 0xf6, 0x84, 0xcb, 0x1b, 0x61, 0x01, 0xc1, 0xfe, 0x7b, 0x31,
+	0xdf, 0x83, 0xb2, 0x14, 0x31, 0x1a, 0x7b, 0xc2, 0xe5, 0x8d, 0xb0, 0x80, 0x60, 0xff, 0x3d, 0x9f,
-	0xa7, 0x83, 0x60, 0x3f, 0x1c, 0x7b, 0xa8, 0x0b, 0xcb, 0x72, 0x30, 0x9f, 0x8d, 0x30, 0x23, 0xcb,
+	0xd3, 0x41, 0xb0, 0x1f, 0x8d, 0x3d, 0xd4, 0x85, 0x65, 0x39, 0x98, 0xcf, 0x46, 0x98, 0x91, 0x65,
-	0xa4, 0xac, 0x85, 0xa5, 0xc4, 0x97, 0xea, 0xc5, 0x9c, 0x8e, 0xc4, 0x78, 0xa5, 0x53, 0x35, 0xc9,
+	0x52, 0xd6, 0xc3, 0x52, 0xe2, 0x4b, 0xf5, 0x7c, 0x4e, 0x47, 0x62, 0xbc, 0xd2, 0xa9, 0x9a, 0xe4,
-	0xbb, 0xe2, 0xc1, 0x3b, 0x66, 0x52, 0xf7, 0xca, 0x8a, 0x9b, 0xd4, 0xbd, 0xb2, 0x9e, 0x95, 0xa0,
+	0x5d, 0xf1, 0xe0, 0x1d, 0x33, 0xa9, 0x7b, 0x65, 0xc5, 0x4d, 0xea, 0x5e, 0x59, 0x4f, 0x4b, 0x50,
-	0x20, 0x5a, 0xf8, 0x5f, 0x32, 0x00, 0x72, 0x35, 0x3a, 0x23, 0xb4, 0x03, 0x35, 0x47, 0xb4, 0x42,
+	0x10, 0x2d, 0xfc, 0x2f, 0x19, 0x00, 0xb9, 0x1a, 0x9d, 0x11, 0xda, 0x85, 0x9a, 0x23, 0x5a, 0x21,
-	0xde, 0xba, 0x9b, 0xe8, 0x2d, 0xb1, 0x88, 0x73, 0x7a, 0x55, 0x0e, 0xe2, 0xc6, 0x7d, 0x1f, 0x2a,
+	0x6f, 0xdd, 0x49, 0xf4, 0x96, 0x58, 0xc4, 0x39, 0xbd, 0x2a, 0x07, 0x71, 0xe3, 0xbe, 0x07, 0x15,
-	0xbe, 0x94, 0xc0, 0x61, 0x77, 0x12, 0x1c, 0xe6, 0x4b, 0x28, 0xcb, 0x01, 0xd4, 0x65, 0x9f, 0xc0,
+	0x5f, 0x4a, 0xe0, 0xb0, 0xdb, 0x09, 0x0e, 0xf3, 0x25, 0x94, 0xe5, 0x00, 0xea, 0xb2, 0x4f, 0x61,
-	0x8a, 0x3f, 0x3e, 0xc1, 0x67, 0x6f, 0x4d, 0xf1, 0x99, 0x2f, 0x70, 0x49, 0x4a, 0x50, 0xbd, 0xa6,
+	0xc5, 0x1f, 0x9f, 0xe0, 0xb3, 0xb7, 0xa6, 0xf8, 0xcc, 0x17, 0xb8, 0x24, 0x25, 0xa8, 0x5e, 0x53,
-	0x1a, 0x16, 0xb8, 0xed, 0x4e, 0x82, 0xdb, 0xe2, 0x86, 0x51, 0xc7, 0x01, 0xcd, 0x97, 0xbc, 0x89,
+	0x0d, 0x0b, 0xdc, 0x76, 0x3b, 0xc1, 0x6d, 0x71, 0xc3, 0xa8, 0xe3, 0x80, 0xe6, 0x4b, 0xde, 0xc4,
-	0xff, 0x2f, 0x0b, 0x85, 0x6d, 0x7b, 0x38, 0x32, 0x1c, 0xba, 0x1a, 0x79, 0x87, 0xb8, 0xe3, 0x81,
+	0xff, 0x97, 0x85, 0xc2, 0x8e, 0x3d, 0x1c, 0x19, 0x0e, 0x5d, 0x8d, 0xbc, 0x43, 0xdc, 0xf1, 0xc0,
-	0xc7, 0xdc, 0x55, 0xdb, 0x7c, 0x18, 0x96, 0x28, 0xd8, 0xe4, 0x7f, 0x9d, 0xb1, 0xea, 0x62, 0x08,
+	0x63, 0xee, 0xaa, 0x6d, 0x3d, 0x08, 0x4b, 0x14, 0x6c, 0xf2, 0xbf, 0xce, 0x58, 0x75, 0x31, 0x84,
-	0x1d, 0x2c, 0xd2, 0x63, 0xe6, 0x0d, 0x06, 0x8b, 0xe4, 0x28, 0x86, 0xc8, 0x83, 0x9c, 0x0d, 0x0e,
+	0x0e, 0x16, 0xe9, 0x31, 0xf3, 0x06, 0x83, 0x45, 0x72, 0x14, 0x43, 0xe4, 0x41, 0xce, 0x06, 0x07,
-	0x72, 0x13, 0x0a, 0x13, 0xe2, 0x04, 0x29, 0xfd, 0xc5, 0x9c, 0x2e, 0x09, 0xe8, 0x3d, 0x58, 0x88,
+	0xb9, 0x09, 0x85, 0x09, 0x71, 0x82, 0x94, 0xfe, 0x7c, 0x4e, 0x97, 0x04, 0xf4, 0x1e, 0x2c, 0x44,
-	0xa6, 0x97, 0x9c, 0xe0, 0xa9, 0xf5, 0xc2, 0xd9, 0xe8, 0x21, 0x54, 0x42, 0x39, 0x2e, 0x2f, 0xf8,
+	0xd3, 0x4b, 0x4e, 0xf0, 0xd4, 0x7a, 0xe1, 0x6c, 0xf4, 0x00, 0x2a, 0xa1, 0x1c, 0x97, 0x17, 0x7c,
-	0xca, 0x43, 0x25, 0xc5, 0xdd, 0x92, 0x71, 0x95, 0xe6, 0xe3, 0xca, 0x8b, 0x39, 0x19, 0x59, 0x6f,
+	0xe5, 0xa1, 0x92, 0xe2, 0x56, 0x65, 0x5c, 0xa5, 0xf9, 0xb8, 0xf2, 0x7c, 0x4e, 0x46, 0xd6, 0x55,
-	0xc9, 0xc8, 0x5a, 0x14, 0xa3, 0x44, 0x6c, 0x0d, 0x05, 0x99, 0x1f, 0x84, 0x83, 0x0c, 0xfe, 0x01,
+	0x19, 0x59, 0x8b, 0x62, 0x94, 0x88, 0xad, 0xa1, 0x20, 0xf3, 0xfd, 0x70, 0x90, 0xc1, 0xdf, 0x87,
-	0x54, 0x43, 0x0e, 0xa2, 0x79, 0xa7, 0xfd, 0xf1, 0xf1, 0xd6, 0x3e, 0x4f, 0x52, 0xcf, 0x59, 0x5e,
+	0x6a, 0xc8, 0x41, 0x34, 0xef, 0xb4, 0x3f, 0x79, 0xb9, 0x7d, 0xc0, 0x93, 0xd4, 0x33, 0x96, 0x97,
-	0xd2, 0xeb, 0x1a, 0xcd, 0x75, 0xfb, 0xed, 0xa3, 0xa3, 0x7a, 0x06, 0x55, 0xa1, 0x74, 0xd0, 0xe9,
+	0xf4, 0xba, 0x46, 0x73, 0xdd, 0x41, 0xfb, 0xf8, 0xb8, 0x9e, 0x41, 0x55, 0x28, 0x1d, 0x76, 0xba,
-	0x9e, 0x70, 0xae, 0x2c, 0x7e, 0xee, 0x4b, 0x10, 0x49, 0x4e, 0xc9, 0x6d, 0x73, 0x4a, 0x6e, 0xd3,
+	0x27, 0x9c, 0x2b, 0x8b, 0x9f, 0xf9, 0x12, 0x44, 0x92, 0x53, 0x72, 0xdb, 0x9c, 0x92, 0xdb, 0x34,
-	0x64, 0x6e, 0xcb, 0x04, 0xb9, 0x8d, 0xa5, 0xb9, 0xfd, 0xf6, 0xd6, 0x51, 0xbb, 0x3e, 0xff, 0xac,
+	0x99, 0xdb, 0x32, 0x41, 0x6e, 0x63, 0x69, 0xee, 0xa0, 0xbd, 0x7d, 0xdc, 0xae, 0xcf, 0x3f, 0xad,
-	0x06, 0x15, 0xee, 0xdf, 0x93, 0xb1, 0x45, 0x53, 0xed, 0x3f, 0x68, 0x00, 0xc1, 0x69, 0x42, 0x2d,
+	0x41, 0x85, 0xfb, 0xf7, 0x64, 0x6c, 0xd1, 0x54, 0xfb, 0x0f, 0x1a, 0x40, 0x70, 0x9a, 0x50, 0x0b,
-	0x28, 0xf4, 0xb8, 0x9e, 0x86, 0xc6, 0x82, 0xd1, 0x4a, 0xe2, 0x92, 0xe9, 0x92, 0x0b, 0x7d, 0x1b,
+	0x0a, 0x3d, 0xae, 0xa7, 0xa1, 0xb1, 0x60, 0xb4, 0x92, 0xb8, 0x64, 0xba, 0xe4, 0x42, 0xdf, 0x82,
-	0x0a, 0xee, 0xb8, 0xd7, 0x23, 0xae, 0x4c, 0x79, 0xb7, 0xa3, 0xf1, 0x50, 0x44, 0x2b, 0x5d, 0xf2,
+	0x82, 0x3b, 0xee, 0xf5, 0x88, 0x2b, 0x53, 0xde, 0xad, 0x68, 0x3c, 0x14, 0xd1, 0x4a, 0x97, 0x7c,
-	0xd1, 0x21, 0x67, 0x86, 0x39, 0x18, 0xb3, 0x04, 0x38, 0x7d, 0x88, 0xe0, 0xc3, 0x7f, 0xa7, 0x41,
+	0x74, 0xc8, 0x99, 0x61, 0x0e, 0xc6, 0x2c, 0x01, 0x4e, 0x1f, 0x22, 0xf8, 0xf0, 0xdf, 0x69, 0x50,
-	0x59, 0xd9, 0xbc, 0xbf, 0x65, 0x10, 0xbe, 0x07, 0x25, 0x66, 0x03, 0xe9, 0x8b, 0x30, 0x5c, 0xd4,
+	0x56, 0x36, 0xef, 0x6f, 0x18, 0x84, 0xef, 0x42, 0x89, 0xd9, 0x40, 0xfa, 0x22, 0x0c, 0x17, 0xf5,
-	0x03, 0x02, 0xfa, 0x1d, 0x28, 0xc9, 0x13, 0x20, 0x23, 0x71, 0x23, 0x59, 0x6c, 0x67, 0xa4, 0x07,
+	0x80, 0x80, 0x7e, 0x07, 0x4a, 0xf2, 0x04, 0xc8, 0x48, 0xdc, 0x48, 0x16, 0xdb, 0x19, 0xe9, 0x01,
-	0xac, 0x78, 0x0f, 0x16, 0x99, 0x57, 0x7a, 0xb4, 0xb8, 0x96, 0x7e, 0x54, 0xcb, 0x4f, 0x2d, 0x52,
+	0x2b, 0xde, 0x87, 0x45, 0xe6, 0x95, 0x1e, 0x2d, 0xae, 0xa5, 0x1f, 0xd5, 0xf2, 0x53, 0x8b, 0x94,
-	0x7e, 0x36, 0xa1, 0x38, 0xba, 0xb8, 0x76, 0xcd, 0x9e, 0x31, 0x10, 0x56, 0xf8, 0x6d, 0xfc, 0x11,
+	0x9f, 0x4d, 0x28, 0x8e, 0x2e, 0xae, 0x5d, 0xb3, 0x67, 0x0c, 0x84, 0x15, 0x7e, 0x1b, 0x7f, 0x0c,
-	0x20, 0x55, 0xd8, 0x2c, 0xd3, 0xc5, 0x55, 0x28, 0xbf, 0x30, 0xdc, 0x0b, 0x61, 0x12, 0x7e, 0x02,
+	0x48, 0x15, 0x36, 0xcb, 0x74, 0x71, 0x15, 0xca, 0xcf, 0x0d, 0xf7, 0x42, 0x98, 0x84, 0x1f, 0x43,
-	0x55, 0xda, 0xdc, 0x7b, 0xf5, 0x06, 0x36, 0xb2, 0x97, 0x03, 0xc9, 0x3d, 0x93, 0xcf, 0x11, 0xcc,
+	0x95, 0x36, 0xf7, 0x5f, 0xbd, 0x81, 0x8d, 0xec, 0xe5, 0x40, 0x72, 0xcf, 0xe4, 0x73, 0x04, 0xf3,
-	0x5f, 0x18, 0xee, 0x05, 0x9b, 0x68, 0x55, 0x67, 0xcf, 0xe8, 0x3d, 0xa8, 0xf7, 0xf8, 0x24, 0x4f,
+	0x17, 0x86, 0x7b, 0xc1, 0x26, 0x5a, 0xd5, 0xd9, 0x33, 0x7a, 0x0f, 0xea, 0x3d, 0x3e, 0xc9, 0x93,
-	0x22, 0xaf, 0x0c, 0x0b, 0x82, 0xee, 0x57, 0x82, 0x9f, 0x42, 0x85, 0xcf, 0xe1, 0xab, 0x36, 0x02,
+	0xc8, 0x2b, 0xc3, 0x82, 0xa0, 0xfb, 0x95, 0xe0, 0x67, 0x50, 0xe1, 0x73, 0xf8, 0x6d, 0x1b, 0x81,
-	0x2f, 0xc2, 0xc2, 0x91, 0x65, 0x8c, 0xdc, 0x0b, 0x5b, 0x66, 0x37, 0x3a, 0xe9, 0x7a, 0x40, 0x9b,
+	0x17, 0x61, 0xe1, 0xd8, 0x32, 0x46, 0xee, 0x85, 0x2d, 0xb3, 0x1b, 0x9d, 0x74, 0x3d, 0xa0, 0xcd,
-	0x49, 0xe3, 0xbb, 0xb0, 0xe0, 0x90, 0xa1, 0x61, 0x5a, 0xa6, 0x75, 0x7e, 0x72, 0x7a, 0xed, 0x11,
+	0xa4, 0xf1, 0x5d, 0x58, 0x70, 0xc8, 0xd0, 0x30, 0x2d, 0xd3, 0x3a, 0x3f, 0x39, 0xbd, 0xf6, 0x88,
-	0x57, 0xbc, 0x30, 0xd5, 0x7c, 0xf2, 0x33, 0x4a, 0xa5, 0xa6, 0x9d, 0x0e, 0xec, 0x53, 0x11, 0xe6,
+	0x2b, 0x5e, 0x98, 0x6a, 0x3e, 0xf9, 0x29, 0xa5, 0x52, 0xd3, 0x4e, 0x07, 0xf6, 0xa9, 0x08, 0x73,
-	0xd8, 0x33, 0xfe, 0x59, 0x06, 0x2a, 0x9f, 0x18, 0x5e, 0x4f, 0x2e, 0x1d, 0xda, 0x85, 0x9a, 0x1f,
+	0xec, 0x19, 0xff, 0x34, 0x03, 0x95, 0x4f, 0x0d, 0xaf, 0x27, 0x97, 0x0e, 0xed, 0x41, 0xcd, 0x0f,
-	0xdc, 0x18, 0x45, 0xd8, 0x12, 0x49, 0xb1, 0x6c, 0x8c, 0x2c, 0xa5, 0x65, 0x76, 0xac, 0xf6, 0x54,
+	0x6e, 0x8c, 0x22, 0x6c, 0x89, 0xa4, 0x58, 0x36, 0x46, 0x96, 0xd2, 0x32, 0x3b, 0x56, 0x7b, 0x2a,
-	0x02, 0x13, 0x65, 0x58, 0x3d, 0x32, 0xf0, 0x45, 0x65, 0xd2, 0x45, 0x31, 0x46, 0x55, 0x94, 0x4a,
+	0x81, 0x89, 0x32, 0xac, 0x1e, 0x19, 0xf8, 0xa2, 0x32, 0xe9, 0xa2, 0x18, 0xa3, 0x2a, 0x4a, 0x25,
-	0x40, 0x1d, 0xa8, 0x8f, 0x1c, 0xfb, 0xdc, 0x21, 0xae, 0xeb, 0x0b, 0xe3, 0x69, 0x0c, 0x27, 0x08,
+	0xa0, 0x0e, 0xd4, 0x47, 0x8e, 0x7d, 0xee, 0x10, 0xd7, 0xf5, 0x85, 0xf1, 0x34, 0x86, 0x13, 0x84,
-	0x3b, 0x14, 0xac, 0x81, 0xb8, 0x85, 0x51, 0x98, 0xf4, 0x6c, 0x21, 0xa8, 0x67, 0x78, 0x70, 0xfa,
+	0x1d, 0x09, 0xd6, 0x40, 0xdc, 0xc2, 0x28, 0x4c, 0x7a, 0xba, 0x10, 0xd4, 0x33, 0x3c, 0x38, 0xfd,
-	0xaf, 0x0c, 0xa0, 0xf8, 0xa4, 0x7e, 0xd3, 0x12, 0xef, 0x11, 0xd4, 0x5c, 0xcf, 0x70, 0x62, 0x9b,
+	0x57, 0x06, 0x50, 0x7c, 0x52, 0xbf, 0x6e, 0x89, 0xf7, 0x10, 0x6a, 0xae, 0x67, 0x38, 0xb1, 0xcd,
-	0xad, 0xca, 0xa8, 0x7e, 0xc4, 0x7f, 0x17, 0x7c, 0x83, 0x4e, 0x2c, 0xdb, 0x33, 0xcf, 0xae, 0x45,
+	0x56, 0x65, 0x54, 0x3f, 0xe2, 0xbf, 0x0b, 0xbe, 0x41, 0x27, 0x96, 0xed, 0x99, 0x67, 0xd7, 0xa2,
-	0x95, 0x5c, 0x93, 0xe4, 0x03, 0x46, 0x45, 0x6d, 0x28, 0x9c, 0x99, 0x03, 0x8f, 0x38, 0x6e, 0x23,
+	0x4a, 0xae, 0x49, 0xf2, 0x21, 0xa3, 0xa2, 0x36, 0x14, 0xce, 0xcc, 0x81, 0x47, 0x1c, 0xb7, 0x91,
-	0xb7, 0x96, 0x5d, 0xaf, 0x6d, 0x3e, 0xb9, 0x69, 0x19, 0x36, 0x3e, 0x64, 0xfc, 0xdd, 0xeb, 0x11,
+	0x5b, 0xcf, 0x6e, 0xd4, 0xb6, 0x1e, 0xdf, 0xb4, 0x0c, 0x9b, 0x1f, 0x31, 0xfe, 0xee, 0xf5, 0x88,
-	0xd1, 0xe5, 0x58, 0xb5, 0xf2, 0xcc, 0x87, 0xaa, 0xf1, 0x3b, 0x50, 0x7c, 0x4d, 0x45, 0xd0, 0xb7,
+	0xe8, 0x72, 0xac, 0x5a, 0x79, 0xe6, 0x43, 0xd5, 0xf8, 0x6d, 0x28, 0xbe, 0xa6, 0x22, 0xe8, 0x5b,
-	0xec, 0x02, 0x2f, 0x16, 0x59, 0x9b, 0xbf, 0x64, 0x9f, 0x39, 0xc6, 0xf9, 0x90, 0x58, 0x9e, 0x7c,
+	0x76, 0x81, 0x17, 0x8b, 0xac, 0xcd, 0x5f, 0xb2, 0xcf, 0x1c, 0xe3, 0x7c, 0x48, 0x2c, 0x4f, 0xbe,
-	0x0f, 0x94, 0x6d, 0xfc, 0x08, 0x20, 0x50, 0x43, 0x43, 0xfe, 0x41, 0xe7, 0xf0, 0xb8, 0x5b, 0x9f,
+	0x07, 0xca, 0x36, 0x7e, 0x08, 0x10, 0xa8, 0xa1, 0x21, 0xff, 0xb0, 0x73, 0xf4, 0xb2, 0x5b, 0x9f,
-	0x43, 0x15, 0x28, 0x1e, 0x74, 0x76, 0xda, 0xfb, 0x6d, 0x9a, 0x1f, 0x70, 0x4b, 0xba, 0x34, 0xb4,
+	0x43, 0x15, 0x28, 0x1e, 0x76, 0x76, 0xdb, 0x07, 0x6d, 0x9a, 0x1f, 0x70, 0x4b, 0xba, 0x34, 0xb4,
-	0x96, 0xaa, 0x4e, 0x2d, 0xa4, 0x13, 0xdf, 0x82, 0xe5, 0xa4, 0x05, 0xa4, 0xb5, 0x68, 0x55, 0xec,
+	0x96, 0xaa, 0x4e, 0x2d, 0xa4, 0x13, 0xaf, 0xc2, 0x72, 0xd2, 0x02, 0xd2, 0x5a, 0xb4, 0x2a, 0x76,
-	0xd2, 0x99, 0x8e, 0x8a, 0xaa, 0x3a, 0x13, 0x9e, 0x6e, 0x03, 0x0a, 0x7c, 0xf7, 0xf6, 0x45, 0x71,
+	0xe9, 0x4c, 0x47, 0x45, 0x55, 0x9d, 0x09, 0x4f, 0xb7, 0x01, 0x05, 0xbe, 0x7b, 0xfb, 0xa2, 0x38,
-	0x2e, 0x9b, 0xd4, 0x11, 0x7c, 0x33, 0x92, 0xbe, 0x58, 0x25, 0xbf, 0x9d, 0x18, 0x5e, 0x72, 0x89,
+	0x97, 0x4d, 0xea, 0x08, 0xbe, 0x19, 0x49, 0x5f, 0xac, 0x92, 0xdf, 0x4e, 0x0c, 0x2f, 0xb9, 0xc4,
-	0xe1, 0x05, 0x3d, 0x84, 0xaa, 0x7f, 0x1a, 0x0c, 0x57, 0xd4, 0x02, 0x25, 0xbd, 0x22, 0x37, 0x3a,
+	0xf0, 0x82, 0x1e, 0x40, 0xd5, 0x3f, 0x0d, 0x86, 0x2b, 0x6a, 0x81, 0x92, 0x5e, 0x91, 0x1b, 0x9d,
-	0xa5, 0x85, 0x9c, 0x5e, 0x08, 0x3b, 0x1d, 0x3d, 0x82, 0x3c, 0x99, 0x10, 0xcb, 0x73, 0x1b, 0x65,
+	0xd2, 0x42, 0x4e, 0x2f, 0x84, 0x9d, 0x8e, 0x1e, 0x42, 0x9e, 0x4c, 0x88, 0xe5, 0xb9, 0x8d, 0x32,
-	0x96, 0x31, 0xaa, 0xb2, 0x76, 0x6f, 0x53, 0xaa, 0x2e, 0x3a, 0xf1, 0xf7, 0x60, 0x91, 0xbd, 0x23,
+	0xcb, 0x18, 0x55, 0x59, 0xbb, 0xb7, 0x29, 0x55, 0x17, 0x9d, 0xf8, 0xbb, 0xb0, 0xc8, 0xde, 0x91,
-	0x3d, 0x77, 0x0c, 0x4b, 0x7d, 0x99, 0xeb, 0x76, 0xf7, 0x85, 0xbb, 0xe9, 0x23, 0xaa, 0x41, 0x66,
+	0x9e, 0x39, 0x86, 0xa5, 0xbe, 0xcc, 0x75, 0xbb, 0x07, 0xc2, 0xdd, 0xf4, 0x11, 0xd5, 0x20, 0xb3,
-	0x77, 0x47, 0x38, 0x21, 0xb3, 0xbb, 0x83, 0x7f, 0xa2, 0x01, 0x52, 0xc7, 0xcd, 0xe4, 0xe7, 0x88,
+	0xb7, 0x2b, 0x9c, 0x90, 0xd9, 0xdb, 0xc5, 0x3f, 0xd6, 0x00, 0xa9, 0xe3, 0x66, 0xf2, 0x73, 0x44,
-	0x70, 0xa9, 0x3e, 0x1b, 0xa8, 0x5f, 0x86, 0x1c, 0x71, 0x1c, 0xdb, 0x61, 0x1e, 0x2d, 0xe9, 0xbc,
+	0xb8, 0x54, 0x9f, 0x0d, 0xd4, 0x2f, 0x43, 0x8e, 0x38, 0x8e, 0xed, 0x30, 0x8f, 0x96, 0x74, 0xde,
-	0x81, 0xdf, 0x16, 0x36, 0xe8, 0x64, 0x62, 0x5f, 0xfa, 0x67, 0x90, 0x4b, 0xd3, 0x7c, 0x53, 0xf7,
+	0xc0, 0x6f, 0x0b, 0x1b, 0x74, 0x32, 0xb1, 0x2f, 0xfd, 0x33, 0xc8, 0xa5, 0x69, 0xbe, 0xa9, 0xfb,
-	0x60, 0x29, 0xc4, 0x35, 0x53, 0xe6, 0xfa, 0x10, 0x16, 0x98, 0xb0, 0xed, 0x0b, 0xd2, 0xbb, 0x1c,
+	0xb0, 0x14, 0xe2, 0x9a, 0x29, 0x73, 0x7d, 0x04, 0x0b, 0x4c, 0xd8, 0xce, 0x05, 0xe9, 0x5d, 0x8e,
-	0xd9, 0xa6, 0x15, 0xd3, 0x47, 0x57, 0x2e, 0x08, 0xb0, 0x74, 0x1e, 0x7c, 0x62, 0x15, 0x9f, 0xd8,
+	0x6c, 0xd3, 0x8a, 0xe9, 0xa3, 0x2b, 0x17, 0x04, 0x58, 0x3a, 0x0f, 0x3e, 0xb1, 0x8a, 0x4f, 0xec,
-	0xed, 0xee, 0xe3, 0xcf, 0xe0, 0x56, 0x44, 0x8e, 0x34, 0xff, 0x0f, 0xa1, 0xdc, 0xf3, 0x89, 0xae,
+	0x76, 0x0f, 0xf0, 0xe7, 0xb0, 0x1a, 0x91, 0x23, 0xcd, 0xff, 0x43, 0x28, 0xf7, 0x7c, 0xa2, 0x2b,
-	0xa8, 0x75, 0xee, 0x87, 0x8d, 0x8b, 0x0e, 0x55, 0x47, 0xe0, 0x0e, 0xdc, 0x8e, 0x89, 0x9e, 0x69,
+	0x6a, 0x9d, 0x7b, 0x61, 0xe3, 0xa2, 0x43, 0xd5, 0x11, 0xb8, 0x03, 0xb7, 0x62, 0xa2, 0x67, 0x9a,
-	0xce, 0xef, 0xc2, 0x0a, 0x13, 0xb8, 0x47, 0xc8, 0x68, 0x6b, 0x60, 0x4e, 0x52, 0x3d, 0x3d, 0x12,
+	0xf3, 0xbb, 0xb0, 0xc2, 0x04, 0xee, 0x13, 0x32, 0xda, 0x1e, 0x98, 0x93, 0x54, 0x4f, 0x8f, 0xc4,
-	0x93, 0x52, 0x18, 0xbf, 0xde, 0x7d, 0x81, 0x7f, 0x5f, 0x68, 0xec, 0x9a, 0x43, 0xd2, 0xb5, 0xf7,
+	0xa4, 0x14, 0xc6, 0xaf, 0x77, 0x5f, 0xe0, 0xdf, 0x17, 0x1a, 0xbb, 0xe6, 0x90, 0x74, 0xed, 0x83,
-	0xd3, 0x6d, 0xa3, 0xd9, 0xec, 0x92, 0x5c, 0xbb, 0xa2, 0xac, 0x61, 0xcf, 0xf8, 0x1f, 0x35, 0xe1,
+	0x74, 0xdb, 0x68, 0x36, 0xbb, 0x24, 0xd7, 0xae, 0x28, 0x6b, 0xd8, 0x33, 0xfe, 0x47, 0x4d, 0xb8,
-	0x2a, 0x75, 0xf8, 0xd7, 0xbc, 0x93, 0x57, 0x01, 0xce, 0xe9, 0x91, 0x21, 0x7d, 0xda, 0xc1, 0x11,
+	0x4a, 0x1d, 0xfe, 0x35, 0xef, 0xe4, 0x35, 0x80, 0x73, 0x7a, 0x64, 0x48, 0x9f, 0x76, 0x70, 0x44,
-	0x15, 0x85, 0xe2, 0xdb, 0x49, 0xe3, 0x77, 0x45, 0xd8, 0xb9, 0x2c, 0xf6, 0x39, 0xfb, 0xe3, 0x47,
+	0x45, 0xa1, 0xf8, 0x76, 0xd2, 0xf8, 0x5d, 0x11, 0x76, 0x2e, 0x8b, 0x7d, 0xce, 0xfe, 0xf8, 0x51,
-	0xb9, 0xfb, 0x50, 0x66, 0x84, 0x23, 0xcf, 0xf0, 0xc6, 0x6e, 0x6c, 0x31, 0xfe, 0x5c, 0x6c, 0x7b,
+	0xee, 0x1e, 0x94, 0x19, 0xe1, 0xd8, 0x33, 0xbc, 0xb1, 0x1b, 0x5b, 0x8c, 0x3f, 0x17, 0xdb, 0x5e,
-	0x39, 0x68, 0xa6, 0x79, 0x7d, 0x1b, 0xf2, 0xec, 0x65, 0x42, 0x96, 0xd2, 0x77, 0x12, 0xf6, 0x23,
+	0x0e, 0x9a, 0x69, 0x5e, 0xdf, 0x82, 0x3c, 0x7b, 0x99, 0x90, 0xa5, 0xf4, 0xed, 0x84, 0xfd, 0xc8,
-	0xb7, 0x43, 0x17, 0x8c, 0xf8, 0x67, 0x1a, 0xe4, 0x5f, 0x32, 0x08, 0x56, 0x31, 0x6d, 0x5e, 0xae,
+	0xed, 0xd0, 0x05, 0x23, 0xfe, 0xa9, 0x06, 0xf9, 0x17, 0x0c, 0x82, 0x55, 0x4c, 0x9b, 0x97, 0x6b,
-	0x85, 0x65, 0x0c, 0x39, 0x30, 0x54, 0xd2, 0xd9, 0x33, 0x2b, 0x3d, 0x09, 0x71, 0x8e, 0xf5, 0x7d,
+	0x61, 0x19, 0x43, 0x0e, 0x0c, 0x95, 0x74, 0xf6, 0xcc, 0x4a, 0x4f, 0x42, 0x9c, 0x97, 0xfa, 0x01,
-	0x5e, 0xe2, 0x96, 0x74, 0xbf, 0x4d, 0x7d, 0xd6, 0x1b, 0x98, 0xc4, 0xf2, 0x58, 0xef, 0x3c, 0xeb,
+	0x2f, 0x71, 0x4b, 0xba, 0xdf, 0xa6, 0x3e, 0xeb, 0x0d, 0x4c, 0x62, 0x79, 0xac, 0x77, 0x9e, 0xf5,
-	0x55, 0x28, 0xb4, 0x7a, 0x36, 0xdd, 0x7d, 0x62, 0x38, 0x96, 0x00, 0x4d, 0x8b, 0x7a, 0x40, 0xc0,
+	0x2a, 0x14, 0x5a, 0x3d, 0x9b, 0xee, 0x01, 0x31, 0x1c, 0x4b, 0x80, 0xa6, 0x45, 0x3d, 0x20, 0xe0,
-	0xfb, 0x50, 0xe7, 0x76, 0x6c, 0xf5, 0xfb, 0x4a, 0x81, 0xe9, 0x6b, 0xd3, 0x22, 0xda, 0x42, 0xd2,
+	0x03, 0xa8, 0x73, 0x3b, 0xb6, 0xfb, 0x7d, 0xa5, 0xc0, 0xf4, 0xb5, 0x69, 0x11, 0x6d, 0x21, 0x69,
-	0x32, 0x51, 0x69, 0xff, 0xa4, 0xc1, 0xa2, 0x22, 0x6e, 0x26, 0xaf, 0xbe, 0x0f, 0x79, 0x0e, 0x52,
+	0x99, 0xa8, 0xb4, 0x7f, 0xd2, 0x60, 0x51, 0x11, 0x37, 0x93, 0x57, 0xdf, 0x87, 0x3c, 0x07, 0xa9,
-	0x8b, 0x4a, 0x67, 0x39, 0x3c, 0x8a, 0xab, 0xd1, 0x05, 0x0f, 0xda, 0x80, 0x02, 0x7f, 0x92, 0xef,
+	0x45, 0xa5, 0xb3, 0x1c, 0x1e, 0xc5, 0xd5, 0xe8, 0x82, 0x07, 0x6d, 0x42, 0x81, 0x3f, 0xc9, 0x77,
-	0x00, 0xc9, 0xec, 0x92, 0x09, 0x3f, 0x82, 0x25, 0x41, 0x22, 0x43, 0x3b, 0xe9, 0x60, 0xb0, 0xc5,
+	0x80, 0x64, 0x76, 0xc9, 0x84, 0x1f, 0xc2, 0x92, 0x20, 0x91, 0xa1, 0x9d, 0x74, 0x30, 0xd8, 0x62,
-	0xc0, 0x7f, 0x0a, 0xcb, 0x61, 0xb6, 0x99, 0xa6, 0xa4, 0x18, 0x99, 0x79, 0x13, 0x23, 0xb7, 0xa4,
+	0xe0, 0x3f, 0x85, 0xe5, 0x30, 0xdb, 0x4c, 0x53, 0x52, 0x8c, 0xcc, 0xbc, 0x89, 0x91, 0xdb, 0xd2,
-	0x91, 0xc7, 0xa3, 0xbe, 0x52, 0x47, 0x45, 0x77, 0x8c, 0xba, 0x5e, 0x99, 0xf0, 0x7a, 0x05, 0x13,
+	0xc8, 0x97, 0xa3, 0xbe, 0x52, 0x47, 0x45, 0x77, 0x8c, 0xba, 0x5e, 0x99, 0xf0, 0x7a, 0x05, 0x13,
-	0x90, 0x22, 0xbe, 0xd1, 0x09, 0x2c, 0xc9, 0xed, 0xb0, 0x6f, 0xba, 0x7e, 0xb9, 0xfe, 0x05, 0x20,
+	0x90, 0x22, 0xbe, 0xd1, 0x09, 0x2c, 0xc9, 0xed, 0x70, 0x60, 0xba, 0x7e, 0xb9, 0xfe, 0x25, 0x20,
-	0x95, 0xf8, 0x8d, 0x1a, 0xf4, 0x8e, 0x74, 0xc7, 0xa1, 0x63, 0x0f, 0xed, 0x54, 0x97, 0xe2, 0x3f,
+	0x95, 0xf8, 0x8d, 0x1a, 0xf4, 0x8e, 0x74, 0xc7, 0x91, 0x63, 0x0f, 0xed, 0x54, 0x97, 0xe2, 0x3f,
-	0x83, 0x95, 0x08, 0xdf, 0x37, 0xed, 0xb7, 0x1d, 0x22, 0x8b, 0x15, 0xe9, 0xb7, 0x8f, 0x00, 0xa9,
+	0x83, 0x95, 0x08, 0xdf, 0x37, 0xed, 0xb7, 0x5d, 0x22, 0x8b, 0x15, 0xe9, 0xb7, 0x8f, 0x01, 0xa9,
-	0xc4, 0x99, 0xb2, 0x56, 0x0b, 0x16, 0x5f, 0xda, 0x13, 0x1a, 0xfe, 0x28, 0x35, 0x38, 0xf7, 0x1c,
+	0xc4, 0x99, 0xb2, 0x56, 0x0b, 0x16, 0x5f, 0xd8, 0x13, 0x1a, 0xfe, 0x28, 0x35, 0x38, 0xf7, 0x1c,
-	0x63, 0xf0, 0x5d, 0xe1, 0xb7, 0xa9, 0x72, 0x75, 0xc0, 0x4c, 0xca, 0xff, 0x43, 0x83, 0xca, 0xd6,
+	0x63, 0xf0, 0x5d, 0xe1, 0xb7, 0xa9, 0x72, 0x75, 0xc0, 0x4c, 0xca, 0xff, 0x43, 0x83, 0xca, 0xf6,
-	0xc0, 0x70, 0x86, 0x52, 0xf1, 0xf7, 0x21, 0xcf, 0xdf, 0x9c, 0x05, 0x58, 0xf5, 0x4e, 0x58, 0x8c,
+	0xc0, 0x70, 0x86, 0x52, 0xf1, 0xf7, 0x20, 0xcf, 0xdf, 0x9c, 0x05, 0x58, 0xf5, 0x4e, 0x58, 0x8c,
-	0xca, 0xcb, 0x1b, 0x5b, 0xfc, 0x3d, 0x5b, 0x8c, 0xa2, 0x86, 0x8b, 0xef, 0x59, 0x3b, 0x91, 0xef,
+	0xca, 0xcb, 0x1b, 0xdb, 0xfc, 0x3d, 0x5b, 0x8c, 0xa2, 0x86, 0x8b, 0xef, 0x59, 0xbb, 0x91, 0xef,
-	0x5b, 0x3b, 0xe8, 0x03, 0xc8, 0x19, 0x74, 0x08, 0x4b, 0x33, 0xb5, 0x28, 0x66, 0xc1, 0xa4, 0xb1,
+	0x5b, 0xbb, 0xe8, 0x03, 0xc8, 0x19, 0x74, 0x08, 0x4b, 0x33, 0xb5, 0x28, 0x66, 0xc1, 0xa4, 0xb1,
-	0xfa, 0x9e, 0x73, 0xe1, 0xef, 0x42, 0x59, 0xd1, 0x80, 0x0a, 0x90, 0x7d, 0xde, 0x16, 0xc5, 0xf8,
+	0xfa, 0x9e, 0x73, 0xe1, 0xef, 0x40, 0x59, 0xd1, 0x80, 0x0a, 0x90, 0x7d, 0xd6, 0x16, 0xc5, 0xf8,
-	0xd6, 0x76, 0x77, 0xf7, 0x15, 0x07, 0x6b, 0x6a, 0x00, 0x3b, 0x6d, 0xbf, 0x9d, 0xc1, 0x9f, 0x8a,
+	0xf6, 0x4e, 0x77, 0xef, 0x15, 0x07, 0x6b, 0x6a, 0x00, 0xbb, 0x6d, 0xbf, 0x9d, 0xc1, 0x9f, 0x89,
 	0x51, 0x22, 0xa4, 0xab, 0xf6, 0x68, 0x69, 0xf6, 0x64, 0xde, 0xc8, 0x9e, 0x2b, 0xa8, 0x8a, 0xe9,
 	0xcf, 0x9a, 0xa2, 0x98, 0xbc, 0x94, 0x14, 0xa5, 0x18, 0xaf, 0x0b, 0x46, 0xbc, 0x00, 0x55, 0x91,
 	0xb4, 0xc4, 0xfe, 0xfb, 0xf7, 0x0c, 0xd4, 0x24, 0x65, 0x56, 0x50, 0x5d, 0xe2, 0x81, 0x3c, 0xc9,
-	0xf9, 0x68, 0xe0, 0x2d, 0xc8, 0xf7, 0x4f, 0x8f, 0xcc, 0x2f, 0xe4, 0x07, 0x10, 0xd1, 0xa2, 0xf4,
+	0xf9, 0x68, 0xe0, 0x2a, 0xe4, 0xfb, 0xa7, 0xc7, 0xe6, 0x97, 0xf2, 0x03, 0x88, 0x68, 0x51, 0xfa,
-	0x01, 0xd7, 0xc3, 0xbf, 0x42, 0x8a, 0x16, 0xcd, 0x46, 0x8e, 0x71, 0xe6, 0xed, 0x5a, 0x7d, 0x72,
+	0x80, 0xeb, 0xe1, 0x5f, 0x21, 0x45, 0x8b, 0x66, 0x23, 0xc7, 0x38, 0xf3, 0xf6, 0xac, 0x3e, 0xb9,
-	0xc5, 0x72, 0xdb, 0xbc, 0x1e, 0x10, 0x18, 0x50, 0x22, 0xbe, 0x56, 0xb2, 0x17, 0x04, 0xe5, 0xeb,
+	0x62, 0xb9, 0x6d, 0x5e, 0x0f, 0x08, 0x0c, 0x28, 0x11, 0x5f, 0x2b, 0xd9, 0x0b, 0x82, 0xf2, 0xf5,
-	0x25, 0x7a, 0x0c, 0x75, 0xfa, 0xbc, 0x35, 0x1a, 0x0d, 0x4c, 0xd2, 0xe7, 0x02, 0x0a, 0x8c, 0x27,
+	0x12, 0x3d, 0x82, 0x3a, 0x7d, 0xde, 0x1e, 0x8d, 0x06, 0x26, 0xe9, 0x73, 0x01, 0x05, 0xc6, 0x13,
-	0x46, 0xa7, 0xda, 0x59, 0x49, 0xed, 0x36, 0x8a, 0x2c, 0xba, 0x8a, 0x16, 0x5a, 0x83, 0x32, 0xb7,
+	0xa3, 0x53, 0xed, 0xac, 0xa4, 0x76, 0x1b, 0x45, 0x16, 0x5d, 0x45, 0x0b, 0xad, 0x43, 0x99, 0xdb,
-	0x6f, 0xd7, 0x3a, 0x76, 0x09, 0xfb, 0x84, 0x97, 0xd5, 0x55, 0x52, 0x38, 0x5b, 0x42, 0x34, 0x5b,
+	0xb7, 0x67, 0xbd, 0x74, 0x09, 0xfb, 0x84, 0x97, 0xd5, 0x55, 0x52, 0x38, 0x5b, 0x42, 0x34, 0x5b,
-	0x2e, 0xc1, 0xe2, 0xd6, 0xd8, 0xbb, 0x68, 0x5b, 0xc6, 0xe9, 0x40, 0x46, 0x22, 0x5a, 0xce, 0x50,
+	0x2e, 0xc1, 0xe2, 0xf6, 0xd8, 0xbb, 0x68, 0x5b, 0xc6, 0xe9, 0x40, 0x46, 0x22, 0x5a, 0xce, 0x50,
-	0xe2, 0x8e, 0xe9, 0xaa, 0xd4, 0x36, 0x2c, 0x51, 0x2a, 0xb1, 0x3c, 0xb3, 0xa7, 0x64, 0x02, 0x59,
+	0xe2, 0xae, 0xe9, 0xaa, 0xd4, 0x36, 0x2c, 0x51, 0x2a, 0xb1, 0x3c, 0xb3, 0xa7, 0x64, 0x02, 0x59,
-	0x2b, 0x68, 0x91, 0x5a, 0xc1, 0x70, 0xdd, 0xd7, 0xb6, 0xd3, 0x17, 0xee, 0xf5, 0xdb, 0x78, 0x87,
+	0x2b, 0x68, 0x91, 0x5a, 0xc1, 0x70, 0xdd, 0xd7, 0xb6, 0xd3, 0x17, 0xee, 0xf5, 0xdb, 0x78, 0xc2,
-	0x0b, 0x3f, 0x76, 0x43, 0xf9, 0xfe, 0x37, 0x95, 0xb2, 0x1e, 0x48, 0x79, 0x4e, 0xbc, 0x29, 0x52,
+	0x85, 0xbf, 0x74, 0x43, 0xf9, 0xfe, 0xd7, 0x94, 0x82, 0x3e, 0x84, 0x82, 0x3d, 0x62, 0x9f, 0xa4,
-	0xf0, 0x13, 0x58, 0x91, 0x9c, 0x02, 0xf4, 0x9e, 0xc2, 0xdc, 0x81, 0xfb, 0x92, 0x79, 0xfb, 0xc2,
+	0x05, 0x6e, 0xb0, 0xba, 0xc9, 0x3f, 0x62, 0x6f, 0x0a, 0xc1, 0x1d, 0xde, 0xab, 0x4b, 0x36, 0xbc,
-	0xb0, 0xce, 0xc9, 0xa1, 0x50, 0xf8, 0xdb, 0xda, 0xf9, 0x0c, 0x1a, 0xbe, 0x9d, 0xec, 0x45, 0xcc,
+	0x11, 0xe8, 0x7d, 0x46, 0xbc, 0x29, 0x7a, 0xf1, 0x63, 0x58, 0x91, 0x9c, 0x02, 0x26, 0x9f, 0xc2,
-	0x1e, 0xa8, 0x06, 0x8c, 0x5d, 0xb1, 0x6f, 0x4b, 0x3a, 0x7b, 0xa6, 0x34, 0xc7, 0x1e, 0xf8, 0x95,
+	0xdc, 0x81, 0x7b, 0x92, 0x79, 0xe7, 0xc2, 0xb0, 0xce, 0xc9, 0x91, 0x30, 0xf1, 0x37, 0xf5, 0xcf,
-	0x17, 0x7d, 0xc6, 0xdb, 0x70, 0x47, 0xca, 0x10, 0xaf, 0x48, 0x61, 0x21, 0x31, 0x83, 0x92, 0x84,
+	0x53, 0x68, 0xf8, 0x76, 0xb2, 0x57, 0x37, 0x7b, 0xa0, 0x1a, 0x30, 0x76, 0xc5, 0x4e, 0x2f, 0xe9,
-	0x08, 0x87, 0xd1, 0xa1, 0xd3, 0xdd, 0xae, 0x72, 0x86, 0x5d, 0xcb, 0x64, 0x6a, 0x8a, 0xcc, 0x15,
+	0xec, 0x99, 0xd2, 0x1c, 0x7b, 0xe0, 0xd7, 0x6a, 0xf4, 0x19, 0xef, 0xc0, 0x6d, 0x29, 0x43, 0xbc,
-	0xbe, 0x23, 0xa8, 0x61, 0x6a, 0x72, 0x15, 0x64, 0x2a, 0x40, 0x25, 0x8b, 0x85, 0xa0, 0xe4, 0xd8,
+	0x54, 0x85, 0x85, 0xc4, 0x0c, 0x4a, 0x12, 0x22, 0x1c, 0x46, 0x87, 0x4e, 0x5f, 0x28, 0x95, 0x33,
-	0x42, 0xc4, 0x44, 0xff, 0x10, 0x56, 0x7d, 0x23, 0xa8, 0xdf, 0x0e, 0x89, 0x33, 0x34, 0x5d, 0x57,
+	0xec, 0x5a, 0x26, 0x53, 0x53, 0x64, 0xae, 0xf0, 0x3d, 0x44, 0x0d, 0x53, 0xd3, 0xb1, 0x20, 0x53,
-	0x81, 0x49, 0x93, 0x26, 0xfe, 0x0e, 0xcc, 0x8f, 0x88, 0x88, 0x6b, 0xe5, 0x4d, 0xb4, 0xc1, 0xef,
+	0x01, 0x2a, 0x59, 0x2c, 0x04, 0x25, 0xc7, 0x16, 0x22, 0x26, 0xfa, 0x07, 0xb0, 0xe6, 0x1b, 0x41,
-	0x35, 0x6c, 0x28, 0x83, 0x59, 0x3f, 0xee, 0xc3, 0x03, 0x29, 0x9d, 0x7b, 0x34, 0x51, 0x7c, 0xd4,
+	0xfd, 0x76, 0x44, 0x9c, 0xa1, 0xe9, 0xba, 0x0a, 0xb0, 0x9a, 0x34, 0xf1, 0x77, 0x60, 0x7e, 0x44,
-	0x28, 0x09, 0x1e, 0x65, 0x52, 0xc0, 0xa3, 0x6c, 0x04, 0xba, 0xff, 0x88, 0x3b, 0x52, 0x9e, 0xad,
+	0x44, 0x24, 0x2c, 0x6f, 0x21, 0xb9, 0x89, 0x94, 0xc1, 0xac, 0x1f, 0xf7, 0xe1, 0xbe, 0x94, 0xce,
-	0x99, 0xf2, 0xd5, 0x1e, 0xf7, 0xa9, 0x7f, 0x24, 0x67, 0x12, 0x76, 0x0a, 0xcb, 0xe1, 0x93, 0x3c,
+	0x3d, 0x9a, 0x28, 0x3e, 0x6a, 0x94, 0x84, 0x9b, 0x32, 0x29, 0x70, 0x53, 0x36, 0x02, 0xf6, 0x7f,
-	0x53, 0x28, 0x5d, 0x86, 0x9c, 0x67, 0x5f, 0x12, 0x19, 0x48, 0x79, 0x43, 0x1a, 0xec, 0x1f, 0xf3,
+	0xcc, 0x1d, 0x29, 0x4f, 0xe3, 0x4c, 0x19, 0x6e, 0x9f, 0xfb, 0xd4, 0x3f, 0xc4, 0x33, 0x09, 0x3b,
-	0x99, 0x0c, 0x36, 0x02, 0x61, 0x6c, 0x4b, 0xce, 0x6a, 0x2f, 0x5d, 0x4d, 0x59, 0xa7, 0xf2, 0x06,
+	0x85, 0xe5, 0xf0, 0xd9, 0x9f, 0x29, 0xf8, 0x2e, 0x43, 0xce, 0xb3, 0x2f, 0x89, 0x0c, 0xbd, 0xbc,
-	0x3e, 0x80, 0x5b, 0xd1, 0x30, 0x31, 0x93, 0xc9, 0xaf, 0xf8, 0x06, 0x4e, 0x8a, 0x24, 0x33, 0xc9,
+	0x21, 0x0d, 0xf6, 0x03, 0xc3, 0x4c, 0x06, 0x1b, 0x81, 0x30, 0xb6, 0x25, 0x67, 0xb5, 0x97, 0xae,
-	0xfd, 0x38, 0x08, 0x06, 0x4a, 0x40, 0x99, 0x49, 0xa4, 0x0e, 0xcd, 0xa4, 0xf8, 0xf2, 0x55, 0xec,
+	0xa6, 0xac, 0x6c, 0x79, 0x03, 0x1f, 0xc2, 0x6a, 0x34, 0x4c, 0xcc, 0x64, 0xf2, 0x2b, 0xbe, 0x81,
-	0x57, 0x3f, 0xdc, 0xcc, 0x24, 0xcc, 0x0d, 0x84, 0xcd, 0xbe, 0xfc, 0x41, 0x8c, 0xc8, 0x4e, 0x8d,
+	0x93, 0x22, 0xc9, 0x4c, 0x72, 0x3f, 0x09, 0x82, 0x81, 0x12, 0x50, 0x66, 0x12, 0xa9, 0x43, 0x33,
-	0x11, 0xe2, 0x90, 0x04, 0x51, 0xec, 0x6b, 0xd8, 0x74, 0x42, 0x47, 0x10, 0x40, 0x67, 0xd5, 0x41,
+	0x29, 0xbe, 0xfc, 0x36, 0xf6, 0xab, 0x1f, 0x6e, 0x66, 0x12, 0xe6, 0x06, 0xc2, 0x66, 0x5f, 0xfe,
-	0x73, 0x88, 0xaf, 0x83, 0x35, 0xe4, 0xc6, 0x56, 0xc3, 0xee, 0x4c, 0x8b, 0xf1, 0x49, 0x10, 0x3b,
+	0x20, 0x46, 0x64, 0xa7, 0xc6, 0x08, 0x71, 0x48, 0x82, 0x28, 0xf6, 0x35, 0x6c, 0x3a, 0xa1, 0x23,
-	0x63, 0x91, 0x79, 0x26, 0xc1, 0x9f, 0xc2, 0x5a, 0x7a, 0x50, 0x9e, 0x45, 0xf2, 0xe3, 0x16, 0x94,
+	0x08, 0xa0, 0xb3, 0xea, 0xa0, 0x39, 0xc4, 0xd7, 0xc1, 0x1a, 0x72, 0x63, 0xab, 0x61, 0x77, 0xa6,
-	0xfc, 0xa2, 0x56, 0xb9, 0x13, 0x54, 0x86, 0xc2, 0x41, 0xe7, 0xe8, 0x70, 0x6b, 0xbb, 0xcd, 0x2f,
+	0xc5, 0xf8, 0x34, 0x88, 0x9d, 0xb1, 0xc8, 0x3c, 0x93, 0xe0, 0xcf, 0x60, 0x3d, 0x3d, 0x28, 0xcf,
-	0x05, 0x6d, 0x77, 0x74, 0xfd, 0xf8, 0xb0, 0x5b, 0xcf, 0x6c, 0xfe, 0x2a, 0x0b, 0x99, 0xbd, 0x57,
+	0x22, 0xf9, 0x51, 0x0b, 0x4a, 0x7e, 0x19, 0xac, 0xdc, 0x22, 0x2a, 0x43, 0xe1, 0xb0, 0x73, 0x7c,
-	0xe8, 0x33, 0xc8, 0xf1, 0x2f, 0xe4, 0x53, 0xae, 0x45, 0x34, 0xa7, 0x5d, 0x02, 0xc0, 0xb7, 0x7f,
+	0xb4, 0xbd, 0xd3, 0xe6, 0xd7, 0x88, 0x76, 0x3a, 0xba, 0xfe, 0xf2, 0xa8, 0x5b, 0xcf, 0x6c, 0xfd,
-	0xf2, 0xdf, 0xbf, 0xfa, 0x45, 0x66, 0x11, 0x57, 0x5a, 0x93, 0xef, 0xb4, 0x2e, 0x27, 0x2d, 0x96,
+	0x32, 0x0b, 0x99, 0xfd, 0x57, 0xe8, 0x73, 0xc8, 0xf1, 0x6f, 0xea, 0x53, 0x2e, 0x52, 0x34, 0xa7,
-	0x1b, 0x9e, 0x6a, 0x8f, 0xd1, 0xc7, 0x90, 0x3d, 0x1c, 0x7b, 0x28, 0xf5, 0xba, 0x44, 0x33, 0xfd,
+	0x5d, 0x1b, 0xc0, 0xb7, 0x7e, 0xfc, 0xdf, 0xbf, 0xfc, 0x79, 0x66, 0x11, 0x57, 0x5a, 0x93, 0x6f,
-	0x5e, 0x00, 0x5e, 0x61, 0x42, 0x17, 0x30, 0x08, 0xa1, 0xa3, 0xb1, 0x47, 0x45, 0xfe, 0x08, 0xca,
+	0xb7, 0x2e, 0x27, 0x2d, 0x96, 0x1b, 0x9e, 0x68, 0x8f, 0xd0, 0x27, 0x90, 0x3d, 0x1a, 0x7b, 0x28,
-	0xea, 0x57, 0xfd, 0x1b, 0xef, 0x50, 0x34, 0x6f, 0xbe, 0x31, 0x80, 0xef, 0x33, 0x55, 0xb7, 0x31,
+	0xf5, 0x82, 0x45, 0x33, 0xfd, 0x26, 0x01, 0x5e, 0x61, 0x42, 0x17, 0x30, 0x08, 0xa1, 0xa3, 0xb1,
-	0x12, 0xaa, 0xf8, 0xbd, 0x03, 0x75, 0x16, 0xdd, 0x2b, 0x0b, 0xa5, 0xde, 0xb0, 0x68, 0xa6, 0x5f,
+	0x47, 0x45, 0xfe, 0x10, 0xca, 0xea, 0x3d, 0x80, 0x1b, 0x6f, 0x5d, 0x34, 0x6f, 0xbe, 0x63, 0x80,
-	0x22, 0x88, 0xcd, 0xc2, 0xbb, 0xb2, 0xa8, 0xc8, 0x3f, 0x16, 0xf7, 0x07, 0x7a, 0x1e, 0x7a, 0x90,
+	0xef, 0x31, 0x55, 0xb7, 0x30, 0x12, 0xaa, 0xf8, 0x4d, 0x05, 0x75, 0x16, 0xdd, 0x2b, 0x0b, 0xa5,
-	0xf0, 0xfd, 0x58, 0xfd, 0x52, 0xda, 0x5c, 0x4b, 0x67, 0x10, 0x4a, 0xee, 0x31, 0x25, 0xb7, 0xf0,
+	0xde, 0xc9, 0x68, 0xa6, 0x5f, 0x3b, 0x88, 0xcd, 0xc2, 0xbb, 0xb2, 0xa8, 0xc8, 0x3f, 0x16, 0x37,
-	0xa2, 0x50, 0xd2, 0xf3, 0x59, 0x9e, 0x6a, 0x8f, 0x37, 0x7b, 0x90, 0x63, 0x5f, 0x21, 0xd0, 0xe7,
+	0x0e, 0x7a, 0x1e, 0xba, 0x9f, 0xf0, 0xc5, 0x59, 0xfd, 0xb6, 0xda, 0x5c, 0x4f, 0x67, 0x10, 0x4a,
-	0xf2, 0xa1, 0x99, 0xf0, 0x39, 0x26, 0x65, 0xa1, 0x43, 0xdf, 0x2f, 0xf0, 0x32, 0x53, 0x54, 0xc3,
+	0xee, 0x32, 0x25, 0xab, 0x78, 0x51, 0x28, 0xe9, 0xf9, 0x2c, 0x4f, 0xb4, 0x47, 0x5b, 0x3d, 0xc8,
-	0x25, 0xaa, 0x88, 0x7d, 0x83, 0x78, 0xaa, 0x3d, 0x5e, 0xd7, 0xbe, 0xa5, 0x6d, 0xfe, 0x73, 0x0e,
+	0xb1, 0xef, 0x16, 0xe8, 0x0b, 0xf9, 0xd0, 0x4c, 0xf8, 0x80, 0x93, 0xb2, 0xd0, 0xa1, 0x2f, 0x1e,
-	0x72, 0x0c, 0x7e, 0x43, 0x97, 0x00, 0x01, 0x22, 0x1f, 0x9d, 0x5d, 0x0c, 0xe3, 0x8f, 0xce, 0x2e,
+	0x78, 0x99, 0x29, 0xaa, 0xe1, 0x12, 0x55, 0xc4, 0xbe, 0x5a, 0x3c, 0xd1, 0x1e, 0x6d, 0x68, 0x1f,
-	0x0e, 0xe6, 0xe3, 0x26, 0x53, 0xba, 0x8c, 0x17, 0xa8, 0x52, 0x86, 0xea, 0xb5, 0x18, 0x50, 0x49,
+	0x6a, 0x5b, 0xff, 0x9c, 0x83, 0x1c, 0x03, 0xec, 0xd0, 0x25, 0x40, 0x80, 0xe1, 0x47, 0x67, 0x17,
-	0xfd, 0xf8, 0x57, 0x9a, 0x40, 0x1f, 0xf9, 0x59, 0x42, 0x49, 0xd2, 0x42, 0xb0, 0x7c, 0x74, 0x3b,
+	0xfb, 0x2a, 0x10, 0x9d, 0x5d, 0x1c, 0xfe, 0xc7, 0x4d, 0xa6, 0x74, 0x19, 0x2f, 0x50, 0xa5, 0x0c,
-	0x24, 0x40, 0xf2, 0xf8, 0x7b, 0x4c, 0x61, 0x0b, 0xd7, 0x03, 0x85, 0x0e, 0xe3, 0x78, 0xaa, 0x3d,
+	0x07, 0x6c, 0x31, 0x68, 0x93, 0xfa, 0xf1, 0xaf, 0x34, 0x81, 0x57, 0xf2, 0xb3, 0x84, 0x92, 0xa4,
-	0xfe, 0xbc, 0x81, 0x97, 0x84, 0x97, 0x23, 0x3d, 0xe8, 0xc7, 0x50, 0x0b, 0xc3, 0xce, 0xe8, 0x61,
+	0x85, 0x80, 0xfc, 0xe8, 0x76, 0x48, 0x00, 0xf1, 0xf1, 0x77, 0x99, 0xc2, 0x16, 0xae, 0x07, 0x0a,
-	0x82, 0xae, 0x28, 0x7a, 0xdd, 0x7c, 0x7b, 0x3a, 0x93, 0xb0, 0x69, 0x95, 0xd9, 0x24, 0x94, 0x73,
+	0x1d, 0xc6, 0xf1, 0x44, 0x7b, 0xf4, 0x45, 0x03, 0x2f, 0x09, 0x2f, 0x47, 0x7a, 0xd0, 0x8f, 0xa0,
-	0xcd, 0x97, 0x84, 0x8c, 0x0c, 0xca, 0x24, 0xd6, 0x00, 0xfd, 0xbd, 0x26, 0xbe, 0x0a, 0x04, 0x38,
+	0x16, 0x06, 0xaa, 0xd1, 0x83, 0x04, 0x5d, 0x51, 0xbc, 0xbb, 0xf9, 0xf6, 0x74, 0x26, 0x61, 0xd3,
-	0x32, 0x4a, 0x92, 0x1e, 0x43, 0xa9, 0x9b, 0x8f, 0x6e, 0xe0, 0x12, 0x46, 0xfc, 0x01, 0x33, 0xe2,
+	0x1a, 0xb3, 0x49, 0x28, 0xe7, 0x9a, 0x2f, 0x09, 0x19, 0x19, 0x94, 0x49, 0xac, 0x01, 0xfa, 0x7b,
-	0x77, 0xf1, 0x72, 0x60, 0x84, 0x67, 0x0e, 0x89, 0x67, 0x0b, 0x2b, 0x3e, 0xbf, 0x87, 0x6f, 0x87,
+	0x4d, 0x7c, 0x47, 0x08, 0x90, 0x67, 0x94, 0x24, 0x3d, 0x86, 0x6b, 0x37, 0x1f, 0xde, 0xc0, 0x25,
-	0x9c, 0x13, 0xea, 0x0d, 0x16, 0x8b, 0x63, 0xc1, 0x89, 0x8b, 0x15, 0xc2, 0x96, 0x13, 0x17, 0x2b,
+	0x8c, 0xf8, 0x03, 0x66, 0xc4, 0xef, 0xe2, 0xe5, 0xc0, 0x08, 0xcf, 0x1c, 0x12, 0xcf, 0x16, 0x56,
-	0x0c, 0x24, 0x27, 0x2d, 0x16, 0x47, 0x7e, 0x93, 0x16, 0xcb, 0xef, 0xd9, 0xfc, 0xff, 0x79, 0x28,
+	0x7c, 0x71, 0x17, 0xdf, 0x0a, 0x39, 0x27, 0xd4, 0x1b, 0x2c, 0x16, 0x47, 0x8f, 0x13, 0x17, 0x2b,
-	0x6c, 0xf3, 0x7b, 0xbb, 0xc8, 0x86, 0x92, 0x0f, 0xa5, 0xa2, 0xd5, 0x24, 0xbc, 0x28, 0x78, 0x97,
+	0x84, 0x46, 0x27, 0x2e, 0x56, 0x18, 0x7a, 0x4e, 0x5a, 0x2c, 0x8e, 0x15, 0x27, 0x2d, 0x96, 0xdf,
-	0x68, 0x3e, 0x48, 0xed, 0x17, 0x06, 0xbd, 0xc5, 0x0c, 0xba, 0x8b, 0x6f, 0x51, 0xcd, 0xe2, 0x6a,
+	0xb3, 0xf5, 0xff, 0xf3, 0x50, 0xd8, 0xe1, 0x37, 0x7d, 0x91, 0x0d, 0x25, 0x1f, 0x7c, 0x45, 0x6b,
-	0x70, 0x8b, 0x83, 0x12, 0x2d, 0xa3, 0xdf, 0xa7, 0x8e, 0xf8, 0x13, 0xa8, 0xa8, 0x58, 0x27, 0x7a,
+	0x49, 0x08, 0x53, 0xf0, 0x2e, 0xd1, 0xbc, 0x9f, 0xda, 0x2f, 0x0c, 0x7a, 0x8b, 0x19, 0x74, 0x07,
-	0x2b, 0x11, 0xa3, 0x52, 0xe1, 0xd2, 0x26, 0x9e, 0xc6, 0x22, 0x34, 0xbf, 0xcd, 0x34, 0xaf, 0xe2,
+	0xaf, 0x52, 0xcd, 0xe2, 0x32, 0x71, 0x8b, 0xc3, 0x18, 0x2d, 0xa3, 0xdf, 0xa7, 0x8e, 0xf8, 0x13,
-	0x3b, 0x09, 0x9a, 0x1d, 0xc6, 0x1a, 0x52, 0xce, 0x71, 0xca, 0x64, 0xe5, 0x21, 0x18, 0x34, 0x59,
+	0xa8, 0xa8, 0xe8, 0x28, 0x7a, 0x2b, 0x11, 0xd5, 0x52, 0x01, 0xd6, 0x26, 0x9e, 0xc6, 0x22, 0x34,
-	0x79, 0x18, 0xe6, 0x9c, 0xaa, 0x7c, 0xcc, 0x58, 0xa9, 0x72, 0x17, 0x20, 0x40, 0x24, 0x51, 0xa2,
+	0xbf, 0xcd, 0x34, 0xaf, 0xe1, 0xdb, 0x09, 0x9a, 0x1d, 0xc6, 0x1a, 0x52, 0xce, 0x91, 0xcd, 0x64,
-	0x2f, 0x95, 0x97, 0xa9, 0x68, 0x70, 0x88, 0x83, 0x99, 0x18, 0x33, 0xb5, 0x62, 0xdf, 0x45, 0xd4,
+	0xe5, 0x21, 0xe0, 0x34, 0x59, 0x79, 0x18, 0x18, 0x9d, 0xaa, 0x7c, 0xcc, 0x58, 0xa9, 0x72, 0x17,
-	0x0e, 0x4c, 0xd7, 0xe3, 0x07, 0xb3, 0x1a, 0x82, 0x18, 0x51, 0xe2, 0x7c, 0xc2, 0x38, 0x65, 0xf3,
+	0x20, 0xc0, 0x30, 0x51, 0xa2, 0x2f, 0x95, 0x97, 0xa9, 0x68, 0x70, 0x88, 0xc3, 0x9f, 0x18, 0x33,
-	0xe1, 0x54, 0x1e, 0xa1, 0xfd, 0x11, 0xd3, 0xfe, 0x00, 0x37, 0x13, 0xb4, 0x8f, 0x38, 0x2f, 0xdd,
+	0xb5, 0x62, 0xdf, 0x45, 0xd4, 0x0e, 0x4c, 0xd7, 0xe3, 0x07, 0xb3, 0x1a, 0x02, 0x25, 0x51, 0xe2,
-	0x6c, 0x7f, 0x9d, 0x87, 0xf2, 0x4b, 0xc3, 0xb4, 0x3c, 0x62, 0x19, 0x56, 0x8f, 0xa0, 0x53, 0xc8,
+	0x7c, 0xc2, 0xc8, 0x66, 0xf3, 0xc1, 0x54, 0x1e, 0xa1, 0xfd, 0x21, 0xd3, 0x7e, 0x1f, 0x37, 0x13,
-	0xb1, 0x4c, 0x1d, 0x0d, 0xc4, 0x2a, 0xfc, 0x16, 0x0d, 0xc4, 0x21, 0x6c, 0x0a, 0xaf, 0x31, 0xc5,
+	0xb4, 0x8f, 0x38, 0x2f, 0xdd, 0x6c, 0x7f, 0x9d, 0x87, 0xf2, 0x0b, 0xc3, 0xb4, 0x3c, 0x62, 0x19,
-	0x4d, 0xbc, 0x42, 0x15, 0x0f, 0x03, 0xd1, 0x2d, 0x06, 0x29, 0xd1, 0x49, 0x9f, 0x41, 0x5e, 0x7c,
+	0x56, 0x8f, 0xa0, 0x53, 0xc8, 0xb1, 0x4c, 0x1d, 0x0d, 0xc4, 0x2a, 0x60, 0x17, 0x0d, 0xc4, 0x21,
-	0x91, 0x89, 0x08, 0x0a, 0x41, 0x4d, 0xcd, 0x7b, 0xc9, 0x9d, 0x49, 0x7b, 0x59, 0x55, 0xe3, 0x32,
+	0x34, 0x0b, 0xaf, 0x33, 0xc5, 0x4d, 0xbc, 0x42, 0x15, 0x0f, 0x03, 0xd1, 0x2d, 0x06, 0x42, 0xd1,
-	0x3e, 0xaa, 0x67, 0x02, 0x10, 0x60, 0xa5, 0xd1, 0x15, 0x8d, 0x41, 0xab, 0xcd, 0xb5, 0x74, 0x86,
+	0x49, 0x9f, 0x41, 0x5e, 0x7c, 0xc3, 0x89, 0x08, 0x0a, 0x81, 0x53, 0xcd, 0xbb, 0xc9, 0x9d, 0x49,
-	0x24, 0x9f, 0xaa, 0x3a, 0xfb, 0x3e, 0x2f, 0xd5, 0xfb, 0x47, 0x30, 0xff, 0xc2, 0x70, 0x2f, 0x50,
+	0x7b, 0x59, 0x55, 0xe3, 0x32, 0x3e, 0xaa, 0x67, 0x02, 0x10, 0xa0, 0xab, 0xd1, 0x15, 0x8d, 0x81,
-	0x24, 0xf7, 0x2a, 0xf7, 0x79, 0x9a, 0xcd, 0xa4, 0x2e, 0xa1, 0xe5, 0x01, 0xd3, 0x72, 0x87, 0x87,
+	0xb1, 0xcd, 0xf5, 0x74, 0x86, 0x24, 0x9f, 0xaa, 0x3a, 0xfb, 0x3e, 0x2f, 0xd5, 0xfb, 0x47, 0x30,
-	0x32, 0x55, 0xcb, 0x85, 0xe1, 0xd2, 0xa4, 0x86, 0xfa, 0x90, 0xe7, 0xd7, 0x7b, 0xa2, 0xfe, 0x0b,
+	0xff, 0xdc, 0x70, 0x2f, 0x50, 0x24, 0xf7, 0x2a, 0x37, 0x80, 0x9a, 0xcd, 0xa4, 0x2e, 0xa1, 0xe5,
-	0x5d, 0x11, 0x8a, 0xfa, 0x2f, 0x7c, 0x23, 0xe8, 0x66, 0x2d, 0x23, 0x28, 0xca, 0xfb, 0x34, 0x28,
+	0x3e, 0xd3, 0x72, 0x9b, 0x87, 0x32, 0x55, 0xcb, 0x85, 0xe1, 0xd2, 0xa4, 0x86, 0xfa, 0x90, 0xe7,
-	0xf2, 0x71, 0x35, 0x72, 0xf7, 0xa6, 0xb9, 0x9a, 0xd6, 0x2d, 0x74, 0x3d, 0x64, 0xba, 0xee, 0xe3,
+	0x17, 0x82, 0xa2, 0xfe, 0x0b, 0x5d, 0x2a, 0x8a, 0xfa, 0x2f, 0x7c, 0x87, 0xe8, 0x66, 0x2d, 0x23,
-	0x46, 0x6c, 0xad, 0x04, 0xe7, 0x53, 0xed, 0xf1, 0xb7, 0x34, 0xf4, 0x63, 0x80, 0x00, 0x5e, 0x8e,
+	0x28, 0xca, 0x1b, 0x38, 0x28, 0xf2, 0x39, 0x36, 0x72, 0x5b, 0xa7, 0xb9, 0x96, 0xd6, 0x2d, 0x74,
-	0x9d, 0xc0, 0x28, 0x52, 0x1d, 0x3b, 0x81, 0x31, 0x64, 0x1a, 0x6f, 0x30, 0xbd, 0xeb, 0xf8, 0x61,
+	0x3d, 0x60, 0xba, 0xee, 0xe1, 0x46, 0x6c, 0xad, 0x04, 0xe7, 0x13, 0xed, 0xd1, 0x87, 0x1a, 0xfa,
-	0x54, 0xaf, 0xe7, 0x18, 0x96, 0x7b, 0x46, 0x9c, 0x0f, 0x38, 0x84, 0xe8, 0x5e, 0x98, 0x23, 0x7a,
+	0x11, 0x40, 0x00, 0x48, 0xc7, 0x4e, 0x60, 0x14, 0xdb, 0x8e, 0x9d, 0xc0, 0x18, 0x96, 0x8d, 0x37,
-	0x18, 0xfe, 0x75, 0x01, 0xe6, 0x69, 0x05, 0x4c, 0x0b, 0x85, 0x00, 0x38, 0x88, 0x5a, 0x12, 0x83,
+	0x99, 0xde, 0x0d, 0xfc, 0x20, 0xaa, 0xd7, 0x73, 0x0c, 0xcb, 0x3d, 0x23, 0xce, 0x07, 0x1c, 0x74,
-	0xeb, 0xa2, 0x96, 0xc4, 0x31, 0x87, 0x70, 0xa1, 0xc0, 0x7e, 0xf1, 0x41, 0x18, 0x03, 0x75, 0xb4,
+	0x74, 0x2f, 0xcc, 0x11, 0x3d, 0x0c, 0xff, 0xba, 0x00, 0xf3, 0xb4, 0x02, 0xa6, 0x85, 0x42, 0x00,
-	0x0d, 0x65, 0x05, 0x59, 0x40, 0x09, 0xc2, 0xc2, 0x38, 0x60, 0x34, 0xf5, 0x24, 0xc0, 0x12, 0xf8,
+	0x1c, 0x44, 0x2d, 0x89, 0x01, 0x7c, 0x51, 0x4b, 0xe2, 0x98, 0x43, 0xb8, 0x50, 0x60, 0xbf, 0x11,
-	0x2e, 0xd3, 0xb7, 0xc2, 0x53, 0x0f, 0xd3, 0xd7, 0xe7, 0x1c, 0x54, 0xe1, 0x6b, 0xa8, 0xa8, 0xe8,
+	0x21, 0x8c, 0x81, 0x3a, 0xda, 0x86, 0xb2, 0x82, 0x2c, 0xa0, 0x04, 0x61, 0x61, 0xe4, 0x30, 0x9a,
-	0x03, 0x4a, 0x90, 0x17, 0xc1, 0x18, 0xa3, 0x61, 0x36, 0x09, 0xbc, 0x08, 0x1f, 0x7c, 0xff, 0x57,
+	0x7a, 0x12, 0x60, 0x09, 0x7c, 0x87, 0xe9, 0x5b, 0xe1, 0xa9, 0x87, 0xe9, 0xeb, 0x73, 0x0e, 0xaa,
-	0x2d, 0x92, 0x8d, 0x2a, 0x1e, 0x40, 0x41, 0xc0, 0x11, 0x49, 0xb3, 0x0c, 0x03, 0x92, 0x49, 0xb3,
+	0xf0, 0x35, 0x54, 0x54, 0xf4, 0x01, 0x25, 0xc8, 0x8b, 0xa0, 0x92, 0xd1, 0x30, 0x9b, 0x04, 0x5e,
-	0x8c, 0x60, 0x19, 0xe1, 0xe2, 0x92, 0x69, 0xa4, 0x6f, 0x5c, 0x32, 0x95, 0x09, 0x6d, 0xcf, 0x89,
+	0x84, 0x0f, 0xbe, 0xff, 0x3b, 0x18, 0xc9, 0x46, 0x15, 0x0f, 0xa0, 0x20, 0xe0, 0x88, 0xa4, 0x59,
-	0x97, 0xa6, 0x2d, 0x40, 0xd7, 0xd2, 0xb4, 0x29, 0x6f, 0xbb, 0x69, 0xda, 0xce, 0x89, 0x27, 0x8e,
+	0x86, 0x21, 0xcc, 0xa4, 0x59, 0x46, 0xb0, 0x8c, 0x70, 0x71, 0xc9, 0x34, 0xd2, 0x37, 0x2e, 0x99,
-	0x8b, 0x7c, 0x8b, 0x44, 0x29, 0xc2, 0xd4, 0xf4, 0x81, 0xa7, 0xb1, 0x24, 0xd5, 0xfe, 0x81, 0x42,
+	0xca, 0x84, 0xb6, 0x67, 0xc4, 0x4b, 0xd3, 0x16, 0xa0, 0x6b, 0x69, 0xda, 0x94, 0xb7, 0xdd, 0x34,
-	0x99, 0x3b, 0xae, 0x00, 0x02, 0xb0, 0x24, 0x5a, 0xd0, 0x25, 0x22, 0xae, 0xd1, 0x82, 0x2e, 0x19,
+	0x6d, 0xe7, 0xc4, 0x13, 0xc7, 0x45, 0xbe, 0x45, 0xa2, 0x14, 0x61, 0x6a, 0xfa, 0xc0, 0xd3, 0x58,
-	0x6f, 0x09, 0x87, 0x86, 0x40, 0x2f, 0x7f, 0xf5, 0xa0, 0x9a, 0x7f, 0xae, 0x01, 0x8a, 0xe3, 0x2a,
+	0x92, 0x6a, 0xff, 0x40, 0xa1, 0xcc, 0x1d, 0x57, 0x00, 0x01, 0x58, 0x12, 0x2d, 0xe8, 0x12, 0x11,
-	0xe8, 0x49, 0xb2, 0xf4, 0x44, 0x1c, 0xb7, 0xf9, 0xfe, 0x9b, 0x31, 0x27, 0x45, 0xfb, 0xc0, 0xa4,
+	0xd7, 0x68, 0x41, 0x97, 0x8c, 0xb7, 0x84, 0x43, 0x43, 0xa0, 0x97, 0xbf, 0x7a, 0x50, 0xcd, 0x3f,
-	0x1e, 0xe3, 0x1e, 0xbd, 0xa6, 0x46, 0xfd, 0x85, 0x06, 0xd5, 0x10, 0x28, 0x83, 0xde, 0x49, 0x59,
+	0xd3, 0x00, 0xc5, 0x71, 0x15, 0xf4, 0x38, 0x59, 0x7a, 0x22, 0x8e, 0xdb, 0x7c, 0xff, 0xcd, 0x98,
-	0xd3, 0x08, 0x0c, 0xdc, 0x7c, 0xf7, 0x46, 0xbe, 0xa4, 0x4a, 0x57, 0xd9, 0x01, 0xb2, 0xe4, 0xff,
+	0x93, 0xa2, 0x7d, 0x60, 0x52, 0x8f, 0x71, 0x8f, 0x5e, 0x53, 0xa3, 0xfe, 0x42, 0x83, 0x6a, 0x08,
-	0xa9, 0x06, 0xb5, 0x30, 0x88, 0x83, 0x52, 0x64, 0xc7, 0x60, 0xe4, 0xe6, 0xfa, 0xcd, 0x8c, 0xd3,
+	0x94, 0x41, 0xef, 0xa4, 0xac, 0x69, 0x04, 0x06, 0x6e, 0xbe, 0x7b, 0x23, 0x5f, 0x52, 0xa5, 0xab,
-	0x97, 0x27, 0xa8, 0xf6, 0x07, 0x50, 0x10, 0xb0, 0x4f, 0xd2, 0xc6, 0x0f, 0x03, 0xd0, 0x49, 0x1b,
+	0xec, 0x00, 0x59, 0xf2, 0xff, 0x44, 0x83, 0x5a, 0x18, 0xc4, 0x41, 0x29, 0xb2, 0x63, 0x30, 0x72,
-	0x3f, 0x82, 0x19, 0x25, 0x6c, 0x7c, 0xc7, 0x1e, 0x10, 0xe5, 0x98, 0x09, 0x5c, 0x28, 0x4d, 0xdb,
+	0x73, 0xe3, 0x66, 0xc6, 0xe9, 0xcb, 0x13, 0x54, 0xfb, 0x03, 0x28, 0x08, 0xd8, 0x27, 0x69, 0xe3,
-	0xf4, 0x63, 0x16, 0x01, 0x95, 0xd2, 0xb4, 0x05, 0xc7, 0x4c, 0x02, 0x42, 0x28, 0x45, 0xd8, 0x0d,
+	0x87, 0x01, 0xe8, 0xa4, 0x8d, 0x1f, 0xc1, 0x8c, 0x12, 0x36, 0xbe, 0x63, 0x0f, 0x88, 0x72, 0xcc,
-	0xc7, 0x2c, 0x8a, 0x27, 0x25, 0x1c, 0x33, 0xa6, 0x50, 0x39, 0x66, 0x01, 0x74, 0x93, 0x74, 0xcc,
+	0x04, 0x2e, 0x94, 0xa6, 0x6d, 0xfa, 0x31, 0x8b, 0x80, 0x4a, 0x69, 0xda, 0x82, 0x63, 0x26, 0x01,
-	0x62, 0x78, 0x7a, 0xd2, 0x31, 0x8b, 0xa3, 0x3f, 0x09, 0xeb, 0xc8, 0xf4, 0x86, 0x8e, 0xd9, 0x52,
+	0x21, 0x94, 0x22, 0xec, 0x86, 0x63, 0x16, 0xc5, 0x93, 0x12, 0x8e, 0x19, 0x53, 0xa8, 0x1c, 0xb3,
-	0x02, 0xca, 0x83, 0xde, 0x4f, 0x71, 0x62, 0x22, 0x4c, 0xdf, 0xfc, 0xe0, 0x0d, 0xb9, 0x53, 0xf7,
+	0x00, 0xba, 0x49, 0x3a, 0x66, 0x31, 0x3c, 0x3d, 0xe9, 0x98, 0xc5, 0xd1, 0x9f, 0x84, 0x75, 0x64,
-	0x38, 0x77, 0xbf, 0xdc, 0xe3, 0x7f, 0xa3, 0xc1, 0x72, 0x12, 0x42, 0x84, 0x52, 0xf4, 0xa4, 0xc0,
+	0x7a, 0x43, 0xc7, 0x6c, 0x29, 0x01, 0xe5, 0x41, 0xef, 0xa7, 0x38, 0x31, 0x11, 0xa6, 0x6f, 0x7e,
-	0xfb, 0xcd, 0x8d, 0x37, 0x65, 0x9f, 0xee, 0x2d, 0x7f, 0xd7, 0x3f, 0xab, 0xff, 0xdb, 0x97, 0xab,
+	0xf0, 0x86, 0xdc, 0xa9, 0x7b, 0x9c, 0xbb, 0x5f, 0xee, 0xf1, 0xbf, 0xd1, 0x60, 0x39, 0x09, 0x21,
-	0xda, 0x7f, 0x7e, 0xb9, 0xaa, 0xfd, 0xcf, 0x97, 0xab, 0xda, 0xdf, 0xfe, 0xef, 0xea, 0xdc, 0x69,
+	0x42, 0x29, 0x7a, 0x52, 0xe0, 0xfd, 0xe6, 0xe6, 0x9b, 0xb2, 0x4f, 0xf7, 0x96, 0xbf, 0xeb, 0x9f,
-	0x9e, 0xfd, 0x56, 0xf2, 0x3b, 0xbf, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xad, 0x27, 0xa6, 0xe1, 0xb2,
+	0xd6, 0xff, 0xed, 0xab, 0x35, 0xed, 0x3f, 0xbf, 0x5a, 0xd3, 0xfe, 0xe7, 0xab, 0x35, 0xed, 0x6f,
-	0x39, 0x00, 0x00,
+	0xff, 0x77, 0x6d, 0xee, 0x34, 0xcf, 0x7e, 0x5d, 0xf9, 0xed, 0x5f, 0x05, 0x00, 0x00, 0xff, 0xff,
+	0x52, 0x4e, 0xd7, 0x33, 0xe4, 0x39, 0x00, 0x00,
 }

etcdserver/etcdserverpb/rpc.proto

@@ -1008,6 +1008,7 @@ message AuthenticateRequest {
 message AuthUserAddRequest {
   string name = 1;
   string password = 2;
+  authpb.UserAddOptions options = 3;
 }
 
 message AuthUserGetRequest {

integration/v3_auth_test.go

@@ -96,7 +96,7 @@ func TestV3AuthRevision(t *testing.T) {
 	rev := presp.Header.Revision
 
 	ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
-	aresp, aerr := api.Auth.UserAdd(ctx, &pb.AuthUserAddRequest{Name: "root", Password: "123"})
+	aresp, aerr := api.Auth.UserAdd(ctx, &pb.AuthUserAddRequest{Name: "root", Password: "123", Options: &authpb.UserAddOptions{NoPassword: false}})
 	cancel()
 	if aerr != nil {
 		t.Fatal(aerr)
@@ -294,7 +294,7 @@ func TestV3AuthWithLeaseAttach(t *testing.T) {
 
 func authSetupUsers(t *testing.T, auth pb.AuthClient, users []user) {
 	for _, user := range users {
-		if _, err := auth.UserAdd(context.TODO(), &pb.AuthUserAddRequest{Name: user.name, Password: user.password}); err != nil {
+		if _, err := auth.UserAdd(context.TODO(), &pb.AuthUserAddRequest{Name: user.name, Password: user.password, Options: &authpb.UserAddOptions{NoPassword: false}}); err != nil {
 			t.Fatal(err)
 		}
 		if _, err := auth.RoleAdd(context.TODO(), &pb.AuthRoleAddRequest{Name: user.role}); err != nil {

tests/e2e/ctl_v3_auth_test.go

@@ -66,6 +66,9 @@ func TestCtlV3AuthCertCNAndUsername(t *testing.T) {
 	testCtl(t, authTestCertCNAndUsername, withCfg(configClientTLSCertAuth))
 }
 func TestCtlV3AuthJWTExpire(t *testing.T) { testCtl(t, authTestJWTExpire, withCfg(configJWT)) }
+func TestCtlV3AuthCertCNAndUsernameNoPassword(t *testing.T) {
+	testCtl(t, authTestCertCNAndUsernameNoPassword, withCfg(configClientTLSCertAuth))
+}
 
 func authEnableTest(cx ctlCtx) {
 	if err := authEnable(cx); err != nil {
@@ -1041,7 +1044,7 @@ func authTestEndpointHealth(cx ctlCtx) {
 	}
 }
 
-func authTestCertCNAndUsername(cx ctlCtx) {
+func certCNAndUsername(cx ctlCtx, noPassword bool) {
 	if err := authEnable(cx); err != nil {
 		cx.t.Fatal(err)
 	}
@@ -1049,8 +1052,14 @@ func authTestCertCNAndUsername(cx ctlCtx) {
 	cx.user, cx.pass = "root", "root"
 	authSetupTestUser(cx)
 
-	if err := ctlV3User(cx, []string{"add", "example.com", "--interactive=false"}, "User example.com created", []string{""}); err != nil {
+	if noPassword {
-		cx.t.Fatal(err)
+		if err := ctlV3User(cx, []string{"add", "example.com", "--no-password"}, "User example.com created", []string{""}); err != nil {
+			cx.t.Fatal(err)
+		}
+	} else {
+		if err := ctlV3User(cx, []string{"add", "example.com", "--interactive=false"}, "User example.com created", []string{""}); err != nil {
+			cx.t.Fatal(err)
+		}
 	}
 	if err := spawnWithExpect(append(cx.PrefixArgs(), "role", "add", "test-role-cn"), "Role test-role-cn created"); err != nil {
 		cx.t.Fatal(err)
@@ -1093,6 +1102,14 @@ func authTestCertCNAndUsername(cx ctlCtx) {
 	}
 }
 
+func authTestCertCNAndUsername(cx ctlCtx) {
+	certCNAndUsername(cx, false)
+}
+
+func authTestCertCNAndUsernameNoPassword(cx ctlCtx) {
+	certCNAndUsername(cx, true)
+}
+
 func authTestJWTExpire(cx ctlCtx) {
 	if err := authEnable(cx); err != nil {
 		cx.t.Fatal(err)

tests/e2e/ctl_v3_user_test.go

@@ -78,6 +78,12 @@ func userAddTest(cx ctlCtx) {
 			expectedStr: "user name already exists",
 			stdIn:       []string{"password"},
 		},
+		// Adds a user without password.
+		{
+			args:        []string{"add", "userwopasswd", "--no-password"},
+			expectedStr: "User userwopasswd created",
+			stdIn:       []string{},
+		},
 	}
 
 	for i, cmd := range cmdSet {

tests/e2e/v3_curl_test.go

@@ -22,6 +22,7 @@ import (
 	"strconv"
 	"testing"
 
+	"go.etcd.io/etcd/auth/authpb"
 	epb "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb"
 	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
 	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
@@ -187,7 +188,7 @@ func testV3CurlAuth(cx ctlCtx) {
 	p := cx.apiPrefix
 
 	// create root user
-	rootuser, err := json.Marshal(&pb.AuthUserAddRequest{Name: string("root"), Password: string("toor")})
+	rootuser, err := json.Marshal(&pb.AuthUserAddRequest{Name: string("root"), Password: string("toor"), Options: &authpb.UserAddOptions{NoPassword: false}})
 	testutil.AssertNil(cx.t, err)
 
 	if err = cURLPost(cx.epc, cURLReq{endpoint: path.Join(p, "/auth/user/add"), value: string(rootuser), expected: "revision"}); err != nil {

tools/etcd-dump-logs/etcd-dump-log_test.go

@@ -203,7 +203,7 @@ func appendNormalIRREnts(ents *[]raftpb.Entry) {
 
 	irrauthenticate := &etcdserverpb.InternalAuthenticateRequest{Name: "myname", Password: "password", SimpleToken: "token"}
 
-	irrauthuseradd := &etcdserverpb.AuthUserAddRequest{Name: "name1", Password: "pass1"}
+	irrauthuseradd := &etcdserverpb.AuthUserAddRequest{Name: "name1", Password: "pass1", Options: &authpb.UserAddOptions{NoPassword: false}}
 
 	irrauthuserdelete := &etcdserverpb.AuthUserDeleteRequest{Name: "name1"}