Merge resolution.

bk: 3c9cdeb4bjIRvvaI9jRi5bCW7E4J-w

diff --cc include/ntp.h
Simple merge

diff --cc include/ntp_control.h
Simple merge

diff --cc include/ntpd.h
index 5e5aa3f970275601bab32cf7f090d3716f9965f3,2a4e1b39f72093c3885a61633a4b747d4426701d..cef7ce6ee55d0240353a27d03a8db69d569d55fb
--- 1/include/ntpd.h
--- 2/include/ntpd.h
+++ b/include/ntpd.h
@@@ -141,17 -141,16 +141,16 @@@ extern  void    resetmanycast   P((void))
  
  /* ntp_crypto.c */
  #ifdef OPENSSL
- extern        void    crypto_recv     P((struct peer *, struct recvbuf *, int));
- extern        int     crypto_xmit     P((struct pkt *, int, u_int32 *, keyid_t, u_int));
+ extern        void    crypto_recv     P((struct peer *, struct recvbuf *));
+ extern        int     crypto_xmit     P((struct pkt *, int, struct exten *, keyid_t));
 -extern        keyid_t session_key     P((struct sockaddr_in *, struct sockaddr_in *, keyid_t, keyid_t, u_long));
 +extern        keyid_t session_key     P((struct sockaddr_storage *, struct sockaddr_storage *, keyid_t, keyid_t, u_long));
  extern        void    make_keylist    P((struct peer *, struct interface *));
  extern        void    key_expire      P((struct peer *));
- extern        void    crypto_sign     P((void));
+ extern        void    crypto_update   P((void));
  extern        void    crypto_config   P((int, char *));
  extern        void    crypto_setup    P((void));
+ extern        struct exten *crypto_args P((u_int, associd_t, u_char *));
  extern        int     crypto_public   P((struct peer *, u_char *, u_int));
- extern        struct cert_info *cert_parse P((u_char *, u_int));
- extern        void    cert_free       P((struct cert_info *));
  extern        void    value_free      P((struct value *));
  #endif /* OPENSSL */
  

diff --cc ntpd/ntp_config.c
index 65470344dcc39e0905ccb26fe51d1b534e14834b,68c7665a0f54891003cf2ba84e9d109d482cc2ba..8e549b4c0eb385d6a37e4d654b4cd68dea007b84
--- 1/ntpd/ntp_config.c
--- 2/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@@ -17,12 -17,7 +17,13 @@@
  #include "ntp_stdlib.h"
  #include "ntp_config.h"
  #include "ntp_cmdargs.h"
+ 
 +#include "ntp_fp.h"
 +
 +#ifdef OPENSSL
 +# include "ntp_crypto.h"
 +#endif /* OPENSSL */
 +
  #include <stdio.h>
  #include <ctype.h>
  #ifdef HAVE_SYS_PARAM_H

diff --cc ntpd/ntp_control.c
Simple merge

diff --cc ntpd/ntp_crypto.c
index 32f1519f5fa9b5853b005763dbd04a98c3280c35,19f965e6e8752c7cc22bd88d8855316aeb21e484..6400900cd2ec50f0622cd771264691a75442a1ed
--- 1/ntpd/ntp_crypto.c
--- 2/ntpd/ntp_crypto.c
+++ b/ntpd/ntp_crypto.c
@@@ -140,11 -145,13 +145,13 @@@ static  void    crypto_tai      P((char *))
   * destination address, key ID and private value. The value of the
   * session key is the MD5 hash of these values, while the next key ID is
   * the first four octets of the hash.
+  *
+  * Returns the next key ID
   */
- keyid_t                               /* returns next key ID */
+ keyid_t
  session_key(
 -      struct sockaddr_in *srcadr, /* source address */
 -      struct sockaddr_in *dstadr, /* destination address */
 +      struct sockaddr_storage *srcadr, /* source address */
 +      struct sockaddr_storage *dstadr, /* destination address */
        keyid_t keyno,          /* key ID */
        keyid_t private,        /* private value */
        u_long  lifetime        /* key lifetime */

diff --cc ntpd/ntp_peer.c
Simple merge

diff --cc ntpd/ntp_proto.c
Simple merge