Changeset 57687 in vbox for trunk

Timestamp:

Sep 10, 2015 11:37:00 AM (9 years ago)

Author:

vboxsync

Message:

RTCrStoreCertAddWantedFromFishingExpedition.cpp: A couple of alternative cacerts (java) location (arch linux, solaris 10).

Location:

trunk/src/VBox/Runtime/common/crypto

Files:

• RTCrStoreCertAddWantedFromFishingExpedition.cpp (modified) (1 diff)
• tsp-template.h (modified) (2 diffs)

trunk/src/VBox/Runtime/common/crypto/RTCrStoreCertAddWantedFromFishingExpedition.cpp

@@ -143 +143 @@
 #endif
 #ifdef RT_OS_LINUX
+            PREFIX_UNIXROOT "/etc/ssl/certs/java/cacerts",
+            PREFIX_UNIXROOT "/usr/lib/j*/*/jre/lib/security/cacerts",
             PREFIX_UNIXROOT "/opt/*/jre/lib/security/cacerts",
+#endif
+#ifdef RT_OS_SOLARIS
+            PREFIX_UNIXROOT "/usr/java/jre/lib/security/cacerts",
 #endif
 #ifdef RT_OS_WINDOWS

trunk/src/VBox/Runtime/common/crypto/tsp-template.h

@@ -61 +61 @@
 RTASN1TMPL_BEGIN_SEQCORE();
 RTASN1TMPL_MEMBER_OPT_ITAG_EX(  Seconds, RTASN1INTEGER, RTAsn1Integer, ASN1_TAG_INTEGER, RTASN1TMPL_ITAG_F_UP,
-                                RTASN1TMPL_MEMBER_CONSTR_U64_MIN_MAX(Millis, 1, UINT64_MAX, RT_NOTHING));
+                                RTASN1TMPL_MEMBER_CONSTR_U64_MIN_MAX(Seconds, 0, UINT64_MAX, RT_NOTHING));
 /** @todo The Millis and Micros fields makes no sense if Seconds > 1, while the
  *        Micros field makes no sense with Millis > 1.  Add constraints
@@ -68 +68 @@
                                 RTASN1TMPL_MEMBER_CONSTR_U64_MIN_MAX(Millis, 1, 999, RT_NOTHING));
 RTASN1TMPL_MEMBER_OPT_ITAG_EX(  Micros,     RTASN1INTEGER,  RTAsn1Integer, 1, RTASN1TMPL_ITAG_F_CP,
-                                RTASN1TMPL_MEMBER_CONSTR_U64_MIN_MAX(Millis, 1, 999, RT_NOTHING));
+                                RTASN1TMPL_MEMBER_CONSTR_U64_MIN_MAX(Micros, 1, 999, RT_NOTHING));
 RTASN1TMPL_END_SEQCORE();
 #undef RTASN1TMPL_TYPE