security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

scd: Replace all assert macros by the log_assert macro.

Browse source 
Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2021-03-31 19:16:05 +02:00
parent 6ca5407151
commit 1c16878efd
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
9 changed files with 35 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

13
scd/app-p15.c
View file

@ -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)