|
 |
51ce6b |
# HG changeset patch
|
|
|
51ce6b |
# User Bob Relyea <rrelyea@redhat.com>
|
|
|
51ce6b |
# Date 1513864398 -3600
|
|
|
51ce6b |
# Thu Dec 21 14:53:18 2017 +0100
|
|
|
51ce6b |
# Node ID e577b1df8dabb31466cebad07fdbe0883290bede
|
|
|
51ce6b |
# Parent 481de926f1fa18b7b62e80b59f28f2aef7ab3034
|
|
|
51ce6b |
Bug 1312142, Softoken still does not handle login state correctly for user db slots in FIPS mode, r=kaie
|
|
|
51ce6b |
|
|
|
51ce6b |
diff --git a/lib/util/utilpars.c b/lib/util/utilpars.c
|
|
|
51ce6b |
--- a/lib/util/utilpars.c
|
|
|
51ce6b |
+++ b/lib/util/utilpars.c
|
|
|
51ce6b |
@@ -589,6 +589,7 @@ struct nssutilArgSlotFlagTable {
|
|
|
51ce6b |
}
|
|
|
51ce6b |
static struct nssutilArgSlotFlagTable nssutil_argSlotFlagTable[] = {
|
|
|
51ce6b |
NSSUTIL_ARG_ENTRY(RSA, SECMOD_RSA_FLAG),
|
|
|
51ce6b |
+ NSSUTIL_ARG_ENTRY(ECC, SECMOD_ECC_FLAG),
|
|
|
51ce6b |
NSSUTIL_ARG_ENTRY(DSA, SECMOD_RSA_FLAG),
|
|
|
51ce6b |
NSSUTIL_ARG_ENTRY(RC2, SECMOD_RC4_FLAG),
|
|
|
51ce6b |
NSSUTIL_ARG_ENTRY(RC4, SECMOD_RC2_FLAG),
|
|
|
51ce6b |
diff --git a/lib/util/utilparst.h b/lib/util/utilparst.h
|
|
|
51ce6b |
--- a/lib/util/utilparst.h
|
|
|
51ce6b |
+++ b/lib/util/utilparst.h
|
|
|
51ce6b |
@@ -43,7 +43,7 @@
|
|
|
51ce6b |
#define NSSUTIL_DEFAULT_INTERNAL_INIT3 \
|
|
|
51ce6b |
" askpw=any timeout=30})\""
|
|
|
51ce6b |
#define NSSUTIL_DEFAULT_SFTKN_FLAGS \
|
|
|
51ce6b |
- "slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512]"
|
|
|
51ce6b |
+ "slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512]"
|
|
|
51ce6b |
|
|
|
51ce6b |
#define NSSUTIL_DEFAULT_CIPHER_ORDER 0
|
|
|
51ce6b |
#define NSSUTIL_DEFAULT_TRUST_ORDER 50
|