13Dec05

[bacula/bacula] / bacula / src / lib / protos.h

diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h
index 244f1ca49cb603dc2d01b480b7bfd970313035a0..3d5601fe2877e40577ec4af6d7a1f503e169b1e7 100644 (file)
--- a/bacula/src/lib/protos.h
+++ b/bacula/src/lib/protos.h
@@ -114,27 +114,30 @@ void hmac_md5(uint8_t* text, int text_len, uint8_t*  key,
 uint32_t bcrc32(uint8_t *buf, int len);
 
 /* crypto.c */
-int              init_crypto                 (void);
-int              cleanup_crypto              (void);
-DIGEST *         crypto_digest_new           (crypto_digest_t type);
-int              crypto_digest_update        (DIGEST *digest, const void *data, size_t length);
-int              crypto_digest_finalize      (DIGEST *digest, void *dest, size_t *length);
-void             crypto_digest_free          (DIGEST *digest);
-SIGNATURE *      crypto_sign_new             (void);
-crypto_error_t   crypto_sign_get_digest      (SIGNATURE *sig, X509_KEYPAIR *keypair, DIGEST **digest);
-crypto_error_t   crypto_sign_verify          (SIGNATURE *sig, X509_KEYPAIR *keypair, DIGEST *digest);
-int              crypto_sign_add_signer      (SIGNATURE *sig, DIGEST *digest, X509_KEYPAIR *keypair);
-int              crypto_sign_encode          (SIGNATURE *sig, void *dest, size_t *length);
-SIGNATURE *      crypto_sign_decode          (const void *sigData, size_t length);
-void             crypto_sign_free            (SIGNATURE *sig);
-X509_KEYPAIR *   crypto_keypair_new          (void);
-int              crypto_keypair_load_cert    (X509_KEYPAIR *keypair, const char *file);
-int              crypto_keypair_load_key     (X509_KEYPAIR *keypair, const char *file, CRYPTO_PEM_PASSWD_CB *pem_callback, const void *pem_userdata);
-void             crypto_keypair_free         (X509_KEYPAIR *keypair);
-int              crypto_default_pem_callback (char *buf, int size, const void *userdata);
-const char *     crypto_digest_name          (DIGEST *digest);
-crypto_digest_t  crypto_digest_stream_type   (int stream);
-const char *     crypto_strerror             (crypto_error_t error);
+int                init_crypto                 (void);
+int                cleanup_crypto              (void);
+DIGEST *           crypto_digest_new           (crypto_digest_t type);
+bool               crypto_digest_update        (DIGEST *digest, const void *data, size_t length);
+bool               crypto_digest_finalize      (DIGEST *digest, void *dest, size_t *length);
+void               crypto_digest_free          (DIGEST *digest);
+SIGNATURE *        crypto_sign_new             (void);
+crypto_error_t     crypto_sign_get_digest      (SIGNATURE *sig, X509_KEYPAIR *keypair, DIGEST **digest);
+crypto_error_t     crypto_sign_verify          (SIGNATURE *sig, X509_KEYPAIR *keypair, DIGEST *digest);
+int                crypto_sign_add_signer      (SIGNATURE *sig, DIGEST *digest, X509_KEYPAIR *keypair);
+int                crypto_sign_encode          (SIGNATURE *sig, void *dest, size_t *length);
+SIGNATURE *        crypto_sign_decode          (const void *sigData, size_t length);
+void               crypto_sign_free            (SIGNATURE *sig);
+CRYPTO_RECIPIENTS *crypto_recipients_new       (crypto_cipher_t cipher, alist *pubkeys);
+void               crypto_recipients_free      (CRYPTO_RECIPIENTS *cr);
+X509_KEYPAIR *     crypto_keypair_new          (void);
+X509_KEYPAIR *     crypto_keypair_dup          (X509_KEYPAIR *keypair);
+int                crypto_keypair_load_cert    (X509_KEYPAIR *keypair, const char *file);
+int                crypto_keypair_load_key     (X509_KEYPAIR *keypair, const char *file, CRYPTO_PEM_PASSWD_CB *pem_callback, const void *pem_userdata);
+void               crypto_keypair_free         (X509_KEYPAIR *keypair);
+int                crypto_default_pem_callback (char *buf, int size, const void *userdata);
+const char *       crypto_digest_name          (DIGEST *digest);
+crypto_digest_t    crypto_digest_stream_type   (int stream);
+const char *       crypto_strerror             (crypto_error_t error);
 
 /* daemon.c */
 void     daemon_start            ();
@@ -158,7 +161,7 @@ void init_last_jobs_list();
 void term_last_jobs_list();
 void lock_last_jobs_list();
 void unlock_last_jobs_list();
-void read_last_jobs_list(int fd, uint64_t addr);
+bool read_last_jobs_list(int fd, uint64_t addr);
 uint64_t write_last_jobs_list(int fd, uint64_t addr);
 void write_state_file(char *dir, const char *progname, int port);
 void job_end_push(JCR *jcr, void job_end_cb(JCR *jcr,void *), void *ctx);