- Get next volume from Scratch pool before creating a volume.

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

diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h
index 6519503fed7de2f6c7c5de94f800515c91fa83c0..244f1ca49cb603dc2d01b480b7bfd970313035a0 100644 (file)
--- a/bacula/src/lib/protos.h
+++ b/bacula/src/lib/protos.h
@@ -23,7 +23,7 @@
 
  */
 
-struct JCR;
+class JCR;
 
 /* attr.c */
 ATTR     *new_attr();
@@ -71,11 +71,9 @@ bool       bnet_send             (BSOCK *bsock);
 bool       bnet_fsend            (BSOCK *bs, const char *fmt, ...);
 bool       bnet_set_buffer_size  (BSOCK *bs, uint32_t size, int rw);
 bool       bnet_sig              (BSOCK *bs, int sig);
-#ifdef HAVE_TLS
 int        bnet_tls_server       (TLS_CONTEXT *ctx, BSOCK *bsock,
                                   alist *verify_list);
 int        bnet_tls_client       (TLS_CONTEXT *ctx, BSOCK *bsock);
-#endif /* HAVE_TLS */
 BSOCK *    bnet_connect          (JCR *jcr, int retry_interval,
                int max_retry_time, const char *name, char *host, char *service,
                int port, int verbose);
@@ -115,6 +113,29 @@ 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);
+
 /* daemon.c */
 void     daemon_start            ();
 
@@ -125,8 +146,8 @@ char *           edit_uint64_with_commas   (uint64_t val, char *buf);
 char *           add_commas              (char *val, char *buf);
 char *           edit_uint64             (uint64_t val, char *buf);
 char *           edit_int64              (int64_t val, char *buf);
-int              duration_to_utime       (char *str, utime_t *value);
-int              size_to_uint64(char *str, int str_len, uint64_t *rtn_value);
+bool             duration_to_utime       (char *str, utime_t *value);
+bool             size_to_uint64(char *str, int str_len, uint64_t *rtn_value);
 char             *edit_utime             (utime_t val, char *buf, int buf_len);
 bool             is_a_number             (const char *num);
 bool             is_an_integer           (const char *n);
@@ -196,6 +217,7 @@ void             init_signals             (void terminate(int sig));
 void             init_stack_dump          (void);
 
 /* scan.c */
+void             strip_leading_space     (char *str);
 void             strip_trailing_junk     (char *str);
 void             strip_trailing_slashes  (char *dir);
 bool             skip_spaces             (char **msg);
@@ -210,19 +232,16 @@ int             bsscanf(const char *buf, const char *fmt, ...);
 
 
 /* tls.c */
-int              init_tls                (void);
-int              cleanup_tls             (void);
-
-#ifdef HAVE_TLS
 TLS_CONTEXT      *new_tls_context        (const char *ca_certfile,
                                           const char *ca_certdir,
                                           const char *certfile,
                                           const char *keyfile,
-                                          TLS_PEM_PASSWD_CB *pem_callback,
+                                          CRYPTO_PEM_PASSWD_CB *pem_callback,
                                           const void *pem_userdata,
                                           const char *dhfile,
                                           bool verify_peer);
 void             free_tls_context        (TLS_CONTEXT *ctx);
+#ifdef HAVE_TLS
 bool             tls_postconnect_verify_host  (TLS_CONNECTION *tls,
                                                const char *host);
 bool             tls_postconnect_verify_cn    (TLS_CONNECTION *tls,