Skip to content
This repository has been archived by the owner on Jul 8, 2021. It is now read-only.

Commit

Permalink
Update license and install information
Browse files Browse the repository at this point in the history
ZGrab is licensed under Apache 2.0, except where licensed under ISC.
  • Loading branch information
dadrian committed Jul 2, 2015
1 parent d74c1a1 commit 04d31f0
Show file tree
Hide file tree
Showing 64 changed files with 454 additions and 8 deletions.
6 changes: 0 additions & 6 deletions INSTALL

This file was deleted.

32 changes: 30 additions & 2 deletions LICENSE
@@ -1,3 +1,31 @@
ZGrab is an original work created at the University of Michigan, and is
licensed under the Apache 2.0 license. However, ZGrab contains a fork of
several packages from Golang standard library, as well as code from the
BoringSSL test runner. Files that were created by Google, and new files in
forks of packages maintained by Google have a Google copyright and fall under
the ISC license. All other files are copyright Regents of the University of
Michigan, and fall under the Apache 2.0 license. Both licenses are reproduced
at the bottom of this file.

--------

ISC License used for Google code

/* Copyright (c) 2015, Google Inc.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */


Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -186,7 +214,7 @@ Apache License
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright {yyyy} {name of copyright owner}
ZGrab Copyright 2015 Regents of the University of Michigan

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -198,4 +226,4 @@ Apache License
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
4 changes: 4 additions & 0 deletions README.md
Expand Up @@ -46,3 +46,7 @@ If you are using ZGrab code in another Go program, import ZGrab using [gopkg.in]
```
gopkg.in/zmap/zgrab.v0.0.1
```

## License

ZGrab is licensed under Apache 2.0 and ISC. For more information, see the LICENSE file.
8 changes: 8 additions & 0 deletions main.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package main

import (
Expand Down
8 changes: 8 additions & 0 deletions summary.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package main

import (
Expand Down
8 changes: 8 additions & 0 deletions zlib/config.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import (
Expand Down
8 changes: 8 additions & 0 deletions zlib/conn.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import (
Expand Down
8 changes: 8 additions & 0 deletions zlib/connect_event.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import "encoding/json"
Expand Down
8 changes: 8 additions & 0 deletions zlib/dial.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import (
Expand Down
8 changes: 8 additions & 0 deletions zlib/event.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import (
Expand Down
8 changes: 8 additions & 0 deletions zlib/event_test.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import (
Expand Down
8 changes: 8 additions & 0 deletions zlib/ftp.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

type FTPBannerEvent struct {
Expand Down
8 changes: 8 additions & 0 deletions zlib/grabber.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import (
Expand Down
8 changes: 8 additions & 0 deletions zlib/heartbleed_event.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import (
Expand Down
8 changes: 8 additions & 0 deletions zlib/http_event.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

type HTTPGETEvent struct {
Expand Down
8 changes: 8 additions & 0 deletions zlib/mail.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import "encoding/json"
Expand Down
8 changes: 8 additions & 0 deletions zlib/modbus.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import (
Expand Down
8 changes: 8 additions & 0 deletions zlib/output.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import (
Expand Down
8 changes: 8 additions & 0 deletions zlib/processing.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import (
Expand Down
8 changes: 8 additions & 0 deletions zlib/read.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import (
Expand Down
8 changes: 8 additions & 0 deletions zlib/ssh_event.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import "github.com/zmap/zgrab/ztools/ssh"
Expand Down
8 changes: 8 additions & 0 deletions zlib/utility.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import "errors"
Expand Down
8 changes: 8 additions & 0 deletions zlib/write.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import "encoding/json"
Expand Down
8 changes: 8 additions & 0 deletions zlib/zgrab.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import (
Expand Down
8 changes: 8 additions & 0 deletions zlib/zgrab_test.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import (
Expand Down
8 changes: 8 additions & 0 deletions zlib/ztls_event.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import (
Expand Down
8 changes: 8 additions & 0 deletions zlib/ztls_event_test.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package zlib

import (
Expand Down
8 changes: 8 additions & 0 deletions ztools/keys/dhe.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package keys

import (
Expand Down
8 changes: 8 additions & 0 deletions ztools/keys/dhe_test.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package keys

import (
Expand Down
8 changes: 8 additions & 0 deletions ztools/keys/ecdhe.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package keys

import (
Expand Down
8 changes: 8 additions & 0 deletions ztools/keys/ecdhe_test.go
@@ -1,3 +1,11 @@
/*
* ZGrab Copyright 2015 Regents of the University of Michigan
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*/

package keys

import (
Expand Down

0 comments on commit 04d31f0

Please sign in to comment.