aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cryptography/__about__.py2
-rw-r--r--setup.py1
-rw-r--r--vectors/cryptography_vectors/__about__.py2
3 files changed, 3 insertions, 2 deletions
diff --git a/cryptography/__about__.py b/cryptography/__about__.py
index 77320b95..3d39d18b 100644
--- a/cryptography/__about__.py
+++ b/cryptography/__about__.py
@@ -27,5 +27,5 @@ __version__ = "0.7.dev1"
__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__)
diff --git a/setup.py b/setup.py
index ca729275..bf4e864b 100644
--- a/setup.py
+++ b/setup.py
@@ -304,6 +304,7 @@ setup(
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",
diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
index fb89b01c..3824d784 100644
--- a/vectors/cryptography_vectors/__about__.py
+++ b/vectors/cryptography_vectors/__about__.py
@@ -27,5 +27,5 @@ __version__ = "0.7.dev1"
__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__