/[resiprocate]/main/sip/resiprocate/Security.cxx
ViewVC logotype

Diff of /main/sip/resiprocate/Security.cxx

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3603 by jason, Tue Nov 23 06:56:20 2004 UTC revision 3604 by fluffy, Tue Nov 23 07:15:40 2004 UTC
# Line 68  Line 68 
68  Data  Data
69  readIntoData(const Data& filename)  readIntoData(const Data& filename)
70  {  {
71       DebugLog( << "Trying to read file " << filename );
72      
73    ifstream is;    ifstream is;
74    is.open(filename.c_str(), ios::binary );    is.open(filename.c_str(), ios::binary );
75    assert(is.is_open());     assert(is.is_open()); // TODO should thorw not assert
76    
77    // get length of file:    // get length of file:
78    is.seekg (0, ios::end);    is.seekg (0, ios::end);
# Line 157  Line 159 
159        {        {
160           if (name.prefix(userCert))           if (name.prefix(userCert))
161           {           {
162              addUserCertPEM(getAor(name, userCert), readIntoData(name));              addUserCertPEM(getAor(name, userCert), readIntoData(mPath + name));
163           }           }
164           else if (name.prefix(userKey))           else if (name.prefix(userKey))
165           {           {
166              addUserPrivateKeyPEM(getAor(name, userKey), readIntoData(name));              addUserPrivateKeyPEM(getAor(name, userKey), readIntoData(mPath + name));
167           }           }
168           else if (name.prefix(domainCert))           else if (name.prefix(domainCert))
169           {           {
170              addDomainPrivateKeyPEM(getAor(name, domainCert), readIntoData(name));              addDomainPrivateKeyPEM(getAor(name, domainCert), readIntoData(mPath + name));
171           }           }
172           else if (name.prefix(domainKey))           else if (name.prefix(domainKey))
173           {           {
174              addDomainPrivateKeyPEM(getAor(name, domainKey), readIntoData(name));              addDomainPrivateKeyPEM(getAor(name, domainKey), readIntoData(mPath + name));
175           }           }
176           else if (name.prefix(rootCert))           else if (name.prefix(rootCert))
177           {           {
178              addRootCertPEM(readIntoData(name));              addRootCertPEM(readIntoData(mPath + name));
179           }           }
180        }        }
181     }     }

Legend:
Removed from v.3603  
changed lines
  Added in v.3604

webmaster AT resiprocate DOT org
ViewVC Help
Powered by ViewVC 1.1.27