Namespace-clean some more heimdal symbols
authorBen Kaduk <kaduk@mit.edu>
Thu, 12 Feb 2015 00:02:00 +0000 (19:02 -0500)
committerJeffrey Altman <jaltman@your-file-system.com>
Sat, 28 Feb 2015 22:35:08 +0000 (17:35 -0500)
We get linker conflicts if we try to statically link against the
system libkrb5 when it is heimdal, from both hcrypto and rfc3961.

While here, add an include guard to hcrypto's config.h.

Change-Id: Ib5fcd9291b295415325a4ed230bd35d496961367
Reviewed-on: http://gerrit.openafs.org/11740
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>

src/crypto/hcrypto/config.h
src/crypto/rfc3961/krb5_locl.h

index db3118c..233cd09 100644 (file)
@@ -22,6 +22,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef OAFS_HCRYPTO_CONFIG_H
+#define OAFS_HCRYPTO_CONFIG_H
 #include <afsconfig.h>
 #include <afs/param.h>
 
 # define inline __inline __attribute__((always_inline))
 #endif
 
+#define Camellia_DecryptBlock _oafs_h_Camellia_DecryptBlock
+#define Camellia_Ekeygen _oafs_h_Camellia_Ekeygen
+#define Camellia_EncryptBlock _oafs_h_Camellia_EncryptBlock
+#define ENGINE_get_RAND _oafs_h_ENGINE_get_RAND
+#define ENGINE_up_ref _oafs_h_ENGINE_up_ref
+#define ENGINE_finish _oafs_h_ENGINE_finish
+
+#endif /* OAFS_HCRYPTO_CONFIG_H */
index 9c498b2..7f48d89 100644 (file)
@@ -179,6 +179,11 @@ typedef struct krb5_crypto_iov {
 #define krb5_checksum_disable _oafs_h_krb5_checksum_disable
 #define krb5_checksum_is_collision_proof _oafs_h_krb5_checksum_is_collision_proof
 #define krb5_checksum_is_keyed _oafs_h_krb5_checksum_is_keyed
+#define _krb5_checksum_hmac_md5 _oafs_h__krb5_checksum_hmac_md5
+#define _krb5_checksum_hmac_sha1_des3 _oafs_h__krb5_checksum_hmac_sha1_des3
+#define _krb5_checksum_rsa_md5 _oafs_h__krb5_checksum_rsa_md5
+#define _krb5_checksum_sha1 _oafs_h__krb5_checksum_sha1
+#define _krb5_checksum_sha1_des3 _oafs_h__krb5_checksum_sha1_des3
 #define krb5_cksumtype_to_enctype _oafs_h_krb5_cksumtype_to_enctype
 #define krb5_cksumtype_valid _oafs_h_krb5_cksumtype_valid
 #define krb5_create_checksum_iov _oafs_h_krb5_create_checksum_iov
@@ -196,6 +201,9 @@ typedef struct krb5_crypto_iov {
 #define krb5_encrypt_EncryptedData _oafs_h_krb5_encrypt_EncryptedData
 #define krb5_encrypt_iov_ivec _oafs_h_krb5_encrypt_iov_ivec
 #define krb5_encrypt_ivec _oafs_h_krb5_encrypt_ivec
+#define _krb5_enctype_des3_cbc_none _oafs_h__krb5_enctype_des3_cbc_none
+#define _krb5_enctype_des3_cbc_sha1 _oafs_h__krb5_enctype_des3_cbc_sha1
+#define _krb5_enctype_arcfour_hmac_md5 _oafs_h__krb5_enctype_arcfour_hmac_md5
 #define krb5_enctype_disable _oafs_h_krb5_enctype_disable
 #define krb5_enctype_enable _oafs_h_krb5_enctype_enable
 #define krb5_enctype_keysize _oafs_h_krb5_enctype_keysize