1
0
Fork 0
forked from External/grumble
This commit is contained in:
Tim Cooper 2016-03-25 22:05:23 -03:00
parent 083163daf9
commit 20eba760e5
15 changed files with 163 additions and 163 deletions

View file

@ -330,7 +330,7 @@ func (client *Client) udpRecvLoop() {
case mumbleproto.UDPMessageVoiceCELTAlpha: case mumbleproto.UDPMessageVoiceCELTAlpha:
fallthrough fallthrough
case mumbleproto.UDPMessageVoiceCELTBeta: case mumbleproto.UDPMessageVoiceCELTBeta:
if (client.server.Opus) { if client.server.Opus {
return return
} }
fallthrough fallthrough

View file

@ -6,8 +6,8 @@ package main
import ( import (
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"mumble.info/grumble/pkg/replacefile"
"io/ioutil" "io/ioutil"
"mumble.info/grumble/pkg/replacefile"
"path/filepath" "path/filepath"
"strconv" "strconv"
) )

View file

@ -46,7 +46,7 @@ func (perm Permission) IsCached() bool {
// Clean returns a Permission that has its cache bit cleared. // Clean returns a Permission that has its cache bit cleared.
func (perm Permission) Clean() Permission { func (perm Permission) Clean() Permission {
return perm ^Permission(CachedPermission) return perm ^ Permission(CachedPermission)
} }
// An ACL as defined in an ACL context. // An ACL as defined in an ACL context.
@ -88,7 +88,7 @@ func (acl *ACL) IsChannelACL() bool {
// The permission perm must be a single permission and not a combination of permissions. // The permission perm must be a single permission and not a combination of permissions.
func HasPermission(ctx *Context, user User, perm Permission) bool { func HasPermission(ctx *Context, user User, perm Permission) bool {
// We can't check permissions on a nil ctx. // We can't check permissions on a nil ctx.
if (ctx == nil) { if ctx == nil {
panic("acl: HasPermission got nil context") panic("acl: HasPermission got nil context")
} }

View file

@ -7,8 +7,8 @@ package cryptstate
import ( import (
"bytes" "bytes"
"crypto/aes" "crypto/aes"
"testing"
"encoding/hex" "encoding/hex"
"testing"
) )
func TestOCB2AES128Encrypt(t *testing.T) { func TestOCB2AES128Encrypt(t *testing.T) {
@ -88,9 +88,9 @@ func TestOCB2AES128Decrypt(t *testing.T) {
func TestXSalsa20Poly1305Encrypt(t *testing.T) { func TestXSalsa20Poly1305Encrypt(t *testing.T) {
cs := CryptState{} cs := CryptState{}
var key[32]byte var key [32]byte
var eiv[24]byte var eiv [24]byte
var div[24]byte var div [24]byte
var message [64]byte var message [64]byte
for i := range key[:] { for i := range key[:] {
@ -125,9 +125,9 @@ func TestXSalsa20Poly1305Encrypt(t *testing.T) {
func TestXSalsa20Poly1305Decrypt(t *testing.T) { func TestXSalsa20Poly1305Decrypt(t *testing.T) {
cs := CryptState{} cs := CryptState{}
var key[32]byte var key [32]byte
var eiv[24]byte var eiv [24]byte
var div[24]byte var div [24]byte
var expected [64]byte var expected [64]byte
for i := range key[:] { for i := range key[:] {

View file

@ -5,7 +5,7 @@
package cryptstate package cryptstate
// nullMode implements the NULL CryptoMode // nullMode implements the NULL CryptoMode
type nullMode struct {} type nullMode struct{}
// NonceSize returns the nonce size to be used with NULL. // NonceSize returns the nonce size to be used with NULL.
func (n *nullMode) NonceSize() int { func (n *nullMode) NonceSize() int {

View file

@ -5,8 +5,8 @@
package cryptstate package cryptstate
import ( import (
"unsafe"
"golang.org/x/crypto/nacl/secretbox" "golang.org/x/crypto/nacl/secretbox"
"unsafe"
) )
// secretBoxMode implements the XSalsa20-Poly1305 CryptoMode // secretBoxMode implements the XSalsa20-Poly1305 CryptoMode

View file

@ -5,8 +5,8 @@
package replacefile package replacefile
import ( import (
"unsafe"
"syscall" "syscall"
"unsafe"
) )
var ( var (