changed auto_ptr to shared_ptr

Signed-off-by: Michael Krelin <hacker@klever.net>

4 files changed, 10 insertions, 10 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 078c6dc..26cb614 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,19 +1,20 @@
 nobase_include_HEADERS = \
         opkele/acconfig.h \
         opkele/opkele-config.h \
         opkele/types.h \
         opkele/association.h \
         opkele/exception.h \
         opkele/server.h \
         opkele/consumer.h \
         opkele/extension.h \
         opkele/sreg.h \
         opkele/extension_chain.h \
         opkele/xconsumer.h \
         opkele/xserver.h \
         opkele/discovery.h \
-        opkele/uris.h
+        opkele/uris.h \
+        opkele/tr1-mem.h
 EXTRA_DIST = \
         opkele/data.h \
         opkele/curl.h opkele/expat.h \
         opkele/util.h
diff --git a/include/opkele/consumer.h b/include/opkele/consumer.h
index c463787..3c1d318 100644
--- a/include/opkele/consumer.h
+++ b/include/opkele/consumer.h
@@ -1,174 +1,174 @@
 #ifndef __OPKELE_CONSUMER_H
 #define __OPKELE_CONSUMER_H
 
 #include <opkele/types.h>
 #include <opkele/extension.h>
 
 /**
  * @file
  * @brief OpenID consumer-side functionality
  */
 
 namespace opkele {
 
     /**
      * implementation of basic consumer functionality
      *
      * @note
      * The consumer uses libcurl internally, which means that if you're using
      * libopkele in multithreaded environment you should call curl_global_init
      * yourself before spawning any threads.
      */
     class consumer_t {
         public:
 
             virtual ~consumer_t() { }
 
             /**
              * store association. The function should be overridden in the real
              * implementation to provide persistent associations store.
              * @param server the OpenID server
              * @param handle association handle
              * @param secret the secret associated with the server and handle
              * @param expires_in the number of seconds until the handle is expired
-             * @return the auto_ptr<> for the newly allocated association_t object
+             * @return the assoc_t for the newly allocated association_t object
              */
             virtual assoc_t store_assoc(const string& server,const string& handle,const secret_t& secret,int expires_in) = 0;
             /**
              * retrieve stored association. The function should be overridden
              * in the real implementation to provide persistent assocations
              * store.
              *
              * @note
              * The user is responsible for handling associations expiry and
              * this function should never return an expired or invalidated
              * association.
              *
              * @param server the OpenID server
              * @param handle association handle
              * @return the autho_ptr<> for the newly allocated association_t object
              * @throw failed_lookup if no unexpired association found
              */
             virtual assoc_t retrieve_assoc(const string& server,const string& handle) = 0;
             /**
              * invalidate stored association. The function should be overridden
              * in the real implementation of the consumer.
              * @param server the OpenID server
              * @param handle association handle
              */
             virtual void invalidate_assoc(const string& server,const string& handle) = 0;
             /**
              * retrieve any unexpired association for the server. If the
              * function is not overridden in the real implementation, the new
              * association will be established for each request.
              *
              * @note
              * The user is responsible for handling associations and this
              * function should never return an expired or invalidated
              * association.
              *
              * @note
              * It may be a good idea to pre-expire associations shortly before
              * their time is really up to avoid association expiry in the
              * middle of negotiations.
              *
              * @param server the OpenID server
-             * @return the auto_ptr<> for the newly allocated association_t object
+             * @return the assoc_t for the newly allocated association_t object
              * @throw failed_lookup in case of absence of the handle
              */
             virtual assoc_t find_assoc(const string& server);
 
             /**
              * retrieve the metainformation contained in link tags from the
              * page pointed by url. the function may implement caching of the
              * information.
              * @param url url to harvest for link tags
              * @param server reference to the string object where to put
              * openid.server value
              * @param delegate reference to the string object where to put the
              * openid.delegate value (if any)
              */
             virtual void retrieve_links(const string& url,string& server,string& delegate);
 
             /**
              * perform the associate request to OpenID server.
              * @param server the OpenID server
-             * @return the auto_ptr<> for the newly allocated association_t
+             * @return the assoc_t for the newly allocated association_t
              * object, representing established association
              * @throw exception in case of error
              */
             assoc_t associate(const string& server);
             /**
              * prepare the parameters for the checkid_immediate
              * request.
              * @param identity the identity to verify
              * @param return_to the return_to url to pass with the request
              * @param trust_root the trust root to advertise with the request
              * @param ext pointer to an extension(s) hooks object
              * @return the location string
              * @throw exception in case of error
              */
             virtual string checkid_immediate(const string& identity,const string& return_to,const string& trust_root="",extension_t *ext=0);
             /**
              * prepare the parameters for the checkid_setup
              * request.
              * @param identity the identity to verify
              * @param return_to the return_to url to pass with the request
              * @param trust_root the trust root to advertise with the request
              * @param ext pointer to an extension(s) hooks object
              * @return the location string
              * @throw exception in case of error
              */
             virtual string checkid_setup(const string& identity,const string& return_to,const string& trust_root="",extension_t *ext=0);
             /**
              * the actual implementation behind checkid_immediate() and
              * checkid_setup() functions.
              * @param mode checkid_* mode - either mode_checkid_immediate or mode_checkid_setup
              * @param identity the identity to verify
              * @param return_to the return_to url to pass with the request
              * @param trust_root the trust root to advertise with the request
              * @param ext pointer to an extension(s) hooks object
              * @return the location string
              * @throw exception in case of error
              */
             virtual string checkid_(mode_t mode,const string& identity,const string& return_to,const string& trust_root="",extension_t *ext=0);
             /**
              * verify the id_res response
              * @param pin the response parameters
              * @param identity the identity being checked (if not specified,
              * @param ext pointer to an extension(s) hooks object
              * extracted from the openid.identity parameter
              * @throw id_res_mismatch in case of signature mismatch
              * @throw id_res_setup in case of openid.user_setup_url failure
              * (supposedly checkid_immediate only)
              * @throw id_res_failed in case of failure
              * @throw id_res_expired_on_delivery if the association expired before it could've been verified
              * @throw exception in case of other failures
              */
             virtual void id_res(const params_t& pin,const string& identity="",extension_t *ext=0);
             /**
              * perform a check_authentication request.
              * @param server the OpenID server
              * @param p request parameters
              */
             void check_authentication(const string& server,const params_t& p);
 
             /**
              * normalize URL by adding http:// and trailing slash if needed.
              * @param url
              * @return normalized url
              */
             static string normalize(const string& url);
 
             /**
              * Canonicalize URL, by normalizing its appearance and following redirects.
              * @param url
              * @return canonicalized url
              */
             virtual string canonicalize(const string& url);
 
     };
 
 }
 
 #endif /* __OPKELE_CONSUMER_H */
diff --git a/include/opkele/server.h b/include/opkele/server.h
index dd7fc41..3c25646 100644
--- a/include/opkele/server.h
+++ b/include/opkele/server.h
@@ -1,98 +1,98 @@
 #ifndef __OPKELE_SERVER_H
 #define __OPKELE_SERVER_H
 
 /**
  * @file
  * @brief OpenID server-side functionality
  */
 
 #include <opkele/types.h>
 #include <opkele/extension.h>
 
 namespace opkele {
 
     /**
      * implementation of basic server functionality
      */
     class server_t {
         public:
 
             virtual ~server_t() { }
 
             /**
              * allocate the new association. The function should be overridden
              * in the real implementation to provide persistent assocations
              * store.
              * @param mode the mode of request being processed to base the
              * statelessness of the association upon
-             * @return the auto_ptr<> for the newly allocated association_t object
+             * @return the assoc_t for the newly allocated association_t object
              */
             virtual assoc_t alloc_assoc(mode_t mode) = 0;
             /**
              * retrieve the association. The function should be overridden in
              * the reqal implementation to provide persistent assocations
              * store.
              * @param h association handle
-             * @return the auto_ptr<> for the newly allocated association_t object
+             * @return the assoc_t for the newly allocated association_t object
              * @throw failed_lookup in case of failure
              */
             virtual assoc_t retrieve_assoc(const string& h) = 0;
 
             /**
              * validate the identity.
              * @param assoc association object
              * @param pin incoming request parameters
              * @param identity being verified
              * @param trust_root presented in the request
              * @throw exception if identity can not be confirmed
              */
             virtual void validate(const association_t& assoc,const params_t& pin,const string& identity,const string& trust_root) = 0;
 
 
             /**
              * process the associate request.
              * @param pin the incoming request parameters
              * @param pout the store for the response parameters
              */
             void associate(const params_t& pin,params_t& pout);
             /**
              * process the checkid_immediate request.
              * @param pin the incoming request parameters
              * @param return_to reference to the object to store return_to url to
              * @param pout the response parameters
              * @param ext pointer to the extension hooks object
              * @throw exception in case of errors or negative reply
              */
             virtual void checkid_immediate(const params_t& pin,string& return_to,params_t& pout,extension_t *ext=0);
             /**
              * process the checkid_setup request.
              * @param pin the incoming request parameters
              * @param return_to reference to the object to store return_to url to
              * @param pout the response parameters
              * @param ext pointer to the extension hooks object
              * @throw exception in case of errors or negative reply
              */
             virtual void checkid_setup(const params_t& pin,string& return_to,params_t& pout,extension_t *ext=0);
             /**
              * the actual functionality behind checkid_immediate() and
              * checkid_setup()
              * @param mode the request being processed (either
              * mode_checkid_immediate or mode_checkid_setup)
              * @param pin the incoming request parameters
              * @param return_to reference to the object to store return_to url to
              * @param pout the response parameters
              * @param ext pointer to the extension hooks object
              * @throw exception in case of errors or negative reply
              */
             virtual void checkid_(mode_t mode,const params_t& pin,string& return_to,params_t& pout,extension_t *ext=0);
             /**
              * process the check_authentication request.
              * @param pin incoming request parameters
              * @param pout response parameters
              */
             void check_authentication(const params_t& pin,params_t& pout);
     };
 
 }
 
 #endif /* __OPKELE_SERVER_H */
diff --git a/include/opkele/types.h b/include/opkele/types.h
index ca07df5..d959021 100644
--- a/include/opkele/types.h
+++ b/include/opkele/types.h
@@ -1,209 +1,208 @@
 #ifndef __OPKELE_TYPES_H
 #define __OPKELE_TYPES_H
 
 /**
  * @file
  * @brief various types declarations
  */
 
 #include <ostream>
 #include <vector>
 #include <string>
 #include <map>
-#include <memory>
 #include <set>
+#include <opkele/tr1-mem.h>
 
 namespace opkele {
     using std::vector;
     using std::string;
     using std::map;
     using std::ostream;
-    using std::auto_ptr;
     using std::multimap;
     using std::set;
 
     /**
      * the OpenID operation mode
      */
     typedef enum _mode_t {
         mode_associate,
         mode_checkid_immediate,
         mode_checkid_setup,
         mode_check_association
     } mode_t;
 
     /**
      * the association secret container
      */
     class secret_t : public vector<unsigned char> {
         public:
 
             /**
              * xor the secret and hmac together and encode, using base64
              * @param key_d pointer to the message digest
              * @param rv reference to the return value
              */
             void enxor_to_base64(const unsigned char *key_d,string& rv) const;
             /**
              * decode base64-encoded secret and xor it with the message digest
              * @param key_d pointer to the message digest
              * @param b64 base64-encoded secret value
              */
             void enxor_from_base64(const unsigned char *key_d,const string& b64);
             /**
              * plainly encode to base64 representation
              * @param rv reference to the return value
              */
             void to_base64(string& rv) const;
             /**
              * decode cleartext secret from base64
              * @param b64 base64-encoded representation of the secret value
              */
             void from_base64(const string& b64);
     };
 
     /**
      * Interface to the association.
      */
     class association_t {
         public:
 
             virtual ~association_t() { }
 
             /**
              * retrieve the server with which association was established.
              * @return server name
              */
             virtual string server() const = 0;
             /**
              * retrieve the association handle.
              * @return handle
              */
             virtual string handle() const = 0;
             /**
              * retrieve the association type.
              * @return association type
              */
             virtual string assoc_type() const = 0;
             /**
              * retrieve the association secret.
              * @return association secret
              */
             virtual secret_t secret() const = 0; 
             /**
              * retrieve the number of seconds the association expires in.
              * @return seconds till expiration
              */
             virtual int expires_in() const = 0;
             /**
              * check whether the association is stateless.
              * @return true if stateless
              */
             virtual bool stateless() const = 0;
             /**
              * check whether the association is expired.
              * @return true if expired
              */
             virtual bool is_expired() const = 0;
     };
 
     /**
-     * the auto_ptr<> for association_t object type
+     * the shared_ptr<> for association_t object type
      */
-    typedef auto_ptr<association_t> assoc_t;
+    typedef tr1mem::shared_ptr<association_t> assoc_t;
 
     /**
      * request/response parameters map
      */
     class params_t : public map<string,string> {
         public:
 
             /**
              * check whether the parameter is present.
              * @param n the parameter name
              * @return true if yes
              */
             bool has_param(const string& n) const;
             /**
              * retrieve the parameter (const version)
              * @param n the parameter name
              * @return the parameter value
              * @throw failed_lookup if there is no such parameter
              */
             const string& get_param(const string& n) const;
             /**
              * retrieve the parameter.
              * @param n the parameter name
              * @return the parameter value
              * @throw failed_lookup if there is no such parameter
              */
             string& get_param(const string& n);
 
             /**
              * parse the OpenID key/value data.
              * @param kv the OpenID key/value data
              */
             void parse_keyvalues(const string& kv);
             /**
              * sign the fields.
              * @param secret the secret used for signing
              * @param sig reference to the string, containing base64-encoded
              * result
              * @param slist the comma-separated list of fields to sign
              * @param prefix the string to prepend to parameter names
              */
             void sign(secret_t secret,string& sig,const string& slist,const char *prefix=0) const;
 
             /**
              * append parameters to the URL as a GET-request parameters.
              * @param url the base URL
              * @param prefix the string to prepend to parameter names
              * @return the ready-to-use location
              */
             string append_query(const string& url,const char *prefix = "openid.") const;
 
             /**
              * make up a query string suitable for use in GET and POST
              * requests.
              * @param prefix string to prened to parameter names
              * @return query string
              */
             string query_string(const char *prefix = "openid.") const;
     };
 
     /**
      * dump the key/value pairs for the parameters to the stream.
      * @param o output stream
      * @param p the parameters
      */
     ostream& operator << (ostream& o,const params_t& p);
 
     namespace xrd {
 
         struct priority_compare {
             inline bool operator()(long a,long b) const {
                 return (a<0) ? false : (b<0) ? false : (a<b);
             }
         };
 
         template <typename _DT>
             class priority_map : public multimap<long,_DT,priority_compare> {
                 typedef multimap<long,_DT,priority_compare> map_type;
                 public:
 
                     inline _DT& add(long priority,const _DT& d) {
                         return insert(typename map_type::value_type(priority,d))->second;
                     }
             };
 
         typedef priority_map<string> canonical_ids_t;
         typedef priority_map<string> local_ids_t;
         typedef set<string> types_t;
         typedef priority_map<string> uris_t;
 
         class service_t {
             public:
                 types_t types;
                 uris_t uris;
                 local_ids_t local_ids;