summaryrefslogtreecommitdiffstats
path: root/scd/app-p15.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2021-03-31 19:16:05 +0200
committerWerner Koch <wk@gnupg.org>2021-03-31 19:16:05 +0200
commit1c16878efd0bcf036f56abef93d64ac41ce9e95b (patch)
tree28f4edf61e6f72c891a4c45349f5b22410829382 /scd/app-p15.c
parentbuild: Require automake 1.16.3 (diff)
downloadgnupg2-1c16878efd0bcf036f56abef93d64ac41ce9e95b.tar.xz
gnupg2-1c16878efd0bcf036f56abef93d64ac41ce9e95b.zip
scd: Replace all assert macros by the log_assert macro.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'scd/app-p15.c')
-rw-r--r--scd/app-p15.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/scd/app-p15.c b/scd/app-p15.c
index 47a79d7ee..00ee12de6 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -34,7 +34,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <assert.h>
#include <time.h>
#include "scdaemon.h"
@@ -3426,9 +3425,9 @@ read_p15_info (app_t app)
return err;
/* Read certificate information. */
- assert (!app->app_local->certificate_info);
- assert (!app->app_local->trusted_certificate_info);
- assert (!app->app_local->useful_certificate_info);
+ log_assert (!app->app_local->certificate_info);
+ log_assert (!app->app_local->trusted_certificate_info);
+ log_assert (!app->app_local->useful_certificate_info);
err = read_ef_cdf (app, app->app_local->odf.certificates, 'c',
&app->app_local->certificate_info);
if (!err || gpg_err_code (err) == GPG_ERR_NO_DATA)
@@ -3443,7 +3442,7 @@ read_p15_info (app_t app)
return err;
/* Read information about public keys. */
- assert (!app->app_local->public_key_info);
+ log_assert (!app->app_local->public_key_info);
err = read_ef_pukdf (app, app->app_local->odf.public_keys,
&app->app_local->public_key_info);
if (!err || gpg_err_code (err) == GPG_ERR_NO_DATA)
@@ -3455,7 +3454,7 @@ read_p15_info (app_t app)
return err;
/* Read information about private keys. */
- assert (!app->app_local->private_key_info);
+ log_assert (!app->app_local->private_key_info);
err = read_ef_prkdf (app, app->app_local->odf.private_keys,
&app->app_local->private_key_info);
if (gpg_err_code (err) == GPG_ERR_NO_DATA)
@@ -3464,7 +3463,7 @@ read_p15_info (app_t app)
return err;
/* Read information about authentication objects. */
- assert (!app->app_local->auth_object_info);
+ log_assert (!app->app_local->auth_object_info);
err = read_ef_aodf (app, app->app_local->odf.auth_objects,
&app->app_local->auth_object_info);
if (gpg_err_code (err) == GPG_ERR_NO_DATA)