Skip to content

Commit

Permalink
[dev.boringcrypto] all: merge master (nearly Go 1.10 beta 1) into dev…
Browse files Browse the repository at this point in the history
….boringcrypto

This is a git merge of master into dev.boringcrypto.

The branch was previously based on release-branch.go1.9,
so there are a handful of spurious conflicts that would
also arise if trying to merge master into release-branch.go1.9
(which we never do). Those have all been resolved by taking
the original file from master, discarding any Go 1.9-specific
edits.

all.bash passes on darwin/amd64, which is to say without
actually using BoringCrypto.

Go 1.10-related fixes to BoringCrypto itself will be in a followup CL.
This CL is just the merge.

Change-Id: I4c97711fec0fb86761913dcde28d25c001246c35
  • Loading branch information
rsc committed Dec 6, 2017
2 parents c36033a + a032f74 commit 185e609
Show file tree
Hide file tree
Showing 1,928 changed files with 217,744 additions and 72,030 deletions.
3 changes: 3 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Code of Conduct

Please read the [Go Community Code of Conduct](https://golang.org/conduct).
5 changes: 4 additions & 1 deletion .github/ISSUE_TEMPLATE
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
Please answer these questions before submitting your issue. Thanks!


### What version of Go are you using (`go version`)?


### Does this issue reproduce with the latest release?


### What operating system and processor architecture are you using (`go env`)?


Expand All @@ -18,4 +22,3 @@ A link on play.golang.org is best.

### What did you see instead?


6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ _testmain.go
/pkg/
/src/*.*/
/src/cmd/cgo/zdefaultcc.go
/src/cmd/dist/dist
/src/cmd/go/internal/cfg/zdefaultcc.go
/src/cmd/go/internal/cfg/zosarch.go
/src/cmd/internal/objabi/zbootstrap.go
Expand All @@ -43,3 +44,8 @@ _testmain.go
/test/pass.out
/test/run.out
/test/times.out

# This file includes artifacts of Go build that should not be checked in.
# For files created by specific development environment (e.g. editor),
# use alternative ways to exclude files from git.
# For example, set up .git/info/exclude or use a global .gitignore.
2 changes: 2 additions & 0 deletions api/except.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pkg encoding/json, method (*RawMessage) MarshalJSON() ([]uint8, error)
pkg math/big, const MaxBase = 36
pkg math/big, type Word uintptr
pkg net, func ListenUnixgram(string, *UnixAddr) (*UDPConn, error)
pkg os (linux-arm), const O_SYNC = 4096
Expand Down Expand Up @@ -343,3 +344,4 @@ pkg syscall (openbsd-386), const SYS_KILL = 37
pkg syscall (openbsd-386-cgo), const SYS_KILL = 37
pkg syscall (openbsd-amd64), const SYS_KILL = 37
pkg syscall (openbsd-amd64-cgo), const SYS_KILL = 37
pkg unicode, const Version = "9.0.0"
641 changes: 641 additions & 0 deletions api/next.txt

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion doc/articles/wiki/final-noclosure.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"errors"
"html/template"
"io/ioutil"
"log"
"net/http"
"regexp"
)
Expand Down Expand Up @@ -98,5 +99,5 @@ func main() {
http.HandleFunc("/view/", viewHandler)
http.HandleFunc("/edit/", editHandler)
http.HandleFunc("/save/", saveHandler)
http.ListenAndServe(":8080", nil)
log.Fatal(http.ListenAndServe(":8080", nil))
}
3 changes: 2 additions & 1 deletion doc/articles/wiki/final-noerror.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package main
import (
"html/template"
"io/ioutil"
"log"
"net/http"
)

Expand Down Expand Up @@ -49,5 +50,5 @@ func viewHandler(w http.ResponseWriter, r *http.Request) {
func main() {
http.HandleFunc("/view/", viewHandler)
http.HandleFunc("/edit/", editHandler)
http.ListenAndServe(":8080", nil)
log.Fatal(http.ListenAndServe(":8080", nil))
}
3 changes: 2 additions & 1 deletion doc/articles/wiki/final-parsetemplate.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package main
import (
"html/template"
"io/ioutil"
"log"
"net/http"
"regexp"
)
Expand Down Expand Up @@ -87,5 +88,5 @@ func main() {
http.HandleFunc("/view/", makeHandler(viewHandler))
http.HandleFunc("/edit/", makeHandler(editHandler))
http.HandleFunc("/save/", makeHandler(saveHandler))
http.ListenAndServe(":8080", nil)
log.Fatal(http.ListenAndServe(":8080", nil))
}
3 changes: 2 additions & 1 deletion doc/articles/wiki/final-template.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package main
import (
"html/template"
"io/ioutil"
"log"
"net/http"
)

Expand Down Expand Up @@ -61,5 +62,5 @@ func main() {
http.HandleFunc("/view/", viewHandler)
http.HandleFunc("/edit/", editHandler)
http.HandleFunc("/save/", saveHandler)
http.ListenAndServe(":8080", nil)
log.Fatal(http.ListenAndServe(":8080", nil))
}
63 changes: 27 additions & 36 deletions doc/articles/wiki/final-test.patch
Original file line number Diff line number Diff line change
@@ -1,36 +1,27 @@
*** final.go 2015-06-14 23:59:22.000000000 +0200
--- final-test.go 2015-06-15 00:15:41.000000000 +0200
***************
*** 7,12 ****
--- 7,14 ----
import (
"html/template"
"io/ioutil"
+ "log"
+ "net"
"net/http"
"regexp"
)
***************
*** 85,89 ****
http.HandleFunc("/edit/", makeHandler(editHandler))
http.HandleFunc("/save/", makeHandler(saveHandler))

! http.ListenAndServe(":8080", nil)
}
--- 87,101 ----
http.HandleFunc("/edit/", makeHandler(editHandler))
http.HandleFunc("/save/", makeHandler(saveHandler))

! l, err := net.Listen("tcp", "127.0.0.1:0")
! if err != nil {
! log.Fatal(err)
! }
! err = ioutil.WriteFile("final-test-port.txt", []byte(l.Addr().String()), 0644)
! if err != nil {
! log.Fatal(err)
! }
! s := &http.Server{}
! s.Serve(l)
! return
}
--- final.go 2017-08-31 13:19:00.422925489 -0700
+++ final-test.go 2017-08-31 13:23:43.381391659 -0700
@@ -8,6 +8,7 @@
"html/template"
"io/ioutil"
"log"
+ "net"
"net/http"
"regexp"
)
@@ -86,5 +87,15 @@
http.HandleFunc("/edit/", makeHandler(editHandler))
http.HandleFunc("/save/", makeHandler(saveHandler))

- log.Fatal(http.ListenAndServe(":8080", nil))
+ l, err := net.Listen("tcp", "127.0.0.1:0")
+ if err != nil {
+ log.Fatal(err)
+ }
+ err = ioutil.WriteFile("final-test-port.txt", []byte(l.Addr().String()), 0644)
+ if err != nil {
+ log.Fatal(err)
+ }
+ s := &http.Server{}
+ s.Serve(l)
+ return
}
3 changes: 2 additions & 1 deletion doc/articles/wiki/final.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package main
import (
"html/template"
"io/ioutil"
"log"
"net/http"
"regexp"
)
Expand Down Expand Up @@ -85,5 +86,5 @@ func main() {
http.HandleFunc("/edit/", makeHandler(editHandler))
http.HandleFunc("/save/", makeHandler(saveHandler))

http.ListenAndServe(":8080", nil)
log.Fatal(http.ListenAndServe(":8080", nil))
}
3 changes: 2 additions & 1 deletion doc/articles/wiki/http-sample.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package main

import (
"fmt"
"log"
"net/http"
)

Expand All @@ -11,5 +12,5 @@ func handler(w http.ResponseWriter, r *http.Request) {

func main() {
http.HandleFunc("/", handler)
http.ListenAndServe(":8080", nil)
log.Fatal(http.ListenAndServe(":8080", nil))
}
8 changes: 7 additions & 1 deletion doc/articles/wiki/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ <h2>Data Structures</h2>
<pre>
$ go build wiki.go
$ ./wiki
This is a sample page.
This is a sample Page.
</pre>

<p>
Expand Down Expand Up @@ -213,6 +213,12 @@ <h2>Introducing the <code>net/http</code> package (an interlude)</h2>
This function will block until the program is terminated.
</p>

<p>
<code>ListenAndServe</code> always returns an error, since it only returns when an
unexpected error occurs.
In order to log that error we wrap the function call with <code>log.Fatal</code>.
</p>

<p>
The function <code>handler</code> is of the type <code>http.HandlerFunc</code>.
It takes an <code>http.ResponseWriter</code> and an <code>http.Request</code> as
Expand Down
3 changes: 2 additions & 1 deletion doc/articles/wiki/notemplate.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package main
import (
"fmt"
"io/ioutil"
"log"
"net/http"
)

Expand Down Expand Up @@ -52,5 +53,5 @@ func editHandler(w http.ResponseWriter, r *http.Request) {
func main() {
http.HandleFunc("/view/", viewHandler)
http.HandleFunc("/edit/", editHandler)
http.ListenAndServe(":8080", nil)
log.Fatal(http.ListenAndServe(":8080", nil))
}
3 changes: 2 additions & 1 deletion doc/articles/wiki/part2.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package main
import (
"fmt"
"io/ioutil"
"log"
"net/http"
)

Expand Down Expand Up @@ -37,5 +38,5 @@ func viewHandler(w http.ResponseWriter, r *http.Request) {

func main() {
http.HandleFunc("/view/", viewHandler)
http.ListenAndServe(":8080", nil)
log.Fatal(http.ListenAndServe(":8080", nil))
}
3 changes: 2 additions & 1 deletion doc/articles/wiki/part3-errorhandling.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package main
import (
"html/template"
"io/ioutil"
"log"
"net/http"
)

Expand Down Expand Up @@ -69,5 +70,5 @@ func main() {
http.HandleFunc("/view/", viewHandler)
http.HandleFunc("/edit/", editHandler)
http.HandleFunc("/save/", saveHandler)
http.ListenAndServe(":8080", nil)
log.Fatal(http.ListenAndServe(":8080", nil))
}
3 changes: 2 additions & 1 deletion doc/articles/wiki/part3.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package main
import (
"html/template"
"io/ioutil"
"log"
"net/http"
)

Expand Down Expand Up @@ -53,5 +54,5 @@ func main() {
http.HandleFunc("/view/", viewHandler)
http.HandleFunc("/edit/", editHandler)
//http.HandleFunc("/save/", saveHandler)
http.ListenAndServe(":8080", nil)
log.Fatal(http.ListenAndServe(":8080", nil))
}
6 changes: 6 additions & 0 deletions doc/asm.html
Original file line number Diff line number Diff line change
Expand Up @@ -876,6 +876,12 @@ <h3 id="mips">MIPS, MIPS64</h3>

</ul>

<p>
The value of <code>GOMIPS</code> environment variable (<code>hardfloat</code> or
<code>softfloat</code>) is made available to assembly code by predefining either
<code>GOMIPS_hardfloat</code> or <code>GOMIPS_softfloat</code>.
</p>

<h3 id="unsupported_opcodes">Unsupported opcodes</h3>

<p>
Expand Down
1 change: 1 addition & 0 deletions doc/contrib.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ <h3 id="release"><a href="/doc/devel/release.html">Release History</a></h3>
<p>A <a href="/doc/devel/release.html">summary</a> of the changes between Go releases. Notes for the major releases:</p>

<ul>
<li><a href="/doc/go1.10">Go 1.10</a> <small>(February 2018)</small></li>
<li><a href="/doc/go1.9">Go 1.9</a> <small>(August 2017)</small></li>
<li><a href="/doc/go1.8">Go 1.8</a> <small>(February 2017)</small></li>
<li><a href="/doc/go1.7">Go 1.7</a> <small>(August 2016)</small></li>
Expand Down
33 changes: 21 additions & 12 deletions doc/contribute.html
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ <h3>Step 2: Run the provided script</h3>
</p>

<p>
Your secret authentication token is now in a <code>.gitcookie</code> file
Your secret authentication token is now in a <code>.gitcookies</code> file
and Git is configured to use this file.
</p>

Expand Down Expand Up @@ -158,7 +158,7 @@ <h2 id="git-codereview">Setting up Git for submission to Gerrit</h2>
Changes to Go must be reviewed before they are accepted, no matter who makes the change.
A custom git command called <code>git-codereview</code>, discussed below,
helps manage the code review process through a Google-hosted
<a href="https://go-review.googlesource.com/">instance</a> Gerrit.
<a href="https://go-review.googlesource.com/">instance</a> of Gerrit.
</p>

<h3 id="git-codereview_install">Install the git-codereview command</h3>
Expand Down Expand Up @@ -208,12 +208,6 @@ <h3 id="git-codereview_install">Install the git-codereview command</h3>
<code>git-codereview</code> <code>hooks</code>.
</p>

<p>
The workflow described below assumes a single change per branch.
It is also possible to prepare a sequence of (usually related) changes in a single branch.
See the <a href="https://golang.org/x/review/git-codereview">git-codereview documentation</a> for details.
</p>

<h3 id="git-config">Set up git aliases</h3>

<p>
Expand Down Expand Up @@ -305,6 +299,15 @@ <h2 id="Design">Discuss your design</h2>
sent during a feature freeze but will not be accepted until the freeze thaws.
</p>

<h3 id="scratch">Not sure what change to make?</h3>

<p>
If you want to become familiar with Gerrit and the contribution process,
but aren't sure what you'd like to contribute just yet, you can use the <a
href="https://go.googlesource.com/scratch">scratch repository</a> to practice
making a change.
</p>

<h2 id="making_a_change">Making a change</h2>

<h3 id="checkout_go">Getting Go Source</h3>
Expand Down Expand Up @@ -420,6 +423,12 @@ <h3 id="commit_changes">Commit your changes</h3>
directly to that local branch.
</p>

<p>
The workflow described here assumes a single change per branch.
It is also possible to prepare a sequence of (usually related) changes in a single branch.
See the <a href="https://golang.org/x/review/git-codereview">git-codereview documentation</a> for details.
</p>

<pre>
$ git change <i>&lt;branch&gt;</i>
</pre>
Expand Down Expand Up @@ -681,8 +690,8 @@ <h2 id="review">Going through the review process</h2>
When done, the reviewer adds comments through the Gerrit user interface
and clicks "Reply" to send comments back.
You will receive a mail notification when this happens.
You must reply through the web interface.
(Unlike with the old Rietveld review system, replying by mail has no effect.)
You may reply through the web interface or
<a href="https://gerrit-review.googlesource.com/Documentation/intro-user.html#reply-by-email">via email</a>.
</p>

<h3 id="revise">Revise and resend</h3>
Expand All @@ -696,8 +705,8 @@ <h3 id="revise">Revise and resend</h3>
</p>

<p>
You must respond to review comments through the web interface.
(Unlike with the old Rietveld review system, responding by mail has no effect.)
You may respond to review comments through the web interface or
<a href="https://gerrit-review.googlesource.com/Documentation/intro-user.html#reply-by-email">via email</a>.
</p>

<p>
Expand Down
4 changes: 2 additions & 2 deletions doc/debugging_with_gdb.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ <h2 id="Introduction">Introduction</h2>

<p>
When you compile and link your Go programs with the <code>gc</code> toolchain
on Linux, Mac OS X, FreeBSD or NetBSD, the resulting binaries contain DWARFv3
debugging information that recent versions (&gt;7.1) of the GDB debugger can
on Linux, Mac OS X, FreeBSD or NetBSD, the resulting binaries contain DWARFv4
debugging information that recent versions (&ge;7.5) of the GDB debugger can
use to inspect a live process or a core dump.
</p>

Expand Down
Loading

0 comments on commit 185e609

Please sign in to comment.