diff options
Diffstat (limited to 'indra/newview/llsecapi.h')
| -rw-r--r-- | indra/newview/llsecapi.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/llsecapi.h b/indra/newview/llsecapi.h index d3fb3c4c07..b11563ef62 100644 --- a/indra/newview/llsecapi.h +++ b/indra/newview/llsecapi.h @@ -47,7 +47,7 @@ #define CERT_ISSUER_NAME "issuer_name" #define CERT_NAME_CN "commonName" -#define CERT_SUBJECT_NAME_STRING "subject_name_string" +#define CERT_SUBJECT_NAME_STRING "subject_name_string" #define CERT_ISSUER_NAME_STRING "issuer_name_string" #define CERT_SERIAL_NUMBER "serial_number" @@ -118,9 +118,10 @@ class LLProtectedDataException public: LLProtectedDataException(const char *msg) { - llerrs << "Certificate Error: " << msg << llendl; - mMsg = std::string(msg); + LL_WARNS("SECAPI") << "Protected Data Error: " << (std::string)msg << LL_ENDL; + mMsg = (std::string)msg; } + std::string getMessage() { return mMsg; } protected: std::string mMsg; }; @@ -421,13 +422,18 @@ class LLSecAPIHandler : public LLRefCount { public: + LLSecAPIHandler() {} virtual ~LLSecAPIHandler() {} + // initialize the SecAPIHandler + virtual void init() {}; + // instantiate a certificate from a pem string virtual LLPointer<LLCertificate> getCertificate(const std::string& pem_cert)=0; + // instiate a certificate from an openssl X509 structure virtual LLPointer<LLCertificate> getCertificate(X509* openssl_cert)=0; |