commit abe8bc966ceff90dbb26affcf54348e4809864d5
author Alex Gaynor <alex.gaynor@gmail.com> Fri Oct 31 19:28:57 2014 -0700
committer Alex Gaynor <alex.gaynor@gmail.com> Fri Oct 31 19:28:57 2014 -0700
tree 6817054c41ecc8793ad8d6884460989b245af3b1
parent ec60e31c37a04f773e65d98e83ba9d5b05d4950f

Update the license in setup.py

cryptography/__about__.py

diff --git a/cryptography/__about__.py b/cryptography/__about__.py
index 77320b9..3d39d18 100644
--- a/cryptography/__about__.py
+++ b/cryptography/__about__.py
@@ -27,5 +27,5 @@
 __author__ = "The cryptography developers"
 __email__ = "cryptography-dev@python.org"
 
-__license__ = "Apache License, Version 2.0"
+__license__ = "BSD or Apache License, Version 2.0"
 __copyright__ = "Copyright 2013-2014 {0}".format(__author__)

setup.py

diff --git a/setup.py b/setup.py
index ca72927..bf4e864 100644
--- a/setup.py
+++ b/setup.py
@@ -304,6 +304,7 @@
     classifiers=[
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Apache Software License",
+        "License :: OSI Approved :: BSD License",
         "Natural Language :: English",
         "Operating System :: MacOS :: MacOS X",
         "Operating System :: POSIX",

vectors/cryptography_vectors/__about__.py

diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
index fb89b01..3824d78 100644
--- a/vectors/cryptography_vectors/__about__.py
+++ b/vectors/cryptography_vectors/__about__.py
@@ -27,5 +27,5 @@
 __author__ = "The cryptography developers"
 __email__ = "cryptography-dev@python.org"
 
-__license__ = "Apache License, Version 2.0"
+__license__ = "BSD and Apache License, Version 2.0"
 __copyright__ = "Copyright 2013-2014 %s" % __author__