Fix certificate generation

This commit is contained in:
Florian Mounier
2017-03-13 11:59:10 +01:00
parent 40496eb9d1
commit 2aa237ef12
7 changed files with 11 additions and 5 deletions

View File

@@ -1,4 +1,4 @@
# ƸӜƷ butterfly 3.0 (Not released yet)
# ƸӜƷ butterfly 3.0
![](http://paradoxxxzero.github.io/assets/butterfly_2.0_1.gif)

View File

@@ -196,6 +196,11 @@ if options.generate_certs:
server_pk.generate_key(crypto.TYPE_RSA, 2048)
server_cert = crypto.X509()
server_cert.get_subject().CN = host
alt = 'subjectAltName'
value = 'DNS:%s' % host
server_cert.add_extensions([crypto.X509Extension(
alt.encode('utf-8'), False, value.encode('utf-8'))])
fill_fields(server_cert.get_subject())
server_cert.set_serial_number(uuid.uuid4().int)
server_cert.gmtime_adj_notBefore(0) # From now

View File

@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
__version__ = '3.0.0-beta-1'
__version__ = '3.0.0'
import os

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -408,4 +408,5 @@ class AnsiColors(object):
return '\x1b[0m'
return ''
ansi_colors = AnsiColors()

View File

@@ -1,6 +1,6 @@
{
"name": "butterfly",
"version": "2.0.2",
"version": "3.0.0",
"description": "A sleek web based terminal emulator",
"repository": {
"type": "git",