Merge remote-tracking branch 'stefanha/trivial-patches' into staging

4 files changed, 5 insertions, 5 deletions

diff --git a/libcacard/card_7816.c b/libcacard/card_7816.c
index 6fe27d5631..8d06326da6 100644
--- a/libcacard/card_7816.c
+++ b/libcacard/card_7816.c
@@ -125,7 +125,7 @@ vcard_response_new_bytes(VCard *card, unsigned char *buf, int len, int Le,
 }
 
 /*
- * get a new Reponse buffer that only has a status.
+ * get a new Response buffer that only has a status.
  */
 static VCardResponse *
 vcard_response_new_status(vcard_7816_status_t status)
@@ -239,7 +239,7 @@ vcard_apdu_set_class(VCardAPDU *apdu) {
 }
 
 /*
- * set the Le and Lc fiels according to table 5 of the
+ * set the Le and Lc fields according to table 5 of the
  * 7816-4 part 4 spec
  */
 static vcard_7816_status_t
diff --git a/libcacard/card_7816.h b/libcacard/card_7816.h
index 2bb2a0d8aa..4a01993d2d 100644
--- a/libcacard/card_7816.h
+++ b/libcacard/card_7816.h
@@ -23,7 +23,7 @@ VCardResponse *vcard_response_new_bytes(VCard *card, unsigned char *buf,
 /* response from just status bytes */
 VCardResponse *vcard_response_new_status_bytes(unsigned char sw1,
                                                unsigned char sw2);
-/* response from just status: NOTE this cannot fail, it will alwyas return a
+/* response from just status: NOTE this cannot fail, it will always return a
  * valid response, if it can't allocate memory, the response will be
  * VCARD7816_STATUS_EXC_ERROR_MEMORY_FAILURE */
 VCardResponse *vcard_make_response(vcard_7816_status_t status);
diff --git a/libcacard/vcard_emul_nss.c b/libcacard/vcard_emul_nss.c
index 397485c753..bdc3c79462 100644
--- a/libcacard/vcard_emul_nss.c
+++ b/libcacard/vcard_emul_nss.c
@@ -1250,7 +1250,7 @@ vcard_emul_usage(void)
 "  {card_type_to_emulate}  What card interface to present to the guest\n"
 "  {param_for_card}        Card interface specific parameters\n"
 "  {slot_name}             NSS slot that contains the certs\n"
-"  {vreader_name}          Virutal reader name to present to the guest\n"
+"  {vreader_name}          Virtual reader name to present to the guest\n"
 "  {certN}                 Nickname of the certificate n on the virtual card\n"
 "\n"
 "These parameters come as a single string separated by blanks or newlines."
diff --git a/libcacard/vscard_common.h b/libcacard/vscard_common.h
index 609ae98bcf..08f68e4dd2 100644
--- a/libcacard/vscard_common.h
+++ b/libcacard/vscard_common.h
@@ -44,7 +44,7 @@
  * to the existing messages, addition of fields.
  *
  * The major digit is for a breaking change of protocol, presumably
- * something that cannot be accomodated with the existing protocol.
+ * something that cannot be accommodated with the existing protocol.
  */
 
 #define VSCARD_VERSION MAKE_VERSION(0, 0, 2)