1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
From 283578519ec83a8792b026c10322789784d629de Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 27 Dec 2019 11:33:57 -0800
Subject: [PATCH] Fix misleading code indentation
Fixes
error: misleading indentation; statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation]
if(cipher)
^
../../../git/src/libopensc/card-entersafe.c:369:2: note: previous statement is here
if(sbuf)
^
Upstream-Status: Submitted [https://github.com/OpenSC/OpenSC/pull/1894]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/libopensc/card-entersafe.c | 12 ++++++------
src/tools/pkcs15-init.c | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/libopensc/card-entersafe.c b/src/libopensc/card-entersafe.c
index 3e42c11f..abb9fd81 100644
--- a/src/libopensc/card-entersafe.c
+++ b/src/libopensc/card-entersafe.c
@@ -352,10 +352,10 @@ static int entersafe_transmit_apdu(sc_card_t *card, sc_apdu_t *apdu,
size_t cipher_data_size,mac_data_size;
int blocks;
int r=SC_SUCCESS;
- u8 *sbuf=NULL;
- size_t ssize=0;
+ u8 *sbuf=NULL;
+ size_t ssize=0;
- SC_FUNC_CALLED(card->ctx, SC_LOG_DEBUG_VERBOSE);
+ SC_FUNC_CALLED(card->ctx, SC_LOG_DEBUG_VERBOSE);
assert(card);
assert(apdu);
@@ -363,10 +363,10 @@ static int entersafe_transmit_apdu(sc_card_t *card, sc_apdu_t *apdu,
if((cipher||mac) && (!key||(keylen!=8 && keylen!=16)))
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_VERBOSE, SC_ERROR_INVALID_ARGUMENTS);
- r = sc_apdu_get_octets(card->ctx, apdu, &sbuf, &ssize, SC_PROTO_RAW);
- if (r == SC_SUCCESS)
+ r = sc_apdu_get_octets(card->ctx, apdu, &sbuf, &ssize, SC_PROTO_RAW);
+ if (r == SC_SUCCESS)
sc_apdu_log(card->ctx, SC_LOG_DEBUG_VERBOSE, sbuf, ssize, 1);
- if(sbuf)
+ if(sbuf)
free(sbuf);
if(cipher)
diff --git a/src/tools/pkcs15-init.c b/src/tools/pkcs15-init.c
index 1ce79f45..9a73121c 100644
--- a/src/tools/pkcs15-init.c
+++ b/src/tools/pkcs15-init.c
@@ -2311,8 +2311,8 @@ do_read_private_key(const char *filename, const char *format,
r = util_getpass(&passphrase, &len, stdin);
if (r < 0 || !passphrase)
return SC_ERROR_INTERNAL;
- r = do_read_pkcs12_private_key(filename,
- passphrase, pk, certs, max_certs);
+ r = do_read_pkcs12_private_key(filename,
+ passphrase, pk, certs, max_certs);
}
} else {
util_error("Error when reading private key. "
--
2.24.1
|
