From: Joshua Colp <jcolp@digium.com>
Date: Fri, 3 Apr 2009 15:54:57 +0000 (+0000)
Subject: Merged revisions 186321 via svnmerge from
X-Git-Tag: 1.6.1.0-rc4~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e78d466fdf15218922d0f0c1fa73808881cd04e;p=thirdparty%2Fasterisk.git

Merged revisions 186321 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r186321 | file | 2009-04-03 12:52:50 -0300 (Fri, 03 Apr 2009) | 12 lines

  Merged revisions 186320 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r186320 | file | 2009-04-03 12:48:56 -0300 (Fri, 03 Apr 2009) | 5 lines

    Fix a problem with the crypto variable definitions not actually being defined properly.

    (closes issue #14804)
    Reported by: jvandal
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@186323 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/crypto.h b/include/asterisk/crypto.h
index 427c5ea514..01a61d099c 100644
--- a/include/asterisk/crypto.h
+++ b/include/asterisk/crypto.h
@@ -40,7 +40,7 @@ struct ast_key;
  * \retval the key on success.
  * \retval NULL on failure.
  */
-struct ast_key *(*ast_key_get)(const char *key, int type);
+extern struct ast_key *(*ast_key_get)(const char *key, int type);
 
 /*! 
  * \brief Check the authenticity of a message signature using a given public key
@@ -52,7 +52,7 @@ struct ast_key *(*ast_key_get)(const char *key, int type);
  * \retval -1 otherwise.
  *
  */
-int (*ast_check_signature)(struct ast_key *key, const char *msg, const char *sig);
+extern int (*ast_check_signature)(struct ast_key *key, const char *msg, const char *sig);
 
 /*! 
  * \brief Check the authenticity of a message signature using a given public key
@@ -64,7 +64,7 @@ int (*ast_check_signature)(struct ast_key *key, const char *msg, const char *sig
  * \retval -1 otherwise.
  *
  */
-int (*ast_check_signature_bin)(struct ast_key *key, const char *msg, int msglen, const unsigned char *sig);
+extern int (*ast_check_signature_bin)(struct ast_key *key, const char *msg, int msglen, const unsigned char *sig);
 
 /*!
  * \brief Sign a message signature using a given private key
@@ -77,7 +77,7 @@ int (*ast_check_signature_bin)(struct ast_key *key, const char *msg, int msglen,
  * \retval -1 on failure.
  *
  */
-int (*ast_sign)(struct ast_key *key, char *msg, char *sig);
+extern int (*ast_sign)(struct ast_key *key, char *msg, char *sig);
 
 /*!
  * \brief Sign a message signature using a given private key
@@ -90,7 +90,7 @@ int (*ast_sign)(struct ast_key *key, char *msg, char *sig);
  * \retval -1 on failure.
  *
  */
-int (*ast_sign_bin)(struct ast_key *key, const char *msg, int msglen, unsigned char *sig);
+extern int (*ast_sign_bin)(struct ast_key *key, const char *msg, int msglen, unsigned char *sig);
 
 /*!
  * \brief Encrypt a message using a given private key
@@ -104,7 +104,7 @@ int (*ast_sign_bin)(struct ast_key *key, const char *msg, int msglen, unsigned c
  * \retval -1 on failure.
  *
  */
-int (*ast_encrypt_bin)(unsigned char *dst, const unsigned char *src, int srclen, struct ast_key *key);
+extern int (*ast_encrypt_bin)(unsigned char *dst, const unsigned char *src, int srclen, struct ast_key *key);
 
 /*!
  * \brief Decrypt a message using a given private key
@@ -118,7 +118,7 @@ int (*ast_encrypt_bin)(unsigned char *dst, const unsigned char *src, int srclen,
  * \retval -1 on failure.
  *
  */
-int (*ast_decrypt_bin)(unsigned char *dst, const unsigned char *src, int srclen, struct ast_key *key);
+extern int (*ast_decrypt_bin)(unsigned char *dst, const unsigned char *src, int srclen, struct ast_key *key);
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif