[sagenb] 42/179: 1024-bit rsa keys, Darwin, expiration_days

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository sagenb.

commit 3cbaaec1fc0362bb0acc40dcf7fe8d8172fad357
Author: Dmitrii Pasechnik <dimpase+github at gmail.com>
Date:   Fri Nov 30 22:34:53 2012 +0800

    1024-bit rsa keys,  Darwin,  expiration_days
    
    generate 1024-bit rsa keys,  
    do not treat Darwin specially in this respect, as openssl is there anyway,
    decrease expiration_days to an acceptable period.
---
 sagenb/notebook/run_notebook.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sagenb/notebook/run_notebook.py b/sagenb/notebook/run_notebook.py
index e2fea7c..0677b86 100644
--- a/sagenb/notebook/run_notebook.py
+++ b/sagenb/notebook/run_notebook.py
@@ -387,7 +387,7 @@ def notebook_setup(self=None):
                 'dns_name': None,
                 'crl_dist_points': None,
                 'ip_address': None,
-                'expiration_days': 10000,
+                'expiration_days': 8999,
                 'email': 'sage at sagemath.org',
                 'ca': None,
                 'tls_www_client': None,
@@ -414,10 +414,10 @@ def notebook_setup(self=None):
 
     import subprocess
 
-    if os.uname()[0] != 'Darwin' and cmd_exists('openssl'):
+    if cmd_exists('openssl'):
         # We use openssl by default if it exists, since it is open
         # *vastly* faster on Linux, for some weird reason.
-        cmd = ['openssl genrsa > %s' % private_pem]
+        cmd = ['openssl genrsa 1024 > %s' % private_pem]
         print "Using openssl to generate key"
         print cmd[0]
         subprocess.call(cmd, shell=True)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git