fix: avoid emptying nomcom session key when openssl complains about derivation (ietf-tools#4524)

rjsparks · web-flow · commit 9b896e586913 · 2022-09-30T08:05:01.000-05:00
diff --git a/ietf/nomcom/utils.py b/ietf/nomcom/utils.py
@@ -202,7 +202,7 @@ def store_nomcom_private_key(request, year, private_key):
         )
         if code != 0:
             log("openssl error: %s:\n  Error %s: %s" %(command, code, error))        
-        if error:
+        if error and error!=b"*** WARNING : deprecated key derivation used.\nUsing -iter or -pbkdf2 would be better.\n":
             out = ''
         request.session['NOMCOM_PRIVATE_KEY_%s' % year] = out
 

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ def store_nomcom_private_key(request, year, private_key):`
`202`	`202`	`)`
`203`	`203`	`if code != 0:`
`204`	`204`	`log("openssl error: %s:\n Error %s: %s" %(command, code, error))`
`205`		`- if error:`
	`205`	`+ if error and error!=b"*** WARNING : deprecated key derivation used.\nUsing -iter or -pbkdf2 would be better.\n":`
`206`	`206`	`out = ''`
`207`	`207`	`request.session['NOMCOM_PRIVATE_KEY_%s' % year] = out`
`208`	`208`