aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwbond <will@wbond.net>2019-10-12 05:48:42 -0400
committerwbond <will@wbond.net>2019-10-12 05:48:42 -0400
commite6348125558c59a5ded98d1b634f6ca2bda50746 (patch)
treea2a515e0a661bc1f0fa8638c54145595c908a0d1
parent4b0557ef181286dfe62b96b39358775ecb06dcd9 (diff)
downloadasn1crypto-e6348125558c59a5ded98d1b634f6ca2bda50746.tar.gz
Version 1.1.0
-rw-r--r--asn1crypto/version.py4
-rw-r--r--changelog.md5
-rw-r--r--readme.md2
-rw-r--r--setup.py2
-rw-r--r--tests/__init__.py4
-rw-r--r--tests/setup.py2
6 files changed, 12 insertions, 7 deletions
diff --git a/asn1crypto/version.py b/asn1crypto/version.py
index 5a4d459..adaa144 100644
--- a/asn1crypto/version.py
+++ b/asn1crypto/version.py
@@ -2,5 +2,5 @@
from __future__ import unicode_literals, division, absolute_import, print_function
-__version__ = '1.0.1'
-__version_info__ = (1, 0, 1)
+__version__ = '1.1.0'
+__version_info__ = (1, 1, 0)
diff --git a/changelog.md b/changelog.md
index e2f5f5f..ea4ad39 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,10 @@
# changelog
+## 1.1.0
+
+ - Added User ID (`0.9.2342.19200300.100.1.1`) to `x509.NameType()`
+ - Added various EC named curves to `keys.NamedCurve()`
+
## 1.0.1
- Fix an absolute import in `keys` to a relative import
diff --git a/readme.md b/readme.md
index aafaca5..5593517 100644
--- a/readme.md
+++ b/readme.md
@@ -112,7 +112,7 @@ faster to an order of magnitude or more.
## Current Release
-1.0.1 - [changelog](changelog.md)
+1.1.0 - [changelog](changelog.md)
## Dependencies
diff --git a/setup.py b/setup.py
index de17a22..6768055 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ from setuptools.command.egg_info import egg_info
PACKAGE_NAME = 'asn1crypto'
-PACKAGE_VERSION = '1.0.1'
+PACKAGE_VERSION = '1.1.0'
PACKAGE_ROOT = os.path.dirname(os.path.abspath(__file__))
diff --git a/tests/__init__.py b/tests/__init__.py
index 7aae2fc..fddf30f 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -6,8 +6,8 @@ import os
import unittest
-__version__ = '1.0.1'
-__version_info__ = (1, 0, 1)
+__version__ = '1.1.0'
+__version_info__ = (1, 1, 0)
def _import_from(mod, path, mod_dir=None):
diff --git a/tests/setup.py b/tests/setup.py
index 1385c11..23ee9f7 100644
--- a/tests/setup.py
+++ b/tests/setup.py
@@ -10,7 +10,7 @@ from setuptools.command.egg_info import egg_info
PACKAGE_NAME = 'asn1crypto'
-PACKAGE_VERSION = '1.0.1'
+PACKAGE_VERSION = '1.1.0'
TEST_PACKAGE_NAME = '%s_tests' % PACKAGE_NAME
TESTS_ROOT = os.path.dirname(os.path.abspath(__file__))
PACKAGE_ROOT = os.path.abspath(os.path.join(TESTS_ROOT, '..'))