9.2.3rc1

1 files changed, 86 insertions, 44 deletions

diff --git a/lib/bind/include/isc/dst.h b/lib/bind/include/isc/dst.h
index 4509f272..fe922972 100644
--- a/lib/bind/include/isc/dst.h
+++ b/lib/bind/include/isc/dst.h
@@ -12,72 +12,114 @@ typedef struct dst_key {
 } DST_KEY;
 #endif /* HAS_DST_KEY */
 
+/*
+ * do not taint namespace
+ */
+#define	dst_bsafe_init		__dst_bsafe_init
+#define	dst_buffer_to_key	__dst_buffer_to_key
+#define	dst_check_algorithm	__dst_check_algorithm
+#define	dst_compare_keys	__dst_compare_keys
+#define	dst_cylink_init		__dst_cylink_init
+#define	dst_dnskey_to_key	__dst_dnskey_to_key
+#define	dst_eay_dss_init	__dst_eay_dss_init
+#define	dst_free_key		__dst_free_key
+#define	dst_generate_key	__dst_generate_key
+#define	dst_hmac_md5_init	__dst_hmac_md5_init
+#define	dst_init		__dst_init
+#define	dst_key_to_buffer	__dst_key_to_buffer
+#define	dst_key_to_dnskey	__dst_key_to_dnskey
+#define	dst_read_key		__dst_read_key
+#define	dst_rsaref_init		__dst_rsaref_init
+#define	dst_s_build_filename	__dst_s_build_filename
+#define	dst_s_calculate_bits	__dst_s_calculate_bits
+#define	dst_s_conv_bignum_b64_to_u8	__dst_s_conv_bignum_b64_to_u8
+#define	dst_s_conv_bignum_u8_to_b64	__dst_s_conv_bignum_u8_to_b64
+#define	dst_s_dns_key_id	__dst_s_dns_key_id
+#define	dst_s_dump		__dst_s_dump
+#define	dst_s_filename_length	__dst_s_filename_length
+#define	dst_s_fopen		__dst_s_fopen
+#define	dst_s_get_int16		__dst_s_get_int16
+#define	dst_s_get_int32		__dst_s_get_int32
+#define	dst_s_id_calc		__dst_s_id_calc
+#define	dst_s_put_int16		__dst_s_put_int16
+#define	dst_s_put_int32		__dst_s_put_int32
+#define	dst_s_quick_random	__dst_s_quick_random
+#define	dst_s_quick_random_set	__dst_s_quick_random_set
+#define	dst_s_random		__dst_s_random
+#define	dst_s_semi_random	__dst_s_semi_random
+#define	dst_s_verify_str	__dst_s_verify_str
+#define	dst_sig_size		__dst_sig_size
+#define	dst_sign_data		__dst_sign_data
+#define	dst_verify_data		__dst_verify_data
+#define	dst_write_key		__dst_write_key
+
 /* 
  * DST Crypto API defintions 
  */
 void     dst_init(void);
 int      dst_check_algorithm(const int);
 
-int dst_sign_data(const int mode,	 /* specifies INIT/UPDATE/FINAL/ALL */
-		  DST_KEY *in_key,	 /* the key to use */
-		  void **context,	 /* pointer to state structure */
-		  const u_char *data,	 /* data to be signed */
-		  const int len,	 /* length of input data */
-		  u_char *signature,	 /* buffer to write signature to */
-		  const int sig_len);	 /* size of output buffer */
+int dst_sign_data(const int,	 	/* specifies INIT/UPDATE/FINAL/ALL */
+		  DST_KEY *,	 	/* the key to use */
+		  void **,	 	/* pointer to state structure */
+		  const u_char *,	/* data to be signed */
+		  const int,	 	/* length of input data */
+		  u_char *,	 	/* buffer to write signature to */
+		  const int);	 	/* size of output buffer */
+
+int dst_verify_data(const int,	 	/* specifies INIT/UPDATE/FINAL/ALL */
+		    DST_KEY *,	 	/* the key to use */
+		    void **,	 	/* pointer to state structure */
+		    const u_char *,	/* data to be verified */
+		    const int,	 	/* length of input data */
+		    const u_char *,	/* buffer containing signature */
+		    const int);	 	/* length of signature */
 
-int dst_verify_data(const int mode,	 /* specifies INIT/UPDATE/FINAL/ALL */
-		    DST_KEY *in_key,	 /* the key to use */
-		    void **context,	 /* pointer to state structure */
-		    const u_char *data,  /* data to be verified */
-		    const int len,	 /* length of input data */
-		    const u_char *signature,/* buffer containing signature */
-		    const int sig_len);	 /* length of signature */
 
+DST_KEY *dst_read_key(const char *,	/* name of key */
+		      const u_int16_t,	/* key tag identifier */
+		      const int,	/* key algorithm */
+		      const int);	/* Private/PublicKey wanted*/
 
-DST_KEY *dst_read_key(const char *in_name,   /* name of key */
-		      const u_int16_t in_id, /* key tag identifier */
-		      const int in_alg,      /* key algorithm */
-		      const int key_type);   /* Private/PublicKey wanted*/
+int      dst_write_key(const DST_KEY *,	/* key to write out */
+		       const int); 	/* Public/Private */
 
-int      dst_write_key(const DST_KEY *key,  /* key to write out */
-		       const int key_type); /* Public/Private */
+DST_KEY *dst_dnskey_to_key(const char *,	/* KEY record name */
+			   const u_char *,	/* KEY RDATA */
+			   const int);		/* size of input buffer*/
 
-DST_KEY *dst_dnskey_to_key(const char *in_name,	/* KEY record name */
-			   const u_char *key,	/* KEY RDATA */
-			   const int len);	/* size of input buffer*/
 
+int      dst_key_to_dnskey(const DST_KEY *,	/* key to translate */
+			   u_char *,		/* output buffer */
+			   const int);		/* size of out_storage*/
 
-int      dst_key_to_dnskey(const DST_KEY *key,	/* key to translate */
-			   u_char *out_storage,	/* output buffer */
-			   const int out_len);	/* size of out_storage*/
 
+DST_KEY *dst_buffer_to_key(const char *,  	/* name of the key */
+			   const int,	  	/* algorithm */
+			   const int,	  	/* dns flags */
+			   const int,	  	/* dns protocol */
+			   const u_char *, 	/* key in dns wire fmt */
+			   const int);	  	/* size of key */
 
-DST_KEY *dst_buffer_to_key(const char *key_name,  /* name of the key */
-			   const int alg,	  /* algorithm */
-			   const int flags,	  /* dns flags */
-			   const int protocol,	  /* dns protocol */
-			   const u_char *key_buf, /* key in dns wire fmt */
-			   const int key_len);	  /* size of key */
 
+int     dst_key_to_buffer(DST_KEY *, u_char *, int);
 
-int     dst_key_to_buffer(DST_KEY *key, u_char *out_buff, int buf_len);
+DST_KEY *dst_generate_key(const char *,    	/* name of new key */
+			  const int,       	/* key algorithm to generate */
+			  const int,      	/* size of new key */
+			  const int,       	/* alg dependent parameter*/
+			  const int,     	/* key DNS flags */
+			  const int);		/* key DNS protocol */
 
-DST_KEY *dst_generate_key(const char *name,    /* name of new key */
-			  const int alg,       /* key algorithm to generate */
-			  const int bits,      /* size of new key */
-			  const int exp,       /* alg dependent parameter*/
-			  const int flags,     /* key DNS flags */
-			  const int protocol); /* key DNS protocol */
+DST_KEY *dst_free_key(DST_KEY *);
+int      dst_compare_keys(const DST_KEY *, const DST_KEY *);
 
-DST_KEY *dst_free_key(DST_KEY *f_key);
-int      dst_compare_keys(const DST_KEY *key1, const DST_KEY *key2);
+int	dst_sig_size(DST_KEY *);
 
-int	dst_sig_size(DST_KEY *key);
 
 /* support for dns key tags/ids */
-u_int16_t dst_s_dns_key_id(const u_char *dns_key_rdata, const int rdata_len);
-u_int16_t dst_s_id_calc(const u_char *key_data, const int key_len);
+u_int16_t dst_s_dns_key_id(const u_char *, const int);
+u_int16_t dst_s_id_calc(const u_char *, const int);
 
 /* Used by callers as well as by the library.  */
 #define RAW_KEY_SIZE    8192        /* large enough to store any key */