Browse Source

go.crypto: remove unreachable code.

I ran go vet over all of go.crypto and removed lots of panic("unreachable") that are no longer needed.

R=golang-dev, r, dgryski
CC=golang-dev
https://golang.org/cl/10113043
Adam Langley 11 years ago
parent
commit
eca6c1626e

+ 4 - 2
cast5/cast5_test.go

@@ -52,8 +52,10 @@ func TestBasic(t *testing.T) {
 // However, due to the length of time taken, it's disabled here and a more
 // limited version is included, below.
 func TestFull(t *testing.T) {
-	// This is too slow for normal testing
-	return
+	if testing.Short() {
+		// This is too slow for normal testing
+		return
+	}
 
 	a, b := iterate(1000000)
 

+ 0 - 2
openpgp/keys.go

@@ -250,8 +250,6 @@ func readToNextPublicKey(packets *packet.Reader) (err error) {
 			return
 		}
 	}
-
-	panic("unreachable")
 }
 
 // ReadEntity reads an entity (public key, identities, subkeys etc) from the

+ 0 - 2
openpgp/packet/packet.go

@@ -272,8 +272,6 @@ func consumeAll(r io.Reader) (n int64, err error) {
 			return
 		}
 	}
-
-	panic("unreachable")
 }
 
 // packetType represents the numeric ids of the different OpenPGP packet types. See

+ 0 - 1
openpgp/packet/public_key.go

@@ -318,7 +318,6 @@ func (pk *PublicKey) VerifySignature(signed hash.Hash, sig *Signature) (err erro
 	default:
 		panic("shouldn't happen")
 	}
-	panic("unreachable")
 }
 
 // keySignatureHash returns a Hash of the message that needs to be signed for

+ 0 - 2
ssh/channel.go

@@ -340,8 +340,6 @@ func (c *serverChan) read(data []byte) (n int, err error, windowAdjustment uint3
 
 		c.cond.Wait()
 	}
-
-	panic("unreachable")
 }
 
 // getWindowSpace takes, at most, max bytes of space from the peer's window. It

+ 0 - 2
ssh/client_auth.go

@@ -286,7 +286,6 @@ func (p *publickeyAuth) confirmKeyAck(key interface{}, t *transport) (bool, erro
 			return false, UnexpectedMessageError{msgUserAuthSuccess, packet[0]}
 		}
 	}
-	panic("unreachable")
 }
 
 func (p *publickeyAuth) method() string {
@@ -325,7 +324,6 @@ func handleAuthResponse(t *transport) (bool, []string, error) {
 			return false, nil, UnexpectedMessageError{msgUserAuthSuccess, packet[0]}
 		}
 	}
-	panic("unreachable")
 }
 
 // ClientAuthKeyring returns a ClientAuth using public key authentication via

+ 0 - 2
ssh/server.go

@@ -730,8 +730,6 @@ func (s *ServerConn) Accept() (Channel, error) {
 			}
 		}
 	}
-
-	panic("unreachable")
 }
 
 // A Listener implements a network listener (net.Listener) for SSH connections.

+ 0 - 1
ssh/server_terminal.go

@@ -77,5 +77,4 @@ func (ss *ServerTerminal) ReadLine() (line string, err error) {
 			ss.Channel.AckRequest(ok)
 		}
 	}
-	panic("unreachable")
 }

+ 0 - 1
ssh/session_test.go

@@ -62,7 +62,6 @@ func dial(handler serverType, t *testing.T) *ClientConn {
 				handler(ch.(*serverChan), t)
 			}()
 		}
-		<-done
 	}()
 
 	config := &ClientConfig{

+ 0 - 1
ssh/transport.go

@@ -139,7 +139,6 @@ func (t *transport) readPacket() ([]byte, error) {
 			return packet, nil
 		}
 	}
-	panic("unreachable")
 }
 
 // Encrypt and send a packet of data to the remote peer.