Merging in latest boto.

boto/ec2/keypair.py

 # Copyright (c) 2006,2007 Mitch Garnaat http://garnaat.org/
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to the fol-
 # lowing conditions:
 #
@@ skipping 58 matching lines @@
                                of the keypair as the base name and .pem
                                for the file extension.  If a file of that
                                name already exists in the directory, an
                                exception will be raised and the old file
                                will not be overwritten.
         
         :rtype: bool
         :return: True if successful.
         """
         if self.material:
+            directory_path = os.path.expanduser(directory_path)
             file_path = os.path.join(directory_path, '%s.pem' % self.name)
             if os.path.exists(file_path):
                 raise BotoClientError('%s already exists, it will not be overwritten' % file_path)
             fp = open(file_path, 'wb')
             fp.write(self.material)
             fp.close()
+            os.chmod(file_path, 0600)
             return True
         else:
             raise BotoClientError('KeyPair contains no material')
 
     def copy_to_region(self, region):
         """
         Create a new key pair of the same new in another region.
         Note that the new key pair will use a different ssh
         cert than the this key pair.  After doing the copy,
         you will need to save the material associated with the
         new key pair (use the save method) to a local file.
 
         :type region: :class:`boto.ec2.regioninfo.RegionInfo`
         :param region: The region to which this security group will be copied.
 
         :rtype: :class:`boto.ec2.keypair.KeyPair`
         :return: The new key pair
         """
         if region.name == self.region:
             raise BotoClientError('Unable to copy to the same Region')
         conn_params = self.connection.get_params()
         rconn = region.connect(**conn_params)
         kp = rconn.create_key_pair(self.name)
         return kp