Ignore:
Timestamp:
Feb 27, 2010, 9:22:37 PM (12 years ago)
Author:
Arno Wacker
Message:

P2PBase:

  • Updated peers@play-DLLs (Debug/Release) to r4514

P2PPeer:

  • User name can now be chosen from settings, defaults to "CrypTool2"
  • Renamed Log2Monitor to "Use syslogging"
  • Moved "Internal state dump" to "P2P Expert Settings"

P2PCertificates

  • Added new general certificate for CrypTool, with username "CrypTool2", world-reg-ex "CrypTool2*", email anonymous@…, password "ct2" - this is now the default certificate used for peers@play (automatically installed)
  • Uncommented checking for SSL certificates (Server_CA and OPA) since they are only needed when ordering online a new certificate - a feature, which is not used as of now.
Location:
trunk/CrypPlugins/PeerToPeerCertificates
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypPlugins/PeerToPeerCertificates/PAPCertificate.cs

    r1115 r1212  
    2121        /// registered with this user name.
    2222        /// </summary>
    23         public const string CERTIFIED_PEER_NAME = "pap0001"; //"CT_PAP_User";
     23        public const string CERTIFIED_PEER_NAME = "CrypTool2"; //"pap0001"; //"CT_PAP_User";
    2424        public const string CERTIFICATE_DIRECTORY = "pap_certificates";
    2525
     
    4343
    4444        //private const string CERT_USER_SUBJECT = "CN=pap0001@pap.de@pap0001@.*, O=Peers@Play, S=None, C=NA";
    45         private const string CERT_USER_FILE_NAME = "pap0001.p12"; //ct2_user_pap.cer
    46         private const string CERT_USER_PASSWORD = "test"; //CT2p@pC3rt1f1cat10n
     45        private const string CERT_USER_FILE_NAME = "CrypTool2.pfx"; //"pap0001.p12"; //ct2_user_pap.cer
     46        private const string CERT_USER_PASSWORD = "ct2"; //"test"; //CT2p@pC3rt1f1cat10n
    4747        private const string CERT_USER_ISSUER = "P@P project";
    48         private const string CERT_USER_SERIAL = "0D";
     48        private const string CERT_USER_SERIAL = "1E"; //"0D";
    4949
    5050        private const string CERT_PAP_FILE_NAME = "pap.cer";
     
    112112
    113113            /* BEGIN: Checking availablity of the three root certificates */
    114             certColl = FindCertificates(CERT_STORE_ROOT, CERT_STORE_LOCATION,
    115                 PAP_FIND_TYPE, CERT_SERVER_CA_SERIAL, true);
    116             if (certColl.Count == 0)
    117                 retLst.Add(PAP_Certificates.Server_CA);
    118 
    119             certColl = FindCertificates(CERT_STORE_ROOT, CERT_STORE_LOCATION,
    120                 PAP_FIND_TYPE, CERT_OPA_SERIAL, true);
    121             if (certColl.Count == 0)
    122                 retLst.Add(PAP_Certificates.Opa);
     114
     115            // Wacker 27.02.2010: Removed checking for Server and OPA (operator-SSL) certificates; These are only needed if
     116            // we want to get a new certificate online - a feature which is not implmented now. When this feature is
     117            // implemented, just uncommentd the following lines
     118
     119            //certColl = FindCertificates(CERT_STORE_ROOT, CERT_STORE_LOCATION,
     120            //    PAP_FIND_TYPE, CERT_SERVER_CA_SERIAL, true);
     121            //if (certColl.Count == 0)
     122            //    retLst.Add(PAP_Certificates.Server_CA);
     123
     124            //certColl = FindCertificates(CERT_STORE_ROOT, CERT_STORE_LOCATION,
     125            //    PAP_FIND_TYPE, CERT_OPA_SERIAL, true);
     126            //if (certColl.Count == 0)
     127            //    retLst.Add(PAP_Certificates.Opa);
    123128
    124129            certColl = FindCertificates(CERT_STORE_ROOT, CERT_STORE_LOCATION,
  • trunk/CrypPlugins/PeerToPeerCertificates/PeerToPeerCertificates.csproj

    r1115 r1212  
    5151  </ItemGroup>
    5252  <ItemGroup>
     53    <None Include="pap_certificates\CrypTool2.pfx" />
    5354    <None Include="pap_certificates\opa.vs.uni-due.de.cer" />
    5455    <None Include="pap_certificates\pap.cer" />
     
    7980copy "$(ProjectDir)pap_certificates\*.cer" "./pap_certificates"
    8081copy "$(ProjectDir)pap_certificates\*.p12" "./pap_certificates"
     82copy "$(ProjectDir)pap_certificates\*.pfx" "./pap_certificates"
     83)
    8184)</PostBuildEvent>
    8285  </PropertyGroup>
Note: See TracChangeset for help on using the changeset viewer.