*: support revoking a key from a role in auth v3

This commit implements RoleRevoke() RPC for supporting revoking a key
from a role in auth v3. It also adds a new subcommand "role revoke" to
etcdctl.

auth/store.go

@@ -88,6 +88,9 @@ type AuthStore interface {
 	// RoleGet gets the detailed information of a role
 	RoleGet(r *pb.AuthRoleGetRequest) (*pb.AuthRoleGetResponse, error)
 
+	// RoleRevoke gets the detailed information of a role
+	RoleRevoke(r *pb.AuthRoleRevokeRequest) (*pb.AuthRoleRevokeResponse, error)
+
 	// UsernameFromToken gets a username from the given Token
 	UsernameFromToken(token string) (string, bool)
 
@@ -389,6 +392,42 @@ func (as *authStore) RoleGet(r *pb.AuthRoleGetRequest) (*pb.AuthRoleGetResponse,
 	return &resp, nil
 }
 
+func (as *authStore) RoleRevoke(r *pb.AuthRoleRevokeRequest) (*pb.AuthRoleRevokeResponse, error) {
+	tx := as.be.BatchTx()
+	tx.Lock()
+	defer tx.Unlock()
+
+	_, vs := tx.UnsafeRange(authRolesBucketName, []byte(r.Role), nil, 0)
+	if len(vs) != 1 {
+		return nil, ErrRoleNotFound
+	}
+
+	role := &authpb.Role{}
+	err := role.Unmarshal(vs[0])
+	if err != nil {
+		return nil, err
+	}
+
+	updatedRole := &authpb.Role{}
+	updatedRole.Name = role.Name
+
+	for _, perm := range role.KeyPermission {
+		if !bytes.Equal(perm.Key, []byte(r.Key)) {
+			updatedRole.KeyPermission = append(updatedRole.KeyPermission, perm)
+		}
+	}
+
+	marshaledRole, merr := updatedRole.Marshal()
+	if merr != nil {
+		return nil, merr
+	}
+
+	tx.UnsafePut(authRolesBucketName, updatedRole.Name, marshaledRole)
+
+	plog.Noticef("revoked key %s from role %s", r.Key, r.Role)
+	return &pb.AuthRoleRevokeResponse{}, nil
+}
+
 func (as *authStore) RoleAdd(r *pb.AuthRoleAddRequest) (*pb.AuthRoleAddResponse, error) {
 	tx := as.be.BatchTx()
 	tx.Lock()

clientv3/auth.go

@@ -38,6 +38,7 @@ type (
 	AuthRoleAddResponse            pb.AuthRoleAddResponse
 	AuthRoleGrantResponse          pb.AuthRoleGrantResponse
 	AuthRoleGetResponse            pb.AuthRoleGetResponse
+	AuthRoleRevokeResponse         pb.AuthRoleRevokeResponse
 
 	PermissionType authpb.Permission_Type
 )
@@ -81,6 +82,9 @@ type Auth interface {
 
 	// RoleGet gets a detailed information of a role.
 	RoleGet(ctx context.Context, role string) (*AuthRoleGetResponse, error)
+
+	// RoleRevoke revokes a key from a user.
+	RoleRevoke(ctx context.Context, role string, key string) (*AuthRoleRevokeResponse, error)
 }
 
 type auth struct {
@@ -158,6 +162,11 @@ func (auth *auth) RoleGet(ctx context.Context, role string) (*AuthRoleGetRespons
 	return (*AuthRoleGetResponse)(resp), rpctypes.Error(err)
 }
 
+func (auth *auth) RoleRevoke(ctx context.Context, role string, key string) (*AuthRoleRevokeResponse, error) {
+	resp, err := auth.remote.RoleRevoke(ctx, &pb.AuthRoleRevokeRequest{Role: role, Key: key})
+	return (*AuthRoleRevokeResponse)(resp), rpctypes.Error(err)
+}
+
 func StrToPermissionType(s string) (PermissionType, error) {
 	val, ok := authpb.Permission_Type_value[strings.ToUpper(s)]
 	if ok {

etcdctl/ctlv3/command/role_command.go

@@ -32,6 +32,7 @@ func NewRoleCommand() *cobra.Command {
 	ac.AddCommand(newRoleAddCommand())
 	ac.AddCommand(newRoleGrantCommand())
 	ac.AddCommand(newRoleGetCommand())
+	ac.AddCommand(newRoleRevokePermissionCommand())
 
 	return ac
 }
@@ -60,6 +61,14 @@ func newRoleGetCommand() *cobra.Command {
 	}
 }
 
+func newRoleRevokePermissionCommand() *cobra.Command {
+	return &cobra.Command{
+		Use:   "revoke-permission <role name> <key>",
+		Short: "revoke a key from a role",
+		Run:   roleRevokePermissionCommandFunc,
+	}
+}
+
 // roleAddCommandFunc executes the "role add" command.
 func roleAddCommandFunc(cmd *cobra.Command, args []string) {
 	if len(args) != 1 {
@@ -118,3 +127,17 @@ func roleGetCommandFunc(cmd *cobra.Command, args []string) {
 		}
 	}
 }
+
+// roleRevokePermissionCommandFunc executes the "role revoke-permission" command.
+func roleRevokePermissionCommandFunc(cmd *cobra.Command, args []string) {
+	if len(args) != 2 {
+		ExitWithError(ExitBadArgs, fmt.Errorf("role revoke-permission command requires role name and key as its argument."))
+	}
+
+	_, err := mustClientFromCmd(cmd).Auth.RoleRevoke(context.TODO(), args[0], args[1])
+	if err != nil {
+		ExitWithError(ExitError, err)
+	}
+
+	fmt.Printf("Permission of key %s is revoked from role %s\n", args[1], args[0])
+}

etcdserver/api/v3rpc/auth.go

@@ -74,8 +74,11 @@ func (as *AuthServer) RoleGet(ctx context.Context, r *pb.AuthRoleGetRequest) (*p
 }
 
 func (as *AuthServer) RoleRevoke(ctx context.Context, r *pb.AuthRoleRevokeRequest) (*pb.AuthRoleRevokeResponse, error) {
-	plog.Info("not implemented yet")
+	resp, err := as.authenticator.RoleRevoke(ctx, r)
-	return nil, nil
+	if err != nil {
+		return nil, togRPCError(err)
+	}
+	return resp, nil
 }
 
 func (as *AuthServer) RoleGrant(ctx context.Context, r *pb.AuthRoleGrantRequest) (*pb.AuthRoleGrantResponse, error) {

etcdserver/apply.go

@@ -66,6 +66,7 @@ type applierV3 interface {
 	RoleAdd(ua *pb.AuthRoleAddRequest) (*pb.AuthRoleAddResponse, error)
 	RoleGrant(ua *pb.AuthRoleGrantRequest) (*pb.AuthRoleGrantResponse, error)
 	RoleGet(ua *pb.AuthRoleGetRequest) (*pb.AuthRoleGetResponse, error)
+	RoleRevoke(ua *pb.AuthRoleRevokeRequest) (*pb.AuthRoleRevokeResponse, error)
 }
 
 type applierV3backend struct {
@@ -123,6 +124,8 @@ func (s *EtcdServer) applyV3Request(r *pb.InternalRaftRequest) *applyResult {
 		ar.resp, ar.err = s.applyV3.RoleGrant(r.AuthRoleGrant)
 	case r.AuthRoleGet != nil:
 		ar.resp, ar.err = s.applyV3.RoleGet(r.AuthRoleGet)
+	case r.AuthRoleRevoke != nil:
+		ar.resp, ar.err = s.applyV3.RoleRevoke(r.AuthRoleRevoke)
 	default:
 		panic("not implemented")
 	}
@@ -561,6 +564,10 @@ func (a *applierV3backend) RoleGet(r *pb.AuthRoleGetRequest) (*pb.AuthRoleGetRes
 	return a.s.AuthStore().RoleGet(r)
 }
 
+func (a *applierV3backend) RoleRevoke(r *pb.AuthRoleRevokeRequest) (*pb.AuthRoleRevokeResponse, error) {
+	return a.s.AuthStore().RoleRevoke(r)
+}
+
 type quotaApplierV3 struct {
 	applierV3
 	q Quota

etcdserver/etcdserverpb/raft_internal.pb.go

@@ -56,6 +56,7 @@ type InternalRaftRequest struct {
 	AuthUserGet            *AuthUserGetRequest            `protobuf:"bytes,1019,opt,name=auth_user_get,json=authUserGet" json:"auth_user_get,omitempty"`
 	AuthRoleGet            *AuthRoleGetRequest            `protobuf:"bytes,1020,opt,name=auth_role_get,json=authRoleGet" json:"auth_role_get,omitempty"`
 	AuthUserRevoke         *AuthUserRevokeRequest         `protobuf:"bytes,1021,opt,name=auth_user_revoke,json=authUserRevoke" json:"auth_user_revoke,omitempty"`
+	AuthRoleRevoke         *AuthRoleRevokeRequest         `protobuf:"bytes,1022,opt,name=auth_role_revoke,json=authRoleRevoke" json:"auth_role_revoke,omitempty"`
 }
 
 func (m *InternalRaftRequest) Reset()                    { *m = InternalRaftRequest{} }
@@ -371,6 +372,18 @@ func (m *InternalRaftRequest) MarshalTo(data []byte) (int, error) {
 		}
 		i += n22
 	}
+	if m.AuthRoleRevoke != nil {
+		data[i] = 0xf2
+		i++
+		data[i] = 0x3f
+		i++
+		i = encodeVarintRaftInternal(data, i, uint64(m.AuthRoleRevoke.Size()))
+		n23, err := m.AuthRoleRevoke.MarshalTo(data[i:])
+		if err != nil {
+			return 0, err
+		}
+		i += n23
+	}
 	return i, nil
 }
 
@@ -526,6 +539,10 @@ func (m *InternalRaftRequest) Size() (n int) {
 		l = m.AuthUserRevoke.Size()
 		n += 2 + l + sovRaftInternal(uint64(l))
 	}
+	if m.AuthRoleRevoke != nil {
+		l = m.AuthRoleRevoke.Size()
+		n += 2 + l + sovRaftInternal(uint64(l))
+	}
 	return n
 }
 
@@ -1420,6 +1437,39 @@ func (m *InternalRaftRequest) Unmarshal(data []byte) error {
 				return err
 			}
 			iNdEx = postIndex
+		case 1022:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field AuthRoleRevoke", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowRaftInternal
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := data[iNdEx]
+				iNdEx++
+				msglen |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthRaftInternal
+			}
+			postIndex := iNdEx + msglen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.AuthRoleRevoke == nil {
+				m.AuthRoleRevoke = &AuthRoleRevokeRequest{}
+			}
+			if err := m.AuthRoleRevoke.Unmarshal(data[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipRaftInternal(data[iNdEx:])
@@ -1597,46 +1647,47 @@ var (
 )
 
 var fileDescriptorRaftInternal = []byte{
-	// 644 bytes of a gzipped FileDescriptorProto
+	// 659 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x95, 0xcb, 0x6f, 0xd3, 0x4c,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x95, 0x5b, 0x6f, 0xd3, 0x30,
-	0x14, 0xc5, 0xbf, 0xa6, 0xef, 0x49, 0xd3, 0x56, 0xd3, 0x0f, 0x34, 0x04, 0xa9, 0x94, 0x20, 0x24,
+	0x14, 0xc7, 0x59, 0x77, 0x77, 0xdb, 0x6d, 0xf2, 0x00, 0x99, 0x22, 0x8d, 0x51, 0x84, 0x84, 0x40,
-	0x04, 0x52, 0x41, 0xed, 0x92, 0x05, 0x84, 0xa6, 0x94, 0x0a, 0x84, 0x2a, 0x0b, 0xd6, 0xd6, 0xd4,
+	0x1a, 0x68, 0x7b, 0xe4, 0x01, 0xca, 0x3a, 0xc6, 0x04, 0x42, 0x53, 0x04, 0xcf, 0x95, 0x97, 0x1c,
-	0xbe, 0x38, 0x11, 0x8e, 0x6d, 0xc6, 0x93, 0x50, 0xfe, 0xc3, 0x2e, 0x59, 0xb3, 0x02, 0x56, 0xec,
+	0xb2, 0x8a, 0x34, 0x09, 0x8e, 0x3b, 0xc6, 0x57, 0xe2, 0x93, 0xec, 0x91, 0x8f, 0x00, 0x3c, 0xf1,
-	0x79, 0xbf, 0x24, 0xe6, 0xe5, 0x71, 0x26, 0x71, 0xb2, 0x88, 0x64, 0x9f, 0x39, 0xf7, 0x77, 0xef,
+	0xce, 0xfd, 0x2a, 0x7c, 0x8b, 0x33, 0xaf, 0x6e, 0x1f, 0x2a, 0x25, 0x7f, 0xff, 0xcf, 0xef, 0x1c,
-	0xcc, 0x1c, 0x2b, 0x68, 0x8b, 0xd1, 0x17, 0xdc, 0xef, 0x25, 0x1c, 0x58, 0x42, 0xe3, 0xdd, 0x8c,
+	0xdb, 0xff, 0xa8, 0x68, 0x95, 0xd1, 0x17, 0xbc, 0xd7, 0x4f, 0x39, 0xb0, 0x94, 0x26, 0x1b, 0x39,
-	0xa5, 0x3c, 0xc5, 0x6b, 0xc0, 0x83, 0x30, 0x07, 0x36, 0x04, 0x96, 0x9d, 0x36, 0xff, 0x8f, 0xd2,
+	0xcb, 0x78, 0x86, 0x1b, 0xc0, 0xc3, 0xa8, 0x00, 0x76, 0x04, 0x2c, 0x3f, 0x68, 0x9d, 0x8f, 0xb3,
-	0x28, 0x55, 0x0b, 0xb7, 0xe5, 0x93, 0xf6, 0x34, 0x37, 0x4b, 0x8f, 0x51, 0x56, 0x59, 0x16, 0xe8,
+	0x38, 0x53, 0x0b, 0xb7, 0xe5, 0x93, 0xf6, 0xb4, 0x56, 0x2a, 0x8f, 0x51, 0x16, 0x59, 0x1e, 0xea,
-	0xc7, 0xd6, 0x5d, 0xd4, 0xf0, 0xe0, 0xd5, 0x00, 0x72, 0xfe, 0x08, 0x68, 0x08, 0x0c, 0xaf, 0xa3,
+	0xc7, 0xf6, 0x5d, 0xd4, 0x0c, 0xe0, 0xd5, 0x10, 0x0a, 0xfe, 0x08, 0x68, 0x04, 0x0c, 0x2f, 0xa1,
-	0xda, 0x71, 0x87, 0xcc, 0xed, 0xcc, 0xdd, 0x58, 0xf0, 0x6a, 0xbd, 0x0e, 0x6e, 0xa2, 0x95, 0x41,
+	0xda, 0x5e, 0x97, 0x4c, 0xad, 0x4f, 0xdd, 0x98, 0x09, 0x6a, 0xfd, 0x2e, 0x6e, 0xa1, 0x85, 0x61,
-	0x2e, 0x5b, 0xf6, 0x81, 0xd4, 0x84, 0xba, 0xea, 0xd9, 0xf7, 0xd6, 0xbb, 0x3a, 0xda, 0x3a, 0x36,
+	0x21, 0x5b, 0x0e, 0x80, 0xd4, 0x84, 0xba, 0x18, 0xd8, 0xf7, 0xf6, 0xdb, 0x06, 0x5a, 0xdd, 0x33,
-	0x03, 0x79, 0x62, 0x3a, 0x43, 0x9a, 0x60, 0x5c, 0x47, 0xb5, 0xe1, 0x9e, 0xaa, 0xae, 0xef, 0x5d,
+	0x03, 0x05, 0x62, 0x3a, 0x43, 0x1a, 0x61, 0x5c, 0x47, 0xb5, 0xa3, 0x4d, 0x55, 0x5d, 0xdf, 0xbc,
-	0xd8, 0x1d, 0x1d, 0x79, 0xd7, 0x94, 0x78, 0xc2, 0x80, 0xef, 0xa0, 0x45, 0x46, 0x93, 0x08, 0xc8,
+	0xb0, 0x71, 0x7a, 0xe4, 0x0d, 0x53, 0x12, 0x08, 0x03, 0xbe, 0x83, 0x66, 0x19, 0x4d, 0x63, 0x20,
-	0xbc, 0x72, 0x36, 0xc7, 0x9c, 0x72, 0xa9, 0xb0, 0x6b, 0x23, 0xbe, 0x89, 0xe6, 0xb3, 0x01, 0x27,
+	0xd3, 0xca, 0xd9, 0x3a, 0xe3, 0x94, 0x4b, 0xa5, 0x5d, 0x1b, 0xf1, 0x4d, 0x34, 0x9d, 0x0f, 0x39,
-	0x0b, 0xca, 0x4f, 0x5c, 0xff, 0xc9, 0xa0, 0x98, 0xc7, 0x93, 0x26, 0x7c, 0x80, 0xd6, 0x42, 0x88,
+	0x99, 0x51, 0x7e, 0xe2, 0xfa, 0xf7, 0x87, 0xe5, 0x3c, 0x81, 0x34, 0xe1, 0x6d, 0xd4, 0x88, 0x20,
-	0x81, 0x83, 0xaf, 0x9b, 0x2c, 0xaa, 0xa2, 0x1d, 0xb7, 0xa8, 0xa3, 0x1c, 0x4e, 0xab, 0x7a, 0x58,
+	0x01, 0x0e, 0x3d, 0xdd, 0x64, 0x56, 0x15, 0xad, 0xbb, 0x45, 0x5d, 0xe5, 0x70, 0x5a, 0xd5, 0xa3,
-	0x6a, 0xb2, 0x21, 0x3f, 0x4b, 0xc8, 0x52, 0x55, 0xc3, 0x67, 0x67, 0x89, 0x6d, 0x28, 0x4c, 0xf8,
+	0x4a, 0x93, 0x0d, 0xf9, 0x71, 0x4a, 0xe6, 0x7c, 0x0d, 0x9f, 0x1d, 0xa7, 0xb6, 0xa1, 0x30, 0xe1,
-	0x1e, 0x42, 0x41, 0xda, 0xcf, 0x68, 0xc0, 0x7b, 0x69, 0x42, 0x96, 0x55, 0xc9, 0x15, 0xb7, 0xe4,
+	0x7b, 0x08, 0x85, 0xd9, 0x20, 0xa7, 0x21, 0xef, 0x67, 0x29, 0x99, 0x57, 0x25, 0x57, 0xdc, 0x92,
-	0xc0, 0xae, 0x17, 0x95, 0x23, 0x25, 0xf8, 0x3e, 0xaa, 0xc7, 0x40, 0x73, 0xf0, 0x23, 0x31, 0x31,
+	0x6d, 0xbb, 0x5e, 0x56, 0x9e, 0x2a, 0xc1, 0xf7, 0x51, 0x3d, 0x01, 0x5a, 0x40, 0x2f, 0x16, 0x13,
-	0x27, 0x2b, 0x55, 0x84, 0x27, 0xd2, 0x70, 0x24, 0xd7, 0x2d, 0x21, 0xb6, 0x92, 0xdc, 0xb3, 0x26,
+	0x73, 0xb2, 0xe0, 0x23, 0x3c, 0x91, 0x86, 0x5d, 0xb9, 0x6e, 0x09, 0x89, 0x95, 0xe4, 0x9e, 0x35,
-	0x30, 0x18, 0xa6, 0x2f, 0x81, 0xac, 0x56, 0xed, 0x59, 0x21, 0x3c, 0x65, 0xb0, 0x7b, 0x8e, 0x4b,
+	0x81, 0xc1, 0x51, 0xf6, 0x12, 0xc8, 0xa2, 0x6f, 0xcf, 0x0a, 0x11, 0x28, 0x83, 0xdd, 0x73, 0x52,
-	0x4d, 0x5e, 0x0b, 0x8d, 0x29, 0xeb, 0x13, 0x54, 0x75, 0x2d, 0x6d, 0xb9, 0x64, 0xaf, 0x45, 0x19,
+	0x69, 0xf2, 0x5a, 0x68, 0x42, 0xd9, 0x80, 0x20, 0xdf, 0xb5, 0x74, 0xe4, 0x92, 0xbd, 0x16, 0x65,
-	0xf1, 0x3e, 0x5a, 0xea, 0xaa, 0x34, 0x91, 0x50, 0x95, 0x5c, 0xae, 0xbc, 0x73, 0x1d, 0x38, 0xcf,
+	0xc4, 0x5b, 0x68, 0xee, 0x50, 0xa5, 0x89, 0x44, 0xaa, 0xe4, 0xb2, 0xf7, 0xce, 0x75, 0xe0, 0x02,
-	0x58, 0x71, 0x1b, 0xd5, 0xe9, 0x80, 0x77, 0x7d, 0x48, 0xe8, 0x69, 0x0c, 0xe4, 0x53, 0xe5, 0x81,
+	0x63, 0xc5, 0x1d, 0x54, 0xa7, 0x43, 0x7e, 0xd8, 0x83, 0x94, 0x1e, 0x24, 0x40, 0x3e, 0x79, 0x0f,
-	0xb5, 0x85, 0xe3, 0x50, 0x19, 0xec, 0x76, 0xa9, 0x95, 0x70, 0x07, 0xad, 0x29, 0x44, 0xd8, 0xcb,
+	0xac, 0x23, 0x1c, 0x3b, 0xca, 0x60, 0xb7, 0x4b, 0xad, 0x84, 0xbb, 0xa8, 0xa1, 0x10, 0x51, 0xbf,
-	0x15, 0xe3, 0xf3, 0x72, 0xd5, 0x7e, 0x25, 0xa3, 0xa3, 0x1d, 0x76, 0xbf, 0xb4, 0xd4, 0xf0, 0x21,
+	0x50, 0x8c, 0xcf, 0xf3, 0xbe, 0xfd, 0x4a, 0x46, 0x57, 0x3b, 0xec, 0x7e, 0x69, 0xa5, 0xe1, 0x1d,
-	0x6a, 0x28, 0x8a, 0x8c, 0xb9, 0x4f, 0xc3, 0x90, 0x7c, 0x99, 0x8a, 0x79, 0x2e, 0xde, 0xda, 0x61,
+	0xd4, 0x54, 0x14, 0x19, 0xf3, 0x1e, 0x8d, 0x22, 0xf2, 0x65, 0x2c, 0xe6, 0xb9, 0x78, 0xeb, 0x44,
-	0xe8, 0x60, 0x8c, 0x86, 0x9f, 0xa2, 0xcd, 0x12, 0xa3, 0x33, 0x44, 0xbe, 0x6a, 0xd2, 0xb5, 0x6a,
+	0x91, 0x83, 0x31, 0x1a, 0x7e, 0x8a, 0x56, 0x2a, 0x8c, 0xce, 0x10, 0xf9, 0xaa, 0x49, 0xd7, 0xfc,
-	0x92, 0x09, 0x9f, 0x81, 0xad, 0x53, 0x47, 0xc6, 0x11, 0xba, 0x54, 0xf2, 0x82, 0xae, 0x8c, 0xa3,
+	0x24, 0x13, 0x3e, 0x03, 0x5b, 0xa2, 0x8e, 0x8c, 0x63, 0x74, 0xa9, 0xe2, 0x85, 0x87, 0x32, 0x8e,
-	0x9f, 0xd1, 0x3c, 0x7f, 0x9d, 0xb2, 0x90, 0x7c, 0xd3, 0xe0, 0x5b, 0xd5, 0xe0, 0x03, 0xe5, 0x3e,
+	0xbd, 0x9c, 0x16, 0xc5, 0xeb, 0x8c, 0x45, 0xe4, 0x9b, 0x06, 0xdf, 0xf2, 0x83, 0xb7, 0x95, 0x7b,
-	0x31, 0xe6, 0xa2, 0xc1, 0x45, 0x5a, 0xb9, 0x8c, 0x1f, 0xa3, 0x8d, 0xb2, 0x91, 0x8e, 0xde, 0x77,
+	0xdf, 0x98, 0xcb, 0x06, 0x17, 0xa9, 0x77, 0x19, 0x3f, 0x46, 0xcb, 0x55, 0x23, 0x1d, 0xbd, 0xef,
-	0x8d, 0x6f, 0x55, 0xe3, 0x9d, 0xf8, 0x35, 0xe8, 0xa8, 0x6a, 0x0f, 0x93, 0xa5, 0x31, 0xa8, 0xc3,
+	0x1a, 0xdf, 0xf6, 0xe3, 0x9d, 0xf8, 0x35, 0xe9, 0x69, 0xd5, 0x1e, 0x26, 0xcb, 0x12, 0x50, 0x87,
-	0xfc, 0x31, 0xf5, 0x30, 0x3d, 0x61, 0x19, 0x3f, 0x4c, 0xa3, 0xd9, 0x99, 0x14, 0x46, 0xcf, 0xf4,
+	0xf9, 0x63, 0xec, 0x61, 0x06, 0xc2, 0x72, 0xf6, 0x30, 0x8d, 0x66, 0x67, 0x52, 0x18, 0x3d, 0xd3,
-	0x73, 0xea, 0x4c, 0xb2, 0x68, 0x72, 0x26, 0xab, 0xe2, 0x87, 0x3a, 0x26, 0x90, 0xf0, 0x5e, 0x40,
+	0xcf, 0xb1, 0x33, 0xc9, 0xa2, 0xd1, 0x99, 0xac, 0x8a, 0x1f, 0xea, 0x98, 0x40, 0xca, 0xfb, 0x21,
-	0xc5, 0xad, 0xfc, 0xd2, 0xa4, 0xab, 0x93, 0xa4, 0xc2, 0x52, 0x80, 0x9c, 0x3a, 0x37, 0x28, 0x11,
+	0x15, 0xb7, 0xf2, 0x4b, 0x93, 0xae, 0x8e, 0x92, 0x4a, 0x4b, 0x09, 0x72, 0xea, 0xdc, 0xa0, 0xc4,
-	0x70, 0xf2, 0x7b, 0x66, 0x50, 0x8e, 0x80, 0x4f, 0x04, 0x45, 0x68, 0xee, 0x11, 0x49, 0xcc, 0x9f,
+	0xc0, 0xc9, 0xef, 0x89, 0x41, 0xd9, 0x05, 0x3e, 0x12, 0x14, 0xa1, 0xb9, 0x47, 0x24, 0x31, 0x7f,
-	0x99, 0x47, 0x34, 0x8e, 0x31, 0x9a, 0x9b, 0x37, 0xf3, 0xbd, 0xff, 0x9d, 0x99, 0x37, 0xf7, 0x9b,
+	0x26, 0x1e, 0xd1, 0x59, 0x8c, 0xd1, 0xdc, 0xbc, 0x99, 0xef, 0xfd, 0xef, 0xc4, 0xbc, 0xb9, 0xdf,
-	0xb7, 0x79, 0xd3, 0x72, 0x6b, 0x03, 0x35, 0x0e, 0xfb, 0x19, 0x7f, 0xe3, 0x41, 0x9e, 0xa5, 0x49,
+	0xbc, 0xcd, 0x9b, 0xf9, 0xec, 0x4b, 0x9e, 0x1a, 0xcb, 0xf0, 0xfe, 0x8d, 0xe5, 0xc9, 0x29, 0x3c,
-	0x0e, 0x0f, 0x36, 0xcf, 0x3f, 0x6c, 0xff, 0x77, 0xfe, 0x71, 0x7b, 0xee, 0xad, 0xf8, 0xbd, 0x17,
+	0xbc, 0x4a, 0x6e, 0x2f, 0xa3, 0xe6, 0xce, 0x20, 0xe7, 0x6f, 0x02, 0x28, 0xf2, 0x2c, 0x2d, 0xe0,
-	0xbf, 0xd3, 0x25, 0xf5, 0x1f, 0xb2, 0xff, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x2d, 0xe3, 0x72, 0x0d,
+	0xc1, 0xca, 0xc9, 0x87, 0xb5, 0x73, 0x27, 0x1f, 0xd7, 0xa6, 0xde, 0x89, 0xdf, 0x7b, 0xf1, 0x3b,
-	0x9b, 0x06, 0x00, 0x00,
+	0x98, 0x53, 0xff, 0x49, 0x5b, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x3d, 0x04, 0x90, 0xdc, 0xeb,
+	0x06, 0x00, 0x00,
 }

etcdserver/etcdserverpb/raft_internal.proto

@@ -47,6 +47,7 @@ message InternalRaftRequest {
   AuthUserGetRequest auth_user_get = 1019;
   AuthRoleGetRequest auth_role_get = 1020;
   AuthUserRevokeRequest auth_user_revoke = 1021;
+  AuthRoleRevokeRequest auth_role_revoke = 1022;
 }
 
 message EmptyResponse {

etcdserver/etcdserverpb/rpc.pb.go

@@ -1649,6 +1649,8 @@ func (m *AuthRoleGrantRequest) GetPerm() *authpb.Permission {
 }
 
 type AuthRoleRevokeRequest struct {
+	Role string `protobuf:"bytes,1,opt,name=role,proto3" json:"role,omitempty"`
+	Key  string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"`
 }
 
 func (m *AuthRoleRevokeRequest) Reset()                    { *m = AuthRoleRevokeRequest{} }
@@ -5412,6 +5414,18 @@ func (m *AuthRoleRevokeRequest) MarshalTo(data []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	if len(m.Role) > 0 {
+		data[i] = 0xa
+		i++
+		i = encodeVarintRpc(data, i, uint64(len(m.Role)))
+		i += copy(data[i:], m.Role)
+	}
+	if len(m.Key) > 0 {
+		data[i] = 0x12
+		i++
+		i = encodeVarintRpc(data, i, uint64(len(m.Key)))
+		i += copy(data[i:], m.Key)
+	}
 	return i, nil
 }
 
@@ -6725,6 +6739,14 @@ func (m *AuthRoleGrantRequest) Size() (n int) {
 func (m *AuthRoleRevokeRequest) Size() (n int) {
 	var l int
 	_ = l
+	l = len(m.Role)
+	if l > 0 {
+		n += 1 + l + sovRpc(uint64(l))
+	}
+	l = len(m.Key)
+	if l > 0 {
+		n += 1 + l + sovRpc(uint64(l))
+	}
 	return n
 }
 
@@ -12859,6 +12881,64 @@ func (m *AuthRoleRevokeRequest) Unmarshal(data []byte) error {
 			return fmt.Errorf("proto: AuthRoleRevokeRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Role", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowRpc
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := data[iNdEx]
+				iNdEx++
+				stringLen |= (uint64(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthRpc
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Role = string(data[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Key", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowRpc
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := data[iNdEx]
+				iNdEx++
+				stringLen |= (uint64(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthRpc
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Key = string(data[iNdEx:postIndex])
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipRpc(data[iNdEx:])
@@ -14237,168 +14317,169 @@ var (
 )
 
 var fileDescriptorRpc = []byte{
-	// 2605 bytes of a gzipped FileDescriptorProto
+	// 2617 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x5a, 0xcd, 0x72, 0x1b, 0xc7,
-	0x11, 0x26, 0x7e, 0x08, 0x10, 0x0d, 0x10, 0xa2, 0x86, 0x94, 0x4c, 0x41, 0x3f, 0x96, 0x57, 0x92,
+	0xf1, 0x27, 0x3e, 0x08, 0x10, 0x0d, 0x10, 0xa2, 0x86, 0x94, 0x4c, 0x41, 0x1f, 0x96, 0x47, 0x92,
-	0xad, 0xc4, 0x0e, 0x15, 0x33, 0xce, 0x21, 0x15, 0x97, 0x5c, 0x20, 0x01, 0x4b, 0x0c, 0x29, 0x52,
+	0xad, 0xff, 0xdf, 0x0e, 0x15, 0x33, 0xce, 0x21, 0x15, 0x47, 0x2e, 0x90, 0x80, 0x25, 0x86, 0x14,
-	0x5e, 0x82, 0x54, 0x7c, 0x62, 0x2d, 0x80, 0x11, 0xb9, 0x25, 0xfc, 0x79, 0x77, 0x41, 0x89, 0xaa,
+	0x29, 0x2f, 0x41, 0x2a, 0x3e, 0xb1, 0x16, 0xc0, 0x88, 0x44, 0x09, 0x5f, 0xde, 0x5d, 0x50, 0xa2,
-	0xca, 0x25, 0x55, 0x79, 0x02, 0xe7, 0x94, 0xca, 0x0b, 0xe4, 0x01, 0xf2, 0x0e, 0xa9, 0x5c, 0x92,
+	0xaa, 0x72, 0x49, 0x55, 0x9e, 0xc0, 0x39, 0xa5, 0xf2, 0x02, 0x79, 0x80, 0xbc, 0x43, 0x2a, 0x97,
-	0x27, 0x48, 0x52, 0x39, 0xa5, 0x72, 0xc9, 0x3d, 0xb9, 0xa4, 0xe7, 0x6f, 0x77, 0x76, 0xb0, 0x0b,
+	0xe4, 0x09, 0x92, 0x54, 0x4e, 0xa9, 0x5c, 0x72, 0x4f, 0x2e, 0xe9, 0xf9, 0xda, 0x9d, 0x1d, 0x2c,
-	0xc9, 0x59, 0xe5, 0x20, 0x72, 0xa7, 0xa7, 0xe7, 0x9b, 0xee, 0x9e, 0x9e, 0x9e, 0xee, 0xa6, 0xa0,
+	0x20, 0x39, 0xab, 0x1c, 0x44, 0xee, 0xf4, 0x74, 0xff, 0xa6, 0xa7, 0xa7, 0xa7, 0xa7, 0xbb, 0x29,
-	0xe2, 0x4d, 0x7a, 0x1b, 0x13, 0x6f, 0x1c, 0x8c, 0x49, 0x8d, 0x06, 0xbd, 0xbe, 0x4f, 0xbd, 0x73,
+	0x28, 0x79, 0xe3, 0xce, 0xc6, 0xd8, 0x1b, 0x05, 0x23, 0x52, 0x61, 0x41, 0xa7, 0xeb, 0x33, 0xef,
-	0xea, 0x4d, 0xba, 0x8d, 0xb5, 0xd3, 0xf1, 0xe9, 0x98, 0x4f, 0x3c, 0x60, 0x5f, 0x82, 0xa7, 0x71,
+	0x9c, 0x79, 0xe3, 0x76, 0x6d, 0xed, 0x74, 0x74, 0x3a, 0x12, 0x13, 0x0f, 0xf8, 0x97, 0xe4, 0xa9,
-	0x8d, 0xf1, 0x3c, 0x18, 0x9e, 0xf7, 0x7a, 0xfc, 0xc7, 0xa4, 0xfb, 0xe0, 0xc5, 0xb9, 0x9c, 0xba,
+	0x5d, 0xe3, 0x3c, 0x0f, 0x06, 0xe7, 0x9d, 0x8e, 0xf8, 0x31, 0x6e, 0x3f, 0x78, 0x71, 0xae, 0xa6,
-	0xce, 0xa7, 0x9c, 0x69, 0x70, 0xc6, 0x7f, 0xe0, 0x14, 0xfb, 0x25, 0x26, 0xad, 0x5f, 0xe5, 0xa0,
+	0xae, 0x8b, 0x29, 0x77, 0x12, 0x9c, 0x89, 0x1f, 0x38, 0xc5, 0x7f, 0xc9, 0x49, 0xfa, 0xcb, 0x0c,
-	0x6e, 0x53, 0x7f, 0x32, 0x1e, 0xf9, 0xf4, 0x31, 0x75, 0xfa, 0xd4, 0x23, 0x37, 0x01, 0x7a, 0x83,
+	0x54, 0x1d, 0xe6, 0x8f, 0x47, 0x43, 0x9f, 0x3d, 0x66, 0x6e, 0x97, 0x79, 0xe4, 0x26, 0x40, 0xa7,
-	0xa9, 0x1f, 0x50, 0xef, 0xc4, 0xed, 0xaf, 0xe7, 0x6e, 0xe7, 0xee, 0x17, 0xed, 0x8a, 0xa4, 0xec,
+	0x3f, 0xf1, 0x03, 0xe6, 0x9d, 0xf4, 0xba, 0xeb, 0x99, 0xdb, 0x99, 0xfb, 0x79, 0xa7, 0xa4, 0x28,
-	0xf4, 0xc9, 0x75, 0xa8, 0x0c, 0xe9, 0xb0, 0x2b, 0x66, 0xf3, 0x7c, 0x76, 0x49, 0x10, 0x70, 0xb2,
+	0x3b, 0x5d, 0x72, 0x1d, 0x4a, 0x03, 0x36, 0x68, 0xcb, 0xd9, 0xac, 0x98, 0x5d, 0x92, 0x04, 0x9c,
-	0x01, 0x4b, 0x1e, 0x3d, 0x77, 0x7d, 0x77, 0x3c, 0x5a, 0x2f, 0xe0, 0x5c, 0xc1, 0x0e, 0xc7, 0x6c,
+	0xac, 0xc1, 0x92, 0xc7, 0xce, 0x7b, 0x7e, 0x6f, 0x34, 0x5c, 0xcf, 0xe1, 0x5c, 0xce, 0x09, 0xc7,
-	0xa1, 0xe7, 0x3c, 0x0f, 0x4e, 0x10, 0x66, 0xb8, 0x5e, 0x14, 0x0b, 0x19, 0xa1, 0x83, 0x63, 0xeb,
+	0x5c, 0xd0, 0x73, 0x9f, 0x07, 0x27, 0x08, 0x33, 0x58, 0xcf, 0x4b, 0x41, 0x4e, 0x68, 0xe1, 0x98,
-	0xd7, 0x05, 0xa8, 0xd9, 0xce, 0xe8, 0x94, 0xda, 0xf4, 0x9b, 0x29, 0xf5, 0x03, 0xb2, 0x02, 0x85,
+	0xfe, 0x2a, 0x07, 0x15, 0xc7, 0x1d, 0x9e, 0x32, 0x87, 0x7d, 0x33, 0x61, 0x7e, 0x40, 0x56, 0x20,
-	0x17, 0xf4, 0x82, 0x6f, 0x5f, 0xb3, 0xd9, 0xa7, 0x58, 0x8f, 0x1c, 0x27, 0x74, 0x24, 0x36, 0xae,
+	0xf7, 0x82, 0x5d, 0x88, 0xe5, 0x2b, 0x0e, 0xff, 0x94, 0xf2, 0xc8, 0x71, 0xc2, 0x86, 0x72, 0xe1,
-	0xb1, 0xf5, 0x48, 0x68, 0x8f, 0xfa, 0x64, 0x0d, 0x16, 0x07, 0xee, 0xd0, 0x0d, 0xe4, 0xae, 0x62,
+	0x0a, 0x97, 0x47, 0x42, 0x73, 0xd8, 0x25, 0x6b, 0xb0, 0xd8, 0xef, 0x0d, 0x7a, 0x81, 0x5a, 0x55,
-	0x10, 0x13, 0xa7, 0x68, 0x88, 0xb3, 0x0d, 0xe0, 0x8f, 0xbd, 0xe0, 0x64, 0xec, 0xa1, 0xd2, 0xeb,
+	0x0e, 0x62, 0xea, 0xe4, 0x2d, 0x75, 0xb6, 0x01, 0xfc, 0x91, 0x17, 0x9c, 0x8c, 0x3c, 0xdc, 0xf4,
-	0x8b, 0x38, 0x5b, 0xdf, 0xbc, 0xbb, 0xa1, 0x9b, 0x7a, 0x43, 0x17, 0x68, 0xe3, 0x10, 0x99, 0x0f,
+	0xfa, 0x22, 0xce, 0x56, 0x37, 0xef, 0x6e, 0x98, 0xa6, 0xde, 0x30, 0x15, 0xda, 0x38, 0x44, 0xe6,
-	0x18, 0xaf, 0x5d, 0xf1, 0xd5, 0x27, 0xf9, 0x12, 0xaa, 0x1c, 0x24, 0x70, 0xbc, 0x53, 0x1a, 0xac,
+	0x03, 0xce, 0xeb, 0x94, 0x7c, 0xfd, 0x49, 0xbe, 0x84, 0xb2, 0x00, 0x09, 0x5c, 0xef, 0x94, 0x05,
-	0x97, 0x38, 0xca, 0xbd, 0x37, 0xa0, 0x74, 0x38, 0xb3, 0xcd, 0xb7, 0x17, 0xdf, 0xc4, 0x82, 0x1a,
+	0xeb, 0x05, 0x81, 0x72, 0xef, 0x0d, 0x28, 0x2d, 0xc1, 0xec, 0x88, 0xe5, 0xe5, 0x37, 0xa1, 0x50,
-	0xf2, 0xbb, 0xce, 0xc0, 0x7d, 0xed, 0x74, 0x07, 0x74, 0xbd, 0x8c, 0x40, 0x4b, 0x76, 0x8c, 0x66,
+	0x41, 0xfe, 0x9e, 0xdb, 0xef, 0xbd, 0x76, 0xdb, 0x7d, 0xb6, 0x5e, 0x44, 0xa0, 0x25, 0x27, 0x46,
-	0x6d, 0x40, 0x25, 0x94, 0x81, 0x2c, 0x41, 0x71, 0xff, 0x60, 0xbf, 0xbd, 0xb2, 0x40, 0x00, 0x4a,
+	0xa3, 0x1b, 0x50, 0x0a, 0x75, 0x20, 0x4b, 0x90, 0xdf, 0x3f, 0xd8, 0x6f, 0xae, 0x2c, 0x10, 0x80,
-	0xcd, 0xc3, 0xed, 0xf6, 0x7e, 0x6b, 0x25, 0x47, 0xaa, 0x50, 0x6e, 0xb5, 0xc5, 0x20, 0x6f, 0x6d,
+	0x42, 0xfd, 0x70, 0xbb, 0xb9, 0xdf, 0x58, 0xc9, 0x90, 0x32, 0x14, 0x1b, 0x4d, 0x39, 0xc8, 0xd2,
-	0x01, 0x44, 0xbb, 0x91, 0x32, 0x14, 0x76, 0xdb, 0x5f, 0x23, 0x3f, 0xf2, 0x1c, 0xb7, 0xed, 0xc3,
+	0x2d, 0x80, 0x68, 0x35, 0x52, 0x84, 0xdc, 0x6e, 0xf3, 0x6b, 0xe4, 0x47, 0x9e, 0xe3, 0xa6, 0x73,
-	0x9d, 0x83, 0x7d, 0x5c, 0x80, 0x8b, 0xb7, 0xed, 0x76, 0xb3, 0xd3, 0x5e, 0xc9, 0x33, 0x8e, 0x27,
+	0xb8, 0x73, 0xb0, 0x8f, 0x02, 0x28, 0xbc, 0xed, 0x34, 0xeb, 0xad, 0xe6, 0x4a, 0x96, 0x73, 0x3c,
-	0x07, 0xad, 0x95, 0x02, 0xa9, 0xc0, 0xe2, 0x71, 0x73, 0xef, 0xa8, 0xbd, 0x52, 0xb4, 0x7e, 0x01,
+	0x39, 0x68, 0xac, 0xe4, 0x48, 0x09, 0x16, 0x8f, 0xeb, 0x7b, 0x47, 0xcd, 0x95, 0x3c, 0xfd, 0x39,
-	0xcb, 0x52, 0x7c, 0xe1, 0x22, 0xe4, 0x33, 0x28, 0x9d, 0x71, 0x37, 0xe1, 0x27, 0x53, 0xdd, 0xbc,
+	0x2c, 0x2b, 0xf5, 0xa5, 0x8b, 0x90, 0xcf, 0xa0, 0x70, 0x26, 0xdc, 0x44, 0x9c, 0x4c, 0x79, 0xf3,
-	0x61, 0xe8, 0x1a, 0x73, 0x25, 0x5b, 0xf2, 0xa2, 0x7a, 0x85, 0x17, 0xe7, 0x3e, 0x1e, 0x5a, 0x01,
+	0x86, 0xb5, 0xd7, 0x98, 0x2b, 0x39, 0x8a, 0x17, 0xb7, 0x97, 0x7b, 0x71, 0xee, 0xe3, 0xa1, 0xe5,
-	0x97, 0xac, 0x6c, 0x08, 0x0f, 0xdd, 0xd8, 0xa5, 0x17, 0xc7, 0xce, 0x60, 0x4a, 0x6d, 0x36, 0x49,
+	0x50, 0x64, 0x65, 0x43, 0x7a, 0xe8, 0xc6, 0x2e, 0xbb, 0x38, 0x76, 0xfb, 0x13, 0xe6, 0xf0, 0x49,
-	0x08, 0x14, 0x87, 0x63, 0x8f, 0xf2, 0x03, 0x5c, 0xb2, 0xf9, 0xb7, 0xf5, 0x33, 0x80, 0xa7, 0xd3,
+	0x42, 0x20, 0x3f, 0x18, 0x79, 0x4c, 0x1c, 0xe0, 0x92, 0x23, 0xbe, 0xe9, 0x4f, 0x01, 0x9e, 0x4e,
-	0x20, 0xdd, 0x25, 0xf0, 0xd4, 0xcf, 0x19, 0x82, 0x74, 0x07, 0x31, 0xe0, 0xbe, 0x40, 0x1d, 0x9f,
+	0x82, 0xd9, 0x2e, 0x81, 0xa7, 0x7e, 0xce, 0x11, 0x94, 0x3b, 0xc8, 0x81, 0xf0, 0x05, 0xe6, 0xfa,
-	0x86, 0xbe, 0xc0, 0x06, 0xd6, 0x36, 0x54, 0x39, 0x56, 0x16, 0x45, 0x10, 0x84, 0xb4, 0xe8, 0x80,
+	0x2c, 0xf4, 0x05, 0x3e, 0xa0, 0xdb, 0x50, 0x16, 0x58, 0x69, 0x36, 0x82, 0x20, 0xa4, 0xc1, 0xfa,
-	0x06, 0x34, 0x83, 0xaf, 0x5a, 0x14, 0x56, 0x63, 0x20, 0x99, 0x4c, 0xbb, 0x0e, 0xe5, 0x3e, 0x07,
+	0x2c, 0x60, 0x29, 0x7c, 0x95, 0x32, 0x58, 0x8d, 0x81, 0xa4, 0x32, 0xed, 0x3a, 0x14, 0xbb, 0x02,
-	0x13, 0xfb, 0x14, 0x6c, 0x35, 0xb4, 0xfe, 0x95, 0xc3, 0x2b, 0x25, 0x24, 0x3c, 0x1a, 0x31, 0x8f,
+	0x4c, 0xae, 0x93, 0x73, 0xf4, 0x90, 0xfe, 0x33, 0x83, 0x57, 0x4a, 0x6a, 0x78, 0x34, 0xe4, 0x1e,
-	0x6f, 0xc2, 0xb2, 0x27, 0xc6, 0x27, 0x5c, 0x16, 0xb9, 0x4f, 0x23, 0xdd, 0x5d, 0x1f, 0x2f, 0xd8,
+	0x5f, 0x87, 0x65, 0x4f, 0x8e, 0x4f, 0x84, 0x2e, 0x6a, 0x9d, 0xda, 0x6c, 0x77, 0x7d, 0xbc, 0xe0,
-	0x35, 0xb9, 0x84, 0x93, 0xc9, 0x4f, 0xa1, 0xaa, 0x20, 0x26, 0xd3, 0x80, 0xef, 0x58, 0xdd, 0x5c,
+	0x54, 0x94, 0x88, 0x20, 0x93, 0x1f, 0x43, 0x59, 0x43, 0x8c, 0x27, 0x81, 0x58, 0xb1, 0xbc, 0xb9,
-	0x8f, 0x03, 0x44, 0x27, 0x86, 0xcb, 0x41, 0xb2, 0x23, 0x91, 0x74, 0x60, 0x4d, 0x2d, 0x16, 0x32,
+	0x1e, 0x07, 0x88, 0x4e, 0x0c, 0xc5, 0x41, 0xb1, 0x23, 0x91, 0xb4, 0x60, 0x4d, 0x0b, 0x4b, 0x1d,
-	0x4a, 0x31, 0x0a, 0x1c, 0xe5, 0x76, 0x1c, 0x65, 0xd6, 0xcc, 0x88, 0x46, 0xe4, 0x7a, 0x6d, 0x72,
+	0x95, 0x1a, 0x39, 0x81, 0x72, 0x3b, 0x8e, 0x32, 0x6d, 0x66, 0x44, 0x23, 0x4a, 0xde, 0x98, 0xdc,
-	0xab, 0x02, 0x65, 0x49, 0xb5, 0xfe, 0x9d, 0x43, 0x77, 0x95, 0x66, 0x12, 0x2a, 0xb7, 0xa0, 0xee,
+	0x2a, 0x41, 0x51, 0x51, 0xe9, 0xbf, 0x32, 0xe8, 0xae, 0xca, 0x4c, 0x72, 0xcb, 0x0d, 0xa8, 0x7a,
-	0x49, 0x42, 0x4c, 0xe7, 0xeb, 0x89, 0x3a, 0x4b, 0x03, 0x2f, 0xd8, 0xcb, 0x6a, 0x91, 0xd0, 0xfa,
+	0x8a, 0x10, 0xdb, 0xf3, 0xf5, 0xc4, 0x3d, 0x2b, 0x03, 0x2f, 0x38, 0xcb, 0x5a, 0x48, 0xee, 0xfa,
-	0x21, 0xd4, 0x42, 0x94, 0x48, 0xed, 0x6b, 0x09, 0x6a, 0x87, 0x08, 0x55, 0xb5, 0x80, 0x29, 0xfe,
+	0x21, 0x54, 0x42, 0x94, 0x68, 0xdb, 0xd7, 0x12, 0xb6, 0x1d, 0x22, 0x94, 0xb5, 0x00, 0xdf, 0xf8,
-	0x0c, 0xae, 0x84, 0xeb, 0x13, 0x34, 0xff, 0x60, 0x8e, 0xe6, 0x21, 0xe0, 0xaa, 0x42, 0xd0, 0x75,
+	0x33, 0xb8, 0x12, 0xca, 0x27, 0xec, 0xfc, 0x83, 0x39, 0x3b, 0x0f, 0x01, 0x57, 0x35, 0x82, 0xb9,
-	0x07, 0x16, 0xdf, 0x04, 0xd9, 0xfa, 0x4d, 0x01, 0xca, 0xdb, 0xe3, 0xe1, 0xc4, 0xf1, 0xd8, 0x31,
+	0x77, 0xe0, 0xf1, 0x4d, 0x92, 0xe9, 0xaf, 0x73, 0x50, 0xdc, 0x1e, 0x0d, 0xc6, 0xae, 0xc7, 0x8f,
-	0x95, 0x90, 0x3e, 0x1d, 0x04, 0x5c, 0xdd, 0xfa, 0xe6, 0x9d, 0xf8, 0x0e, 0x92, 0x4d, 0xfd, 0xb6,
+	0xa9, 0x80, 0xf4, 0x49, 0x3f, 0x10, 0xdb, 0xad, 0x6e, 0xde, 0x89, 0xaf, 0xa0, 0xd8, 0xf4, 0x6f,
-	0x39, 0xab, 0x2d, 0x97, 0xb0, 0xc5, 0x32, 0x9c, 0xe5, 0xdf, 0x62, 0xb1, 0x0c, 0x66, 0x72, 0x89,
+	0x47, 0xb0, 0x3a, 0x4a, 0x84, 0x0b, 0xab, 0x70, 0x96, 0x7d, 0x0b, 0x61, 0x15, 0xcc, 0x94, 0x88,
-	0xba, 0x0a, 0x85, 0xe8, 0x2a, 0x34, 0xa0, 0x8c, 0x0b, 0xa3, 0x10, 0x8c, 0xba, 0x28, 0x02, 0xf9,
+	0xbe, 0x0a, 0xb9, 0xe8, 0x2a, 0xd4, 0xa0, 0x88, 0x82, 0x51, 0x08, 0xc6, 0xbd, 0x68, 0x02, 0xf9,
-	0x1e, 0x5c, 0xea, 0x79, 0xd4, 0x61, 0xf6, 0x50, 0x61, 0x7a, 0x51, 0xf2, 0xd4, 0xc5, 0x84, 0xad,
+	0x3f, 0xb8, 0xd4, 0xf1, 0x98, 0xcb, 0xed, 0xa1, 0xc3, 0xf4, 0xa2, 0xe2, 0xa9, 0xca, 0x09, 0x47,
-	0xc2, 0xf5, 0x1d, 0xa8, 0x0d, 0xc7, 0xfd, 0x88, 0xaf, 0x24, 0xf9, 0xaa, 0x48, 0x0d, 0x99, 0xae,
+	0x87, 0xeb, 0x3b, 0x50, 0x19, 0x8c, 0xba, 0x11, 0x5f, 0x41, 0xf1, 0x95, 0x91, 0x1a, 0x32, 0x5d,
-	0xaa, 0x78, 0xc0, 0xe2, 0x67, 0x0d, 0x67, 0xc5, 0xd0, 0xfa, 0x14, 0x96, 0x63, 0xba, 0xb2, 0x10,
+	0xd5, 0xf1, 0x80, 0xc7, 0xcf, 0x0a, 0xce, 0xca, 0x21, 0xfd, 0x14, 0x96, 0x63, 0x7b, 0xe5, 0x21,
-	0xd7, 0xfe, 0xea, 0xa8, 0xb9, 0x27, 0xe2, 0xe1, 0x23, 0x1e, 0x02, 0x6d, 0x8c, 0x87, 0x18, 0x56,
+	0xae, 0xf9, 0xd5, 0x51, 0x7d, 0x4f, 0xc6, 0xc3, 0x47, 0x22, 0x04, 0x3a, 0x18, 0x0f, 0x31, 0xac,
-	0xf7, 0xda, 0x87, 0x87, 0x18, 0x3d, 0x3f, 0x0f, 0x97, 0xc8, 0x00, 0xaa, 0xc5, 0xcd, 0x05, 0x2d,
+	0xee, 0x35, 0x0f, 0x0f, 0x31, 0x7a, 0x7e, 0x1e, 0x8a, 0xa8, 0x00, 0x6a, 0xc4, 0xcd, 0x05, 0x23,
-	0x6e, 0xe6, 0x54, 0xdc, 0xcc, 0x47, 0x71, 0xb3, 0xb0, 0x55, 0x87, 0x9a, 0x30, 0xc8, 0xc9, 0x94,
+	0x6e, 0x66, 0x74, 0xdc, 0xcc, 0x46, 0x71, 0x33, 0xb7, 0x55, 0x85, 0x8a, 0x34, 0xc8, 0xc9, 0x84,
-	0xf9, 0xa1, 0xf5, 0xbb, 0x1c, 0x40, 0xe7, 0xd5, 0x48, 0x05, 0x8c, 0x07, 0x50, 0xee, 0x09, 0x70,
+	0xfb, 0x21, 0xfd, 0x6d, 0x06, 0xa0, 0xf5, 0x6a, 0xa8, 0x03, 0xc6, 0x03, 0x28, 0x76, 0x24, 0x38,
-	0x3c, 0x20, 0x16, 0x13, 0xaf, 0x24, 0xda, 0xd8, 0x56, 0x5c, 0x18, 0x1b, 0xca, 0xfe, 0xb4, 0xd7,
+	0x1e, 0x10, 0x8f, 0x89, 0x57, 0x12, 0x6d, 0xec, 0x68, 0x2e, 0x8c, 0x0d, 0x45, 0x7f, 0xd2, 0xe9,
-	0xa3, 0xbe, 0x0a, 0xa2, 0xe6, 0xa5, 0xd5, 0xee, 0xb9, 0xad, 0x58, 0xd9, 0xaa, 0xe7, 0x8e, 0x3b,
+	0x30, 0x5f, 0x07, 0x51, 0xfb, 0xd2, 0x1a, 0xf7, 0xdc, 0xd1, 0xac, 0x5c, 0xea, 0xb9, 0xdb, 0xeb,
-	0x98, 0xf2, 0xa8, 0xfa, 0xc6, 0x55, 0x92, 0xd5, 0xfa, 0x6d, 0x0e, 0xaa, 0x5c, 0xd6, 0x4c, 0x71,
+	0x4f, 0x44, 0x54, 0x7d, 0xa3, 0x94, 0x62, 0xa5, 0xbf, 0xc9, 0x40, 0x59, 0xe8, 0x9a, 0x2a, 0x2e,
-	0xe9, 0x06, 0x54, 0xb8, 0x18, 0xb4, 0x2f, 0x23, 0xd3, 0x92, 0x1d, 0x11, 0xc8, 0x4f, 0x30, 0x3e,
+	0xdd, 0x80, 0x92, 0x50, 0x83, 0x75, 0x55, 0x64, 0x5a, 0x72, 0x22, 0x02, 0xf9, 0x11, 0xc6, 0x47,
-	0xca, 0x75, 0xbe, 0x94, 0xed, 0x7a, 0x32, 0xac, 0x10, 0x2e, 0xe2, 0xb6, 0x76, 0xe1, 0x32, 0x37,
+	0x25, 0xe7, 0x2b, 0xdd, 0xae, 0x27, 0xc3, 0x4a, 0xe5, 0x22, 0x6e, 0xba, 0x0b, 0x97, 0x85, 0x79,
-	0x4f, 0x2f, 0x60, 0x13, 0xd2, 0xa0, 0xfa, 0x43, 0x9f, 0x33, 0x1e, 0x7a, 0x9c, 0x9b, 0x9c, 0x5d,
+	0x3a, 0x01, 0x9f, 0x50, 0x06, 0x35, 0x1f, 0xfa, 0x8c, 0xf5, 0xd0, 0xe3, 0xdc, 0xf8, 0xec, 0xc2,
-	0xf8, 0x6e, 0xcf, 0x19, 0x48, 0x41, 0xc2, 0x31, 0x3e, 0x30, 0x44, 0x07, 0xcb, 0xf4, 0x36, 0x2c,
+	0xef, 0x75, 0xdc, 0xbe, 0x52, 0x24, 0x1c, 0xe3, 0x03, 0x43, 0x4c, 0xb0, 0x54, 0x6f, 0xc3, 0x32,
-	0x43, 0xf5, 0xb1, 0xe3, 0x9f, 0x49, 0x91, 0xac, 0x9f, 0x43, 0x4d, 0x0c, 0x33, 0x99, 0x11, 0x5f,
+	0x94, 0x1f, 0xbb, 0xfe, 0x99, 0x52, 0x89, 0xfe, 0x0c, 0x2a, 0x72, 0x98, 0xca, 0x8c, 0xf8, 0x2a,
-	0xc5, 0x33, 0x44, 0xe1, 0x82, 0x2f, 0xdb, 0xfc, 0xdb, 0xba, 0x0c, 0x97, 0x0e, 0x47, 0xce, 0xc4,
+	0x9e, 0x21, 0x8a, 0x50, 0x7c, 0xd9, 0x11, 0xdf, 0xf4, 0x32, 0x5c, 0x3a, 0x1c, 0xba, 0x63, 0xff,
-	0x3f, 0x1b, 0xab, 0x40, 0xcb, 0xd2, 0xb8, 0x95, 0x88, 0x96, 0x69, 0xc7, 0x8f, 0xe0, 0x92, 0x47,
+	0x6c, 0xa4, 0x03, 0x2d, 0x4f, 0xe3, 0x56, 0x22, 0x5a, 0xaa, 0x15, 0x3f, 0x82, 0x4b, 0x1e, 0x1b,
-	0x87, 0x8e, 0x3b, 0x72, 0x47, 0xa7, 0x27, 0xdd, 0x8b, 0x80, 0xfa, 0x32, 0xcb, 0xab, 0x87, 0xe4,
+	0xb8, 0xbd, 0x61, 0x6f, 0x78, 0x7a, 0xd2, 0xbe, 0x08, 0x98, 0xaf, 0xb2, 0xbc, 0x6a, 0x48, 0xde,
-	0x2d, 0x46, 0x65, 0xa2, 0x75, 0x07, 0xe3, 0xae, 0xbc, 0xeb, 0xfc, 0xdb, 0xfa, 0x3d, 0xbe, 0x39,
+	0xe2, 0x54, 0xae, 0x5a, 0xbb, 0x3f, 0x6a, 0xab, 0xbb, 0x2e, 0xbe, 0xe9, 0xef, 0xf0, 0xcd, 0x79,
-	0xcf, 0x9c, 0xa0, 0xa7, 0xac, 0x40, 0x76, 0xa0, 0x1e, 0xde, 0x70, 0x4e, 0x91, 0xb2, 0x18, 0xd1,
+	0xe6, 0x06, 0x1d, 0x6d, 0x05, 0xb2, 0x03, 0xd5, 0xf0, 0x86, 0x0b, 0x8a, 0xd2, 0xc5, 0x8a, 0xf6,
-	0x9e, 0xaf, 0xd9, 0x96, 0x37, 0x5e, 0x45, 0xfb, 0xe5, 0x9e, 0x4e, 0xe0, 0x50, 0xce, 0xa8, 0x47,
+	0x42, 0x66, 0x5b, 0xdd, 0x78, 0x1d, 0xed, 0x97, 0x3b, 0x26, 0x41, 0x40, 0xb9, 0xc3, 0x0e, 0xeb,
-	0x07, 0x21, 0x54, 0x3e, 0x1d, 0x8a, 0x33, 0xea, 0x50, 0x3a, 0x61, 0xeb, 0x52, 0xf4, 0x12, 0x8a,
+	0x87, 0x50, 0xd9, 0xd9, 0x50, 0x82, 0xd1, 0x84, 0x32, 0x09, 0x5b, 0x97, 0xa2, 0x97, 0x50, 0xde,
-	0xfb, 0xf9, 0x6d, 0x0e, 0xc8, 0xac, 0x0c, 0xdf, 0x35, 0x09, 0xbd, 0x07, 0x75, 0x1f, 0xaf, 0x7d,
+	0xcf, 0x6f, 0x33, 0x40, 0xa6, 0x75, 0xf8, 0xae, 0x49, 0xe8, 0x3d, 0xa8, 0xfa, 0x78, 0xed, 0x83,
-	0x70, 0x62, 0xe4, 0xc0, 0xcb, 0x9c, 0x1a, 0x46, 0x29, 0xb4, 0x30, 0x26, 0xdf, 0xa7, 0xe8, 0xd2,
+	0x13, 0x2b, 0x07, 0x5e, 0x16, 0xd4, 0x30, 0x4a, 0xa1, 0x85, 0x31, 0xf9, 0x3e, 0x45, 0x97, 0xf6,
-	0xfe, 0xc9, 0x68, 0x1c, 0xb8, 0xcf, 0x2f, 0x78, 0x64, 0x5c, 0xb2, 0xeb, 0x8a, 0xbc, 0xcf, 0xa9,
+	0x4f, 0x86, 0xa3, 0xa0, 0xf7, 0xfc, 0x42, 0x44, 0xc6, 0x25, 0xa7, 0xaa, 0xc9, 0xfb, 0x82, 0x4a,
-	0xd6, 0x03, 0x25, 0x94, 0x2e, 0x3c, 0xb9, 0x06, 0x4b, 0x2f, 0x19, 0x55, 0x65, 0xe7, 0xf8, 0xe4,
+	0x1f, 0x68, 0xa5, 0x4c, 0xe5, 0xc9, 0x35, 0x58, 0x7a, 0xc9, 0xa9, 0x3a, 0x3b, 0xc7, 0x27, 0x5f,
-	0xf3, 0xf1, 0x4e, 0xdf, 0xfa, 0x07, 0x3e, 0x80, 0xd2, 0xfc, 0x99, 0x7c, 0x40, 0xdf, 0x22, 0x1f,
+	0x8c, 0x77, 0xba, 0xf4, 0xef, 0xf8, 0x00, 0x2a, 0xf3, 0xa7, 0xf2, 0x01, 0x73, 0x89, 0x6c, 0x6c,
-	0xdb, 0x82, 0xe5, 0x1b, 0xe2, 0x58, 0xfa, 0x32, 0x53, 0x53, 0x43, 0x76, 0xcf, 0x84, 0x95, 0x71,
+	0x09, 0x9e, 0x6f, 0xc8, 0x63, 0xe9, 0xaa, 0x4c, 0x4d, 0x0f, 0xf9, 0x3d, 0x93, 0x56, 0xc6, 0x29,
-	0x4a, 0xe8, 0x13, 0x8e, 0x31, 0xd0, 0xaf, 0xf4, 0xc4, 0x3d, 0x33, 0x22, 0xbd, 0x7d, 0x49, 0xd2,
+	0xb9, 0x9f, 0x70, 0x8c, 0x81, 0x7e, 0xa5, 0x23, 0xef, 0x99, 0x15, 0xe9, 0x9d, 0x4b, 0x8a, 0x1e,
-	0x43, 0xeb, 0xdc, 0x83, 0x12, 0x3d, 0xa7, 0xa3, 0xc0, 0x5f, 0xaf, 0xf2, 0xb8, 0xb0, 0xac, 0xd2,
+	0x5a, 0xe7, 0x1e, 0x14, 0xd8, 0x39, 0x1b, 0x06, 0xfe, 0x7a, 0x59, 0xc4, 0x85, 0x65, 0x9d, 0x2e,
-	0xc5, 0x36, 0xa3, 0xda, 0x72, 0xd2, 0xfa, 0x31, 0x5c, 0xde, 0x63, 0x79, 0xdd, 0x23, 0xb4, 0xbe,
+	0x36, 0x39, 0xd5, 0x51, 0x93, 0xf4, 0x87, 0x70, 0x79, 0x8f, 0xe7, 0x75, 0x8f, 0xd0, 0xfa, 0x66,
-	0x9e, 0x21, 0x76, 0x3a, 0x7b, 0xd2, 0x2a, 0x85, 0xa0, 0xb3, 0x47, 0xea, 0x90, 0xdf, 0x69, 0x49,
+	0x86, 0xd8, 0x6a, 0xed, 0x29, 0xab, 0xe4, 0x82, 0xd6, 0x1e, 0xa9, 0x42, 0x76, 0xa7, 0xa1, 0xf6,
-	0x1d, 0xf2, 0x6e, 0xcb, 0xfa, 0x25, 0x1e, 0xb4, 0xbe, 0x2e, 0x93, 0x99, 0x0c, 0x70, 0xb5, 0x7d,
+	0x90, 0xed, 0x35, 0xe8, 0x2f, 0xf0, 0xa0, 0x4d, 0xb9, 0x54, 0x66, 0xb2, 0xc0, 0xf5, 0xf2, 0xb9,
-	0x21, 0xda, 0x1e, 0x53, 0x51, 0xea, 0x79, 0x63, 0x8f, 0x1b, 0xa4, 0x62, 0x8b, 0x81, 0x75, 0x57,
+	0x68, 0x79, 0x4c, 0x45, 0x99, 0xe7, 0x8d, 0x3c, 0x61, 0x90, 0x92, 0x23, 0x07, 0xf4, 0xae, 0xd2,
-	0xca, 0x80, 0x3a, 0x8f, 0x5f, 0x84, 0xce, 0x26, 0xd0, 0x72, 0xa1, 0xa8, 0xbb, 0xb0, 0x1a, 0xe3,
+	0x01, 0xf7, 0x3c, 0x7a, 0x11, 0x3a, 0x9b, 0x44, 0xcb, 0x84, 0xaa, 0xee, 0xc2, 0x6a, 0x8c, 0x2b,
-	0xca, 0x14, 0x9c, 0x3e, 0x82, 0x2b, 0x1c, 0x6c, 0x97, 0xd2, 0x49, 0x73, 0xe0, 0x9e, 0xa7, 0xee,
+	0x55, 0x70, 0xfa, 0x08, 0xae, 0x08, 0xb0, 0x5d, 0xc6, 0xc6, 0xf5, 0x7e, 0xef, 0x7c, 0xe6, 0xaa,
-	0x3a, 0x81, 0xab, 0x26, 0xe3, 0xff, 0xd7, 0x46, 0xd6, 0x19, 0x94, 0x9e, 0xf0, 0xfa, 0x51, 0x93,
+	0x63, 0xb8, 0x6a, 0x33, 0xfe, 0x6f, 0x6d, 0x44, 0xcf, 0xa0, 0xf0, 0x44, 0xd4, 0x8f, 0x86, 0x2e,
-	0xa5, 0xc8, 0x79, 0x31, 0xc2, 0x8c, 0x9c, 0xa1, 0xc8, 0xee, 0x2b, 0x36, 0xff, 0xe6, 0xd1, 0x9c,
+	0x79, 0xc1, 0x8b, 0x11, 0x66, 0xe8, 0x0e, 0x64, 0x76, 0x5f, 0x72, 0xc4, 0xb7, 0x88, 0xe6, 0x8c,
-	0x52, 0xef, 0xc8, 0xde, 0x13, 0x0f, 0x47, 0xc5, 0x0e, 0xc7, 0xe4, 0x16, 0xab, 0x5c, 0x5d, 0x74,
+	0x79, 0x47, 0xce, 0x9e, 0x7c, 0x38, 0x4a, 0x4e, 0x38, 0x26, 0xb7, 0x78, 0xe5, 0xda, 0x43, 0xf7,
-	0x0f, 0x3e, 0x5b, 0xe4, 0xb3, 0x1a, 0x05, 0x2b, 0xa8, 0x15, 0xb1, 0x53, 0xb3, 0xdf, 0xd7, 0x5e,
+	0x10, 0xb3, 0x79, 0x31, 0x6b, 0x50, 0xb0, 0x82, 0x5a, 0x91, 0x2b, 0xd5, 0xbb, 0x5d, 0xe3, 0xe5,
-	0x8e, 0x10, 0x2f, 0x17, 0xc7, 0xb3, 0x5e, 0xc2, 0x65, 0x8d, 0x3f, 0x93, 0x19, 0x3e, 0x81, 0x92,
+	0x08, 0xf1, 0x32, 0x71, 0x3c, 0xfa, 0x12, 0x2e, 0x1b, 0xfc, 0xa9, 0xcc, 0xf0, 0x09, 0x14, 0x64,
-	0x28, 0x92, 0x65, 0xd0, 0x5a, 0x8b, 0xaf, 0x12, 0xdb, 0xd8, 0x92, 0xc7, 0xba, 0x07, 0xab, 0x92,
+	0x91, 0xac, 0x82, 0xd6, 0x5a, 0x5c, 0x4a, 0x2e, 0xe3, 0x28, 0x1e, 0x7a, 0x0f, 0x56, 0x15, 0x85,
-	0x42, 0x87, 0xe3, 0xa4, 0xb3, 0xe2, 0xf6, 0xb1, 0xf6, 0x60, 0x2d, 0xce, 0x96, 0xc9, 0x45, 0x9a,
+	0x0d, 0x46, 0x49, 0x67, 0x25, 0xec, 0x43, 0xf7, 0x60, 0x2d, 0xce, 0x96, 0xca, 0x45, 0xea, 0x7a,
-	0x6a, 0xd3, 0xa3, 0x49, 0x5f, 0x8b, 0x81, 0xe6, 0xa1, 0xe8, 0x06, 0xcb, 0x1b, 0x06, 0x0b, 0x05,
+	0xd1, 0xa3, 0x71, 0xd7, 0x88, 0x81, 0xf6, 0xa1, 0x98, 0x06, 0xcb, 0x5a, 0x06, 0x0b, 0x15, 0xd2,
-	0x52, 0x10, 0x99, 0x04, 0x5a, 0x55, 0xe6, 0xdf, 0x73, 0xfd, 0xf0, 0xa5, 0x7b, 0x0d, 0x44, 0x27,
+	0x10, 0xa9, 0x14, 0x5a, 0xd5, 0xe6, 0xdf, 0xeb, 0xf9, 0xe1, 0x4b, 0xf7, 0x1a, 0x88, 0x49, 0x4c,
-	0x66, 0x3a, 0x94, 0x0d, 0x28, 0x0b, 0x83, 0xab, 0xac, 0x2a, 0xf9, 0x54, 0x14, 0x13, 0x13, 0xa8,
+	0x75, 0x28, 0x1b, 0x50, 0x94, 0x06, 0xd7, 0x59, 0x55, 0xf2, 0xa9, 0x68, 0x26, 0xae, 0x50, 0x83,
-	0x45, 0x9f, 0x7b, 0xce, 0xe9, 0x90, 0x86, 0x31, 0x87, 0xa5, 0x10, 0x3a, 0x31, 0x93, 0xc6, 0x7f,
+	0x3d, 0xf7, 0xdc, 0xd3, 0x01, 0x0b, 0x63, 0x0e, 0x4f, 0x21, 0x4c, 0x62, 0xaa, 0x1d, 0xff, 0x11,
-	0xc2, 0xe7, 0xb3, 0x39, 0x70, 0xbc, 0xa1, 0x32, 0xfe, 0x43, 0x28, 0x89, 0xdc, 0x44, 0x26, 0xf2,
+	0x9f, 0xcf, 0x7a, 0xdf, 0xf5, 0x06, 0xda, 0xf8, 0x0f, 0xa1, 0x20, 0x73, 0x13, 0x95, 0xc8, 0x7f,
-	0x1f, 0xc6, 0x61, 0x74, 0x5e, 0x31, 0x68, 0x8a, 0x4c, 0x46, 0xae, 0x62, 0x87, 0x25, 0x7b, 0x33,
+	0x18, 0x87, 0x31, 0x79, 0xe5, 0xa0, 0x2e, 0x33, 0x19, 0x25, 0xc5, 0x0f, 0x4b, 0xf5, 0x66, 0x1a,
-	0x2d, 0xa3, 0x57, 0xd3, 0x22, 0x3f, 0x80, 0x45, 0x87, 0x2d, 0xe1, 0x77, 0xb1, 0xbe, 0xf9, 0x5e,
+	0x56, 0xaf, 0xa6, 0x41, 0xbe, 0x07, 0x8b, 0x2e, 0x17, 0x11, 0x77, 0xb1, 0xba, 0xf9, 0x5e, 0x02,
-	0x02, 0x74, 0xe7, 0x62, 0x42, 0x6d, 0xc1, 0x65, 0x7d, 0x06, 0x55, 0x6d, 0x07, 0x96, 0xf5, 0x3e,
+	0x74, 0xeb, 0x62, 0xcc, 0x1c, 0xc9, 0x45, 0x3f, 0x83, 0xb2, 0xb1, 0x02, 0xcf, 0x7a, 0x1f, 0x35,
-	0x6a, 0x77, 0x30, 0x15, 0xae, 0xc1, 0x52, 0x73, 0xbb, 0xb3, 0x73, 0x2c, 0x92, 0xe1, 0x3a, 0x40,
+	0x5b, 0x98, 0x0a, 0x57, 0x60, 0xa9, 0xbe, 0xdd, 0xda, 0x39, 0x96, 0xc9, 0x70, 0x15, 0xa0, 0xd1,
-	0xab, 0x1d, 0x8e, 0xf3, 0x98, 0x05, 0x89, 0x55, 0xf2, 0x86, 0xeb, 0xf2, 0xe4, 0xd2, 0xe4, 0xc9,
+	0x0c, 0xc7, 0x59, 0xcc, 0x82, 0xa4, 0x94, 0xba, 0xe1, 0xa6, 0x3e, 0x99, 0x59, 0xfa, 0x64, 0xdf,
-	0xbf, 0x95, 0x3c, 0xaf, 0x60, 0x59, 0xaa, 0x9f, 0xc9, 0x07, 0x3e, 0x45, 0x0b, 0x33, 0x18, 0xe5,
+	0x4a, 0x9f, 0x57, 0xb0, 0xac, 0xb6, 0x9f, 0xca, 0x07, 0x3e, 0x45, 0x0b, 0x73, 0x18, 0xed, 0x02,
-	0x02, 0xd7, 0x12, 0xb6, 0x55, 0xb7, 0x53, 0x30, 0x5a, 0x98, 0x3d, 0x1c, 0x06, 0x4e, 0x30, 0xf5,
+	0xd7, 0x12, 0x96, 0xd5, 0xb7, 0x53, 0x32, 0x52, 0xcc, 0x1e, 0x0e, 0x03, 0x37, 0x98, 0xf8, 0xda,
-	0x95, 0x0b, 0xfc, 0x31, 0x07, 0x75, 0x45, 0xc9, 0x5a, 0xcc, 0xab, 0x5a, 0x49, 0xc4, 0xbc, 0xb0,
+	0x05, 0xfe, 0x90, 0x81, 0xaa, 0xa6, 0xa4, 0x2d, 0xe6, 0x75, 0xad, 0x24, 0x63, 0x5e, 0x58, 0x29,
-	0x52, 0xba, 0x0a, 0xa5, 0x7e, 0xf7, 0xd0, 0x7d, 0xad, 0x9a, 0x1a, 0x72, 0xc4, 0xe8, 0x03, 0xb1,
+	0x5d, 0x85, 0x42, 0xb7, 0x7d, 0xd8, 0x7b, 0xad, 0x9b, 0x1a, 0x6a, 0xc4, 0xe9, 0x7d, 0xb9, 0x8e,
-	0x8f, 0xe8, 0xa8, 0xc9, 0x11, 0x4b, 0xbf, 0x59, 0x6f, 0x6d, 0x67, 0xd4, 0xa7, 0xaf, 0xf8, 0x4b,
+	0xec, 0xa8, 0xa9, 0x11, 0x4f, 0xbf, 0x79, 0x6f, 0x6d, 0x67, 0xd8, 0x65, 0xaf, 0xc4, 0x4b, 0x9b,
-	0x5b, 0xb4, 0x23, 0x02, 0x4f, 0x97, 0x65, 0xe7, 0x8d, 0x17, 0x52, 0x7a, 0x27, 0x0e, 0x9d, 0xbc,
+	0x77, 0x22, 0x82, 0x48, 0x97, 0x55, 0xe7, 0x4d, 0x14, 0x52, 0x66, 0x27, 0x0e, 0x9d, 0xbc, 0x3e,
-	0x39, 0x0d, 0xce, 0xda, 0x23, 0xd6, 0x74, 0x52, 0x1a, 0xae, 0x01, 0x61, 0xc4, 0x96, 0xeb, 0xeb,
+	0x09, 0xce, 0x9a, 0x43, 0xde, 0x74, 0xd2, 0x3b, 0x5c, 0x03, 0xc2, 0x89, 0x8d, 0x9e, 0x6f, 0x52,
-	0xd4, 0x36, 0xac, 0x32, 0x2a, 0xfa, 0x3d, 0x26, 0xd3, 0x51, 0xc4, 0x50, 0x61, 0x3b, 0x67, 0x84,
+	0x9b, 0xb0, 0xca, 0xa9, 0xe8, 0xf7, 0x98, 0x4c, 0x47, 0x11, 0x43, 0x87, 0xed, 0x8c, 0x15, 0xb6,
-	0x6d, 0xc7, 0xf7, 0x5f, 0x8e, 0xbd, 0xbe, 0x54, 0x2d, 0x1c, 0x5b, 0x2d, 0x01, 0x7e, 0xe4, 0xc7,
+	0x5d, 0xdf, 0x7f, 0x39, 0xf2, 0xba, 0x6a, 0x6b, 0xe1, 0x98, 0x36, 0x24, 0xf8, 0x91, 0x1f, 0x0b,
-	0x02, 0xf3, 0x77, 0x45, 0xb9, 0x1f, 0xa1, 0x3c, 0xa2, 0xc1, 0x1c, 0x14, 0xeb, 0x63, 0xb8, 0xa2,
+	0xcc, 0xdf, 0x15, 0xe5, 0x7e, 0x84, 0xf2, 0x88, 0x05, 0x73, 0x50, 0xe8, 0xc7, 0x70, 0x45, 0x73,
-	0x38, 0x65, 0x31, 0x3d, 0x87, 0xf9, 0x00, 0x6e, 0x2a, 0xe6, 0xed, 0x33, 0x96, 0xe8, 0x3d, 0x95,
+	0xaa, 0x62, 0x7a, 0x0e, 0xf3, 0x01, 0xdc, 0xd4, 0xcc, 0xdb, 0x67, 0x3c, 0xd1, 0x7b, 0xaa, 0x16,
-	0x1b, 0xfe, 0xaf, 0x72, 0x3e, 0x84, 0xb5, 0x50, 0x4e, 0x3d, 0x77, 0x41, 0x9c, 0xa9, 0x2f, 0xfd,
+	0xfc, 0x6f, 0xf5, 0x7c, 0x08, 0x6b, 0xa1, 0x9e, 0x66, 0xee, 0x82, 0x38, 0x13, 0x5f, 0xf9, 0x0b,
-	0x05, 0x71, 0xd8, 0x37, 0xa3, 0x79, 0xe3, 0x41, 0xf8, 0x00, 0xb2, 0x6f, 0xeb, 0x8b, 0x48, 0xfa,
+	0xe2, 0xf0, 0x6f, 0x4e, 0xf3, 0x46, 0xfd, 0xf0, 0x01, 0xe4, 0xdf, 0xf4, 0x8b, 0x48, 0xfb, 0x78,
-	0x78, 0xfe, 0x90, 0x24, 0x48, 0x12, 0x80, 0x34, 0x94, 0x8d, 0xdf, 0xf3, 0xcd, 0xad, 0x73, 0xc6,
+	0xfe, 0x90, 0xa4, 0x48, 0x12, 0x80, 0x32, 0x94, 0x83, 0xdf, 0xf3, 0xcd, 0x6d, 0x72, 0xc6, 0x4d,
-	0x4d, 0xca, 0x31, 0x73, 0x1a, 0xe6, 0x7b, 0x42, 0x28, 0xc6, 0x19, 0x33, 0xa9, 0x65, 0x0b, 0x6d,
+	0x2a, 0x30, 0x33, 0x06, 0xe6, 0x7b, 0x52, 0x29, 0xce, 0x19, 0x33, 0x29, 0x75, 0xe4, 0x6e, 0x05,
-	0x39, 0x84, 0xa1, 0xed, 0x8c, 0xb0, 0x1f, 0x42, 0x71, 0x42, 0xe5, 0xfd, 0xaf, 0x6e, 0x92, 0x0d,
+	0x84, 0xb5, 0xdb, 0x29, 0x65, 0x3f, 0x84, 0xfc, 0x98, 0xa9, 0xfb, 0x5f, 0xde, 0x24, 0x1b, 0xb2,
-	0xd1, 0xad, 0xde, 0x78, 0x8a, 0x34, 0xd7, 0x67, 0xb7, 0xc0, 0xe6, 0xf3, 0xfa, 0x66, 0x31, 0x0b,
+	0x5b, 0xbd, 0xf1, 0x14, 0x69, 0x3d, 0x9f, 0xdf, 0x02, 0x47, 0xcc, 0xd3, 0x9f, 0x44, 0x8b, 0x4d,
-	0xb0, 0x50, 0xac, 0xbb, 0x6e, 0xa6, 0x50, 0xbc, 0x2b, 0x7c, 0x3b, 0xf4, 0xf8, 0x4c, 0x60, 0x5d,
+	0x59, 0xc0, 0xd6, 0x4c, 0xa7, 0xf0, 0xd2, 0x00, 0xfc, 0x93, 0x07, 0x6c, 0xd3, 0xc1, 0x53, 0x05,
-	0x61, 0x85, 0xe8, 0xa2, 0x64, 0x8a, 0x12, 0x98, 0x54, 0x06, 0xa8, 0xb5, 0x8a, 0x11, 0x62, 0xa0,
+	0xec, 0x5d, 0x79, 0x03, 0xc2, 0x7b, 0x91, 0x0a, 0xac, 0x2d, 0x6d, 0x15, 0x5d, 0xa7, 0x54, 0xb1,
-	0x04, 0x0e, 0x6f, 0x51, 0x26, 0x81, 0x9d, 0x08, 0x8c, 0x9f, 0x7c, 0x56, 0x79, 0x99, 0x93, 0xa8,
+	0x04, 0x53, 0xcf, 0x00, 0x6d, 0xa3, 0x23, 0x89, 0x1c, 0x68, 0x85, 0xc3, 0xbb, 0x96, 0x4a, 0x61,
-	0x74, 0x41, 0x0c, 0xac, 0x7d, 0xb8, 0x6a, 0xde, 0xc2, 0x4c, 0x22, 0x1f, 0xc3, 0xad, 0xb4, 0x8b,
+	0x37, 0x02, 0x13, 0xfe, 0x91, 0x56, 0x5f, 0x7e, 0x60, 0x3a, 0xa9, 0x90, 0x03, 0xba, 0x0f, 0x57,
-	0x9a, 0x09, 0xf7, 0x49, 0x74, 0xdf, 0xde, 0x41, 0xcd, 0xa0, 0xab, 0xfd, 0x4e, 0x12, 0x7b, 0x79,
+	0xed, 0xbb, 0x9a, 0x4a, 0xe5, 0x63, 0xb8, 0x35, 0xeb, 0x3a, 0xa7, 0xc2, 0x7d, 0x12, 0xdd, 0xca,
-	0xec, 0xe1, 0x6d, 0xce, 0x04, 0xe6, 0x47, 0x60, 0xd9, 0x8f, 0x3d, 0xba, 0xce, 0x85, 0xb9, 0xd7,
+	0x77, 0x50, 0x59, 0x98, 0xdb, 0x7e, 0x27, 0xe9, 0xbf, 0x3a, 0xf6, 0xf0, 0xce, 0xa7, 0x02, 0xf3,
-	0x59, 0x5a, 0x44, 0x8f, 0x1d, 0xef, 0xe2, 0xc0, 0xb4, 0x90, 0xf3, 0x2e, 0x0e, 0x4c, 0x8f, 0x36,
+	0x23, 0xb0, 0xf4, 0xc7, 0x1e, 0x5d, 0xfa, 0xdc, 0xdc, 0x4b, 0xaf, 0x2c, 0x62, 0x46, 0x98, 0x77,
-	0x59, 0xf0, 0xbe, 0x6f, 0x41, 0x25, 0xcc, 0x65, 0xb4, 0x3f, 0xe3, 0x54, 0xa1, 0xbc, 0x7f, 0x70,
+	0x71, 0x60, 0x46, 0x60, 0x7a, 0x17, 0x07, 0x66, 0xc6, 0xa4, 0x34, 0x78, 0xff, 0x4f, 0xa1, 0x14,
-	0xf8, 0xb4, 0xb9, 0x8d, 0x59, 0xd4, 0xe6, 0x3f, 0xf3, 0x90, 0xdf, 0x3d, 0x26, 0x5b, 0xb0, 0x28,
+	0x66, 0x3c, 0xc6, 0x1f, 0x7b, 0xca, 0x50, 0xdc, 0x3f, 0x38, 0x7c, 0x5a, 0xdf, 0xc6, 0x5c, 0x6b,
-	0x1a, 0xd0, 0x73, 0x5a, 0xf4, 0x8d, 0x79, 0xad, 0x6c, 0x6b, 0x81, 0x7c, 0x0e, 0x05, 0xd6, 0x82,
+	0xf3, 0x1f, 0x59, 0xc8, 0xee, 0x1e, 0x93, 0x2d, 0x58, 0x94, 0x6d, 0xea, 0x39, 0x8d, 0xfc, 0xda,
-	0x4e, 0xed, 0xd1, 0x37, 0xd2, 0xdb, 0xd8, 0xb8, 0xba, 0x03, 0x55, 0xad, 0xdf, 0x4c, 0xde, 0xd8,
+	0xbc, 0x86, 0x37, 0x5d, 0x20, 0x9f, 0x43, 0x8e, 0x37, 0xaa, 0x67, 0x76, 0xf2, 0x6b, 0xb3, 0x9b,
-	0xa3, 0x6f, 0xbc, 0xb9, 0x97, 0x2d, 0x64, 0xea, 0xbc, 0x1a, 0x99, 0x32, 0x45, 0xfd, 0x51, 0x53,
+	0xdd, 0x28, 0xdd, 0x82, 0xb2, 0xd1, 0x95, 0x26, 0x6f, 0xec, 0xe4, 0xd7, 0xde, 0xdc, 0xf1, 0x96,
-	0x26, 0xad, 0x1b, 0x89, 0xab, 0xf7, 0x65, 0x9f, 0xbb, 0x17, 0x90, 0xf7, 0x13, 0xda, 0xa6, 0x7a,
+	0x3a, 0xb5, 0x5e, 0x0d, 0x6d, 0x9d, 0xa2, 0x2e, 0xaa, 0xad, 0x93, 0xd1, 0xb3, 0x44, 0xe9, 0x7d,
-	0x5f, 0xb0, 0x71, 0x3b, 0x9d, 0x41, 0xe1, 0x6d, 0x1e, 0xc0, 0x22, 0xef, 0x99, 0x90, 0x2f, 0xd5,
+	0xd5, 0x0d, 0xef, 0x04, 0xe4, 0xfd, 0x84, 0xe6, 0xaa, 0xd9, 0x3d, 0xac, 0xdd, 0x9e, 0xcd, 0xa0,
-	0x47, 0x23, 0xa1, 0xa3, 0x94, 0x62, 0xee, 0x58, 0xb7, 0xc5, 0x5a, 0xb8, 0x9f, 0xfb, 0x61, 0x6e,
+	0xf1, 0x36, 0x0f, 0x60, 0x51, 0x74, 0x56, 0xc8, 0x97, 0xfa, 0xa3, 0x96, 0xd0, 0x77, 0x9a, 0x61,
-	0xf3, 0xdb, 0x3c, 0x2c, 0xf2, 0x1a, 0x9a, 0x7c, 0x05, 0x10, 0x35, 0x1b, 0x4c, 0x69, 0x67, 0xda,
+	0xee, 0x58, 0x4f, 0x86, 0x2e, 0xdc, 0xcf, 0x7c, 0x3f, 0xb3, 0xf9, 0x6d, 0x16, 0x16, 0x45, 0xa5,
-	0x17, 0xa6, 0xb4, 0xb3, 0x7d, 0x0a, 0x71, 0x22, 0x5a, 0x57, 0x80, 0x24, 0x2d, 0x89, 0x3d, 0x8a,
+	0x4d, 0xbe, 0x02, 0x88, 0x5a, 0x12, 0xb6, 0xb6, 0x53, 0x4d, 0x0e, 0x5b, 0xdb, 0xe9, 0x6e, 0x86,
-	0xe6, 0x89, 0x24, 0xb4, 0x14, 0x10, 0xd5, 0x81, 0x7a, 0xbc, 0xea, 0x27, 0x77, 0x12, 0x96, 0x99,
+	0x3c, 0x11, 0xa3, 0x77, 0x40, 0x92, 0x44, 0x62, 0x4f, 0xa7, 0x7d, 0x22, 0x09, 0x8d, 0x07, 0x44,
-	0xcd, 0x83, 0xc6, 0xdd, 0xf9, 0x4c, 0x31, 0xab, 0xfc, 0x25, 0x8f, 0xe7, 0x26, 0xfe, 0x8a, 0x8c,
+	0x75, 0xa1, 0x1a, 0xef, 0x0d, 0x90, 0x3b, 0x09, 0x62, 0x76, 0x8b, 0xa1, 0x76, 0x77, 0x3e, 0x53,
-	0x47, 0x58, 0x09, 0x0b, 0x6b, 0x72, 0x2b, 0xa9, 0xe8, 0x8a, 0x32, 0x93, 0xc6, 0xfb, 0xa9, 0xf3,
+	0xcc, 0x2a, 0x7f, 0xce, 0xe2, 0xb9, 0xc9, 0xbf, 0x35, 0xe3, 0x11, 0x96, 0xc2, 0xf2, 0x9b, 0xdc,
-	0xa1, 0xf8, 0xcf, 0xa0, 0xa6, 0x17, 0xc2, 0xe4, 0x83, 0xc4, 0x3a, 0x4e, 0xaf, 0xa5, 0x1b, 0xd6,
+	0x4a, 0x2a, 0xcd, 0xa2, 0xfc, 0xa5, 0xf6, 0xfe, 0xcc, 0xf9, 0x50, 0xfd, 0x67, 0x50, 0x31, 0xcb,
-	0x3c, 0x96, 0x59, 0x60, 0x51, 0xd0, 0x26, 0x03, 0xc7, 0xea, 0xe5, 0x64, 0xe0, 0x78, 0x3d, 0x8c,
+	0x65, 0xf2, 0x41, 0x62, 0xb5, 0x67, 0x56, 0xdc, 0x35, 0x3a, 0x8f, 0x65, 0x1a, 0x58, 0x96, 0xbd,
-	0xc0, 0xe8, 0x19, 0x51, 0x19, 0x4b, 0x12, 0x55, 0xd4, 0xaa, 0x5e, 0xd3, 0x33, 0x66, 0x2b, 0x60,
+	0xc9, 0xc0, 0xb1, 0xaa, 0x3a, 0x19, 0x38, 0x5e, 0x35, 0x23, 0x30, 0x7a, 0x46, 0x54, 0xec, 0x92,
-	0xf4, 0xe3, 0xff, 0xe4, 0xa1, 0xfa, 0xc4, 0x71, 0x47, 0x01, 0x1d, 0xb1, 0xb6, 0x1b, 0x8b, 0x1e,
+	0xc4, 0x2d, 0x1a, 0xb5, 0xb1, 0xed, 0x19, 0xd3, 0x75, 0x32, 0xfa, 0xf1, 0xbf, 0xb3, 0x50, 0x7e,
-	0x3c, 0xd0, 0x98, 0xee, 0xac, 0x17, 0x8d, 0xa6, 0x3b, 0xc7, 0x2a, 0x2a, 0x14, 0xb3, 0x0d, 0x25,
+	0xe2, 0xf6, 0x86, 0x01, 0x1b, 0xf2, 0xe6, 0x1c, 0x8f, 0x1e, 0x22, 0xd0, 0xd8, 0xee, 0x6c, 0x96,
-	0x51, 0xd8, 0x10, 0x83, 0x31, 0x56, 0x00, 0x35, 0x6e, 0x24, 0x4f, 0xea, 0xda, 0x46, 0x35, 0xb2,
+	0x96, 0xb6, 0x3b, 0xc7, 0xea, 0x2e, 0x54, 0xb3, 0x09, 0x05, 0x59, 0xfe, 0x10, 0x8b, 0x31, 0x56,
-	0xa9, 0xed, 0x4c, 0x49, 0xdd, 0xb8, 0x9d, 0xce, 0x10, 0x42, 0x7e, 0x01, 0x45, 0xd6, 0x5e, 0x27,
+	0x26, 0xd5, 0x6e, 0x24, 0x4f, 0x9a, 0xbb, 0x8d, 0x2a, 0x69, 0x7b, 0xb7, 0x53, 0x85, 0x77, 0xed,
-	0x46, 0xa8, 0xd0, 0x3a, 0xf0, 0x8d, 0x46, 0xd2, 0x54, 0x08, 0xf0, 0x04, 0x96, 0x54, 0xc7, 0x9c,
+	0xf6, 0x6c, 0x86, 0x10, 0xf2, 0x0b, 0xc8, 0xf3, 0x26, 0x3c, 0xb1, 0x42, 0x85, 0xd1, 0xa7, 0xaf,
-	0xdc, 0x34, 0xe4, 0x8f, 0x77, 0xd7, 0x1b, 0xb7, 0xd2, 0xa6, 0x15, 0x18, 0xba, 0xf7, 0x5f, 0x2b,
+	0xd5, 0x92, 0xa6, 0x42, 0x80, 0x27, 0xb0, 0xa4, 0xfb, 0xea, 0xe4, 0xa6, 0xa5, 0x7f, 0xbc, 0x07,
-	0x50, 0x64, 0xef, 0x04, 0xd3, 0x35, 0x4a, 0x42, 0x4d, 0x5d, 0x67, 0x2a, 0x2b, 0x53, 0xd7, 0xd9,
+	0x5f, 0xbb, 0x35, 0x6b, 0x5a, 0x83, 0xa1, 0x7b, 0xff, 0xa5, 0x04, 0x79, 0xfe, 0x4e, 0xf0, 0xbd,
-	0xfc, 0x55, 0xdc, 0x79, 0x2d, 0x17, 0x25, 0x09, 0x4b, 0xe2, 0x85, 0x99, 0x79, 0xe7, 0x13, 0x12,
+	0x46, 0x49, 0xa8, 0xbd, 0xd7, 0xa9, 0xfa, 0xcb, 0xde, 0xeb, 0x74, 0xfe, 0x2a, 0xef, 0xbc, 0x91,
-	0x59, 0xe1, 0xdb, 0x7a, 0x52, 0x4a, 0x12, 0x16, 0x19, 0x95, 0x9d, 0xe9, 0xdb, 0x49, 0x39, 0x2d,
+	0x8b, 0x92, 0x04, 0x91, 0x78, 0xf9, 0x66, 0xdf, 0xf9, 0x84, 0x44, 0x56, 0xfa, 0xb6, 0x99, 0x94,
-	0x02, 0x3f, 0x85, 0xb2, 0xcc, 0x42, 0x93, 0x44, 0x8d, 0x97, 0x79, 0x49, 0xa2, 0x1a, 0x29, 0x6c,
+	0x92, 0x04, 0x21, 0xab, 0xfe, 0xb3, 0x7d, 0x3b, 0x29, 0xa7, 0x45, 0xe0, 0xa7, 0x50, 0x54, 0x59,
-	0x84, 0x88, 0x39, 0x49, 0x1a, 0x62, 0x54, 0x9f, 0xa4, 0x21, 0x6a, 0x09, 0x0d, 0x22, 0x7e, 0x0d,
+	0x68, 0x92, 0xaa, 0xf1, 0x62, 0x30, 0x49, 0x55, 0x2b, 0x85, 0x8d, 0x10, 0x31, 0x27, 0x99, 0x85,
-	0x10, 0x65, 0x9e, 0x66, 0xb0, 0x4b, 0xac, 0x0e, 0xcd, 0x60, 0x97, 0x9c, 0xbc, 0x22, 0xf4, 0x37,
+	0x18, 0x55, 0x31, 0xb3, 0x10, 0x8d, 0x84, 0x06, 0x11, 0xbf, 0x06, 0x88, 0x32, 0x4f, 0x3b, 0xd8,
-	0x40, 0x66, 0x93, 0x50, 0xf2, 0x71, 0xf2, 0xea, 0xc4, 0x9a, 0xb2, 0xf1, 0xc9, 0xdb, 0x31, 0x87,
+	0x25, 0xd6, 0x90, 0x76, 0xb0, 0x4b, 0x4e, 0x5e, 0x11, 0xfa, 0x1b, 0x20, 0xd3, 0x49, 0x28, 0xf9,
-	0x5b, 0x1e, 0x43, 0x25, 0xcc, 0x4f, 0x89, 0x95, 0xa2, 0xbf, 0xfe, 0xd2, 0xdc, 0x99, 0xcb, 0x63,
+	0x38, 0x59, 0x3a, 0xb1, 0xf2, 0xac, 0x7d, 0xf2, 0x76, 0xcc, 0xe1, 0x92, 0xc7, 0x50, 0x0a, 0xf3,
-	0x5a, 0x49, 0xbe, 0x35, 0x29, 0x8b, 0xe2, 0xcf, 0xcd, 0xdd, 0xf9, 0x4c, 0xfa, 0x91, 0xca, 0x9c,
+	0x53, 0x42, 0x67, 0xec, 0xdf, 0x7c, 0x69, 0xee, 0xcc, 0xe5, 0xb1, 0xad, 0xa4, 0xde, 0x9a, 0x19,
-	0x35, 0xe9, 0x48, 0xe3, 0xc5, 0x69, 0xd2, 0x91, 0x1a, 0x09, 0x6f, 0x84, 0x98, 0xe2, 0x24, 0xf1,
+	0x42, 0xf1, 0xe7, 0xe6, 0xee, 0x7c, 0x26, 0xf3, 0x48, 0x55, 0xce, 0x9a, 0x74, 0xa4, 0xf1, 0x12,
-	0x22, 0x36, 0x0d, 0x71, 0xc6, 0x49, 0xa2, 0xac, 0x34, 0x49, 0xfd, 0x99, 0x7a, 0x37, 0x49, 0xfd,
+	0x36, 0xe9, 0x48, 0xad, 0x84, 0x37, 0x42, 0x9c, 0xe1, 0x24, 0xf1, 0x52, 0x77, 0x16, 0xe2, 0x94,
-	0xd9, 0xc4, 0x56, 0x9c, 0x58, 0x98, 0xa0, 0x26, 0x9d, 0x98, 0x59, 0x30, 0x37, 0xee, 0xcc, 0xe5,
+	0x93, 0x44, 0x59, 0x69, 0xd2, 0xf6, 0xa7, 0xaa, 0xe2, 0xa4, 0xed, 0x4f, 0x27, 0xb6, 0xf2, 0xc4,
-	0x31, 0x45, 0x4e, 0x3f, 0xb1, 0x99, 0xaa, 0x39, 0x4d, 0x64, 0xf3, 0xc4, 0xb6, 0x6a, 0x7f, 0xf8,
+	0xc2, 0x04, 0x35, 0xe9, 0xc4, 0xec, 0xb2, 0xba, 0x76, 0x67, 0x2e, 0x8f, 0xad, 0xf2, 0xec, 0x13,
-	0xfb, 0xad, 0xdc, 0x9f, 0xf1, 0xdf, 0xdf, 0xf0, 0x5f, 0xb7, 0xc4, 0xff, 0xff, 0xd8, 0x8f, 0xfe,
+	0x9b, 0xaa, 0xad, 0x67, 0xa9, 0x6c, 0x9f, 0xd8, 0x56, 0xe5, 0xf7, 0x7f, 0xbb, 0x95, 0xf9, 0x13,
-	0x1b, 0x00, 0x00, 0xff, 0xff, 0x82, 0xfb, 0xea, 0x9b, 0xa8, 0x26, 0x00, 0x00,
+	0xfe, 0xfb, 0x2b, 0xfe, 0x6b, 0x17, 0xc4, 0xff, 0x32, 0xfb, 0xc1, 0x7f, 0x02, 0x00, 0x00, 0xff,
+	0xff, 0x21, 0x44, 0x29, 0x94, 0xce, 0x26, 0x00, 0x00,
 }

etcdserver/etcdserverpb/rpc.proto

@@ -619,6 +619,8 @@ message AuthRoleGrantRequest {
 }
 
 message AuthRoleRevokeRequest {
+  string role = 1;
+  string key = 2;
 }
 
 message AuthEnableResponse {

etcdserver/v3_server.go

@@ -68,6 +68,7 @@ type Authenticator interface {
 	RoleAdd(ctx context.Context, r *pb.AuthRoleAddRequest) (*pb.AuthRoleAddResponse, error)
 	RoleGrant(ctx context.Context, r *pb.AuthRoleGrantRequest) (*pb.AuthRoleGrantResponse, error)
 	RoleGet(ctx context.Context, r *pb.AuthRoleGetRequest) (*pb.AuthRoleGetResponse, error)
+	RoleRevoke(ctx context.Context, r *pb.AuthRoleRevokeRequest) (*pb.AuthRoleRevokeResponse, error)
 }
 
 func (s *EtcdServer) Range(ctx context.Context, r *pb.RangeRequest) (*pb.RangeResponse, error) {
@@ -369,6 +370,17 @@ func (s *EtcdServer) RoleGet(ctx context.Context, r *pb.AuthRoleGetRequest) (*pb
 	return result.resp.(*pb.AuthRoleGetResponse), nil
 }
 
+func (s *EtcdServer) RoleRevoke(ctx context.Context, r *pb.AuthRoleRevokeRequest) (*pb.AuthRoleRevokeResponse, error) {
+	result, err := s.processInternalRaftRequest(ctx, pb.InternalRaftRequest{AuthRoleRevoke: r})
+	if err != nil {
+		return nil, err
+	}
+	if result.err != nil {
+		return nil, result.err
+	}
+	return result.resp.(*pb.AuthRoleRevokeResponse), nil
+}
+
 func (s *EtcdServer) usernameFromCtx(ctx context.Context) (string, error) {
 	md, mdexist := metadata.FromContext(ctx)
 	if mdexist {