File: Fix-typo-occured-occurred.patch

package info (click to toggle)
xml-security-c 1.7.3-4%2Bdeb9u3
  • links: PTS, VCS
  • area: main
  • in suites: stretch
  • size: 8,096 kB
  • sloc: cpp: 47,259; sh: 4,123; makefile: 503
file content (639 lines) | stat: -rw-r--r-- 25,320 bytes parent folder | download | duplicates (3)
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
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@niif.hu>
Date: Sun, 31 Jan 2016 09:04:11 +0100
Subject: Fix typo: occured -> occurred

---
 xsec/dsig/DSIGAlgorithmHandlerDefault.cpp |  6 ++--
 xsec/framework/XSECError.cpp              | 10 +++----
 xsec/samples/simpleHMAC.cpp               |  2 +-
 xsec/samples/simpleValidate.cpp           |  4 +--
 xsec/tools/c14n/c14n.cpp                  |  4 +--
 xsec/tools/checksig/checksig.cpp          | 10 +++----
 xsec/tools/cipher/cipher.cpp              |  8 +++---
 xsec/tools/siginf/siginf.cpp              |  8 +++---
 xsec/tools/templatesign/templatesign.cpp  |  8 +++---
 xsec/tools/txfmout/txfmout.cpp            |  6 ++--
 xsec/tools/xklient/xklient.cpp            | 10 +++----
 xsec/tools/xtest/xtest.cpp                | 46 +++++++++++++++----------------
 xsec/transformers/TXFMParser.cpp          |  2 +-
 xsec/transformers/TXFMXSL.cpp             |  2 +-
 xsec/xenc/impl/XENCCipherImpl.cpp         |  2 +-
 15 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp b/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp
index e60b84c..eb2112e 100644
--- a/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp
+++ b/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp
@@ -420,7 +420,7 @@ unsigned int DSIGAlgorithmHandlerDefault::signToSafeBuffer(
 		if (b64Len <= 0) {
 
 			throw XSECException(XSECException::AlgorithmMapperError,
-				"Unknown error occured during a DSA Signing operation");
+				"Unknown error occurred during a DSA Signing operation");
 
 		}
 		else if (b64Len >= MAXB64BUFSIZE) {
@@ -457,7 +457,7 @@ unsigned int DSIGAlgorithmHandlerDefault::signToSafeBuffer(
 		if (b64Len <= 0) {
 
 			throw XSECException(XSECException::AlgorithmMapperError,
-				"Unknown error occured during a RSA Signing operation");
+				"Unknown error occurred during a RSA Signing operation");
 
 		}
         else if (b64Len >= MAXB64BUFSIZE) {
@@ -495,7 +495,7 @@ unsigned int DSIGAlgorithmHandlerDefault::signToSafeBuffer(
 		if (b64Len <= 0) {
 
 			throw XSECException(XSECException::AlgorithmMapperError,
-				"Unknown error occured during an ECDSA Signing operation");
+				"Unknown error occurred during an ECDSA Signing operation");
 
 		}
         else if (b64Len >= MAXB64BUFSIZE) {
diff --git a/xsec/framework/XSECError.cpp b/xsec/framework/XSECError.cpp
index b672384..4c1470b 100644
--- a/xsec/framework/XSECError.cpp
+++ b/xsec/framework/XSECError.cpp
@@ -45,8 +45,8 @@ const char * XSECExceptionStrings [] = {
 	"Transform input/output mismatch",
 	"Referenced ID is not in DOM Document",
 	"Unsupported Xpointer expression found",
-	"An error occured during an XPath evalaution",
-	"An error occured during an XSLT transformation",
+	"An error occurred during an XPath evalaution",
+	"An error occurred during an XSLT transformation",
 	"The called feature is unsupported (general error)",
 	"Attempted to load an empty signature node",
 	"Attempted to load a non signature DOM Node as a <Signature>",
@@ -55,7 +55,7 @@ const char * XSECExceptionStrings [] = {
 	"Attempted to load an empty X509Data Node",
 	"Attempted to load a non X509Data node as a <X509Data>",
 	"Error occurred in OpenSSL routine",
-	"Error occured when attempting to Verify a Signature",
+	"Error occurred when attempting to Verify a Signature",
 	"Attempted to load an empty SignedInfo node",
 	"Attempted to load a non SignedInfo node as a <SignedInfo>",
 	"Expected URI attribute in <REFERENCE> node",
@@ -72,8 +72,8 @@ const char * XSECExceptionStrings [] = {
 	"CATASTROPHE - An error has been found in internal state",
 	"An error occurred in the Envelope Transform handler",
 	"A function has been called which is not supported in the compiled library",
-	"An error occured in a DSIGTransform holder",
-	"An error occured in a safe buffer",
+	"An error occurred in a DSIGTransform holder",
+	"An error occurred in a safe buffer",
 	"An error occurred processing an HTTP request via internal resolver",
 	"An error occurred decoding a DSIG encoded Distinguished name",
 	"An error occurred during processing of an Encrypted[Data|Key] node",
diff --git a/xsec/samples/simpleHMAC.cpp b/xsec/samples/simpleHMAC.cpp
index 1fab6aa..0ef639f 100644
--- a/xsec/samples/simpleHMAC.cpp
+++ b/xsec/samples/simpleHMAC.cpp
@@ -156,7 +156,7 @@ int main (int argc, char **argv) {
 
 	catch (XSECException &e)
 	{
-		cerr << "An error occured during a signature load\n   Message: "
+		cerr << "An error occurred during a signature load\n   Message: "
 		<< e.getMsg() << endl;
 		exit(1);
 		
diff --git a/xsec/samples/simpleValidate.cpp b/xsec/samples/simpleValidate.cpp
index 31a6821..91875fc 100644
--- a/xsec/samples/simpleValidate.cpp
+++ b/xsec/samples/simpleValidate.cpp
@@ -245,13 +245,13 @@ int main (int argc, char **argv) {
 
 	catch (XSECException &e)
 	{
-		cerr << "An error occured during a signature load\n   Message: "
+		cerr << "An error occurred during a signature load\n   Message: "
 		<< e.getMsg() << endl;
 		exit(1);
 		
 	}
 	catch (XSECCryptoException &e) {
-		cerr << "An error occured in the XML-Security-C Crypto routines\n   Message: "
+		cerr << "An error occurred in the XML-Security-C Crypto routines\n   Message: "
 		<< e.getMsg() << endl;
 		exit(1);
 	}
diff --git a/xsec/tools/c14n/c14n.cpp b/xsec/tools/c14n/c14n.cpp
index 16315cc..28901f3 100644
--- a/xsec/tools/c14n/c14n.cpp
+++ b/xsec/tools/c14n/c14n.cpp
@@ -140,7 +140,7 @@ int main(int argc, char **argv) {
 
     catch (const XMLException& e)
     {
-        cerr << "An error occured during parsing\n   Message: "
+        cerr << "An error occurred during parsing\n   Message: "
              << e.getMessage() << endl;
         errorsOccured = true;
     }
@@ -148,7 +148,7 @@ int main(int argc, char **argv) {
 
     catch (const DOMException& e)
     {
-       cerr << "A DOM error occured during parsing\n   DOMException code: "
+       cerr << "A DOM error occurred during parsing\n   DOMException code: "
              << e.code << endl;
         errorsOccured = true;
     }
diff --git a/xsec/tools/checksig/checksig.cpp b/xsec/tools/checksig/checksig.cpp
index 9a6d73a..bdb1557 100644
--- a/xsec/tools/checksig/checksig.cpp
+++ b/xsec/tools/checksig/checksig.cpp
@@ -356,7 +356,7 @@ int evaluate(int argc, char ** argv) {
 
     catch (const XMLException& e)
     {
-        cerr << "An error occured during parsing\n   Message: "
+        cerr << "An error occurred during parsing\n   Message: "
              << e.getMessage() << endl;
         errorsOccured = true;
     }
@@ -364,7 +364,7 @@ int evaluate(int argc, char ** argv) {
 
     catch (const DOMException& e)
     {
-       cerr << "A DOM error occured during parsing\n   DOMException code: "
+       cerr << "A DOM error occurred during parsing\n   DOMException code: "
              << e.code << endl;
         errorsOccured = true;
     }
@@ -530,14 +530,14 @@ int evaluate(int argc, char ** argv) {
 
 	catch (XSECException &e) {
 		char * msg = XMLString::transcode(e.getMsg());
-		cerr << "An error occured during signature verification\n   Message: "
+		cerr << "An error occurred during signature verification\n   Message: "
 		<< msg << endl;
 		XSEC_RELEASE_XMLCH(msg);
 		errorsOccured = true;
 		return 2;
 	}
 	catch (XSECCryptoException &e) {
-		cerr << "An error occured during signature verification\n   Message: "
+		cerr << "An error occurred during signature verification\n   Message: "
 		<< e.getMsg() << endl;
 		errorsOccured = true;
 
@@ -555,7 +555,7 @@ int evaluate(int argc, char ** argv) {
 #if 0
 	catch (...) {
 
-		cerr << "Unknown Exception type occured.  Cleaning up and exiting\n" << endl;
+		cerr << "Unknown Exception type occurred.  Cleaning up and exiting\n" << endl;
 
 		return 2;
 
diff --git a/xsec/tools/cipher/cipher.cpp b/xsec/tools/cipher/cipher.cpp
index e78102c..26c2556 100644
--- a/xsec/tools/cipher/cipher.cpp
+++ b/xsec/tools/cipher/cipher.cpp
@@ -582,7 +582,7 @@ int evaluate(int argc, char ** argv) {
 
 		catch (const XMLException& e)
 		{
-			cerr << "An error occured during parsing\n   Message: "
+			cerr << "An error occurred during parsing\n   Message: "
 				 << e.getMessage() << endl;
 			errorsOccured = true;
 		}
@@ -590,7 +590,7 @@ int evaluate(int argc, char ** argv) {
 
 		catch (const DOMException& e)
 		{
-		   cerr << "A DOM error occured during parsing\n   DOMException code: "
+		   cerr << "A DOM error occurred during parsing\n   DOMException code: "
 				 << e.code << endl;
 			errorsOccured = true;
 		}
@@ -801,7 +801,7 @@ int evaluate(int argc, char ** argv) {
 
 	catch (XSECException &e) {
 		char * msg = XMLString::transcode(e.getMsg());
-		cerr << "An error occured during encryption/decryption operation\n   Message: "
+		cerr << "An error occurred during encryption/decryption operation\n   Message: "
 		<< msg << endl;
 		XSEC_RELEASE_XMLCH(msg);
 		errorsOccured = true;
@@ -811,7 +811,7 @@ int evaluate(int argc, char ** argv) {
 		return 2;
 	}
 	catch (XSECCryptoException &e) {
-		cerr << "An error occured during encryption/decryption operation\n   Message: "
+		cerr << "An error occurred during encryption/decryption operation\n   Message: "
 		<< e.getMsg() << endl;
 		errorsOccured = true;
 		if (formatTarget != NULL)
diff --git a/xsec/tools/siginf/siginf.cpp b/xsec/tools/siginf/siginf.cpp
index 090ffbc..8fab22b 100644
--- a/xsec/tools/siginf/siginf.cpp
+++ b/xsec/tools/siginf/siginf.cpp
@@ -437,7 +437,7 @@ int evaluate(int argc, char ** argv) {
     catch (const XMLException& e)
     {
 		char * msg = XMLString::transcode(e.getMessage());
-        cerr << "An error occured during parsing\n   Message: "
+        cerr << "An error occurred during parsing\n   Message: "
              << msg << endl;
 		XSEC_RELEASE_XMLCH(msg);
         errorsOccured = true;
@@ -446,7 +446,7 @@ int evaluate(int argc, char ** argv) {
 
     catch (const DOMException& e)
     {
-       cerr << "A DOM error occured during parsing\n   DOMException code: "
+       cerr << "A DOM error occurred during parsing\n   DOMException code: "
              << e.code << endl;
         errorsOccured = true;
     }
@@ -499,7 +499,7 @@ int evaluate(int argc, char ** argv) {
 
 	catch (XSECException &e) {
 		char * msg = XMLString::transcode(e.getMsg());
-		cerr << "An error occured during signature loading\n   Message: "
+		cerr << "An error occurred during signature loading\n   Message: "
 		<< msg << endl;
 		XSEC_RELEASE_XMLCH(msg);
 		errorsOccured = true;
@@ -507,7 +507,7 @@ int evaluate(int argc, char ** argv) {
 	}
 	catch (...) {
 
-		cerr << "Unknown Exception type occured.  Cleaning up and exiting\n" << endl;
+		cerr << "Unknown Exception type occurred.  Cleaning up and exiting\n" << endl;
 		return 2;
 
 	}
diff --git a/xsec/tools/templatesign/templatesign.cpp b/xsec/tools/templatesign/templatesign.cpp
index 6574c52..bbe5dea 100644
--- a/xsec/tools/templatesign/templatesign.cpp
+++ b/xsec/tools/templatesign/templatesign.cpp
@@ -1112,7 +1112,7 @@ int main(int argc, char **argv) {
 
     catch (const XMLException& e)
     {
-        cerr << "An error occured during parsing\n   Message: "
+        cerr << "An error occurred during parsing\n   Message: "
              << e.getMessage() << endl;
         errorsOccured = true;
     }
@@ -1120,7 +1120,7 @@ int main(int argc, char **argv) {
 
     catch (const DOMException& e)
     {
-       cerr << "A DOM error occured during parsing\n   DOMException code: "
+       cerr << "A DOM error occurred during parsing\n   DOMException code: "
              << e.code << endl;
         errorsOccured = true;
     }
@@ -1323,7 +1323,7 @@ int main(int argc, char **argv) {
 
 	catch (XSECException &e) {
 		char * m = XMLString::transcode(e.getMsg());
-		cerr << "An error occured during signing operation\n   Message: "
+		cerr << "An error occurred during signing operation\n   Message: "
 		<< m << endl;
 		XSEC_RELEASE_XMLCH(m);
 		errorsOccured = true;
@@ -1331,7 +1331,7 @@ int main(int argc, char **argv) {
 	}
 
 	catch (XSECCryptoException &e) {
-		cerr << "A cryptographic error occured during signature operation\n   Message: "
+		cerr << "A cryptographic error occurred during signature operation\n   Message: "
 		<< e.getMsg() << endl;
 		errorsOccured = true;
 		exit(1);
diff --git a/xsec/tools/txfmout/txfmout.cpp b/xsec/tools/txfmout/txfmout.cpp
index 719efb4..a06e2ad 100644
--- a/xsec/tools/txfmout/txfmout.cpp
+++ b/xsec/tools/txfmout/txfmout.cpp
@@ -446,7 +446,7 @@ int main(int argc, char **argv) {
 
     catch (const XMLException& e)
     {
-        cerr << "An error occured during parsing\n   Message: "
+        cerr << "An error occurred during parsing\n   Message: "
              << e.getMessage() << endl;
         errorsOccured = true;
     }
@@ -454,7 +454,7 @@ int main(int argc, char **argv) {
 
     catch (const DOMException& e)
     {
-       cerr << "A DOM error occured during parsing\n   DOMException code: "
+       cerr << "A DOM error occurred during parsing\n   DOMException code: "
              << e.code << endl;
         errorsOccured = true;
     }
@@ -572,7 +572,7 @@ int main(int argc, char **argv) {
 
 	catch (XSECException &e) {
 		char * m = XMLString::transcode(e.getMsg());
-		cerr << "An error occured during signature processing\n   Message: "
+		cerr << "An error occurred during signature processing\n   Message: "
 		<< m << endl;
 		XSEC_RELEASE_XMLCH(m);
 		errorsOccured = true;
diff --git a/xsec/tools/xklient/xklient.cpp b/xsec/tools/xklient/xklient.cpp
index 6e6b93c..158a14c 100644
--- a/xsec/tools/xklient/xklient.cpp
+++ b/xsec/tools/xklient/xklient.cpp
@@ -3831,13 +3831,13 @@ int doParsedMsgDump(DOMDocument * doc) {
 
 	catch (XSECException &e) {
 		char * msg = XMLString::transcode(e.getMsg());
-		cerr << "An error occured during message loading\n   Message: "
+		cerr << "An error occurred during message loading\n   Message: "
 		<< msg << endl;
 		XSEC_RELEASE_XMLCH(msg);
 		return 2;
 	}
 	catch (XSECCryptoException &e) {
-		cerr << "An error occured during encryption/signature processing\n   Message: "
+		cerr << "An error occurred during encryption/signature processing\n   Message: "
 		<< e.getMsg() << endl;
 
 #if defined (XSEC_HAVE_OPENSSL)
@@ -3853,7 +3853,7 @@ int doParsedMsgDump(DOMDocument * doc) {
 	}
 	catch (...) {
 
-		cerr << "Unknown Exception type occured.  Cleaning up and exitting\n" << endl;
+		cerr << "Unknown Exception type occurred.  Cleaning up and exitting\n" << endl;
 		return 2;
 
 	}
@@ -4448,7 +4448,7 @@ int doMsgDump(int argc, char ** argv, int paramCount) {
     catch (const XMLException& e)
     {
 		char * msg = XMLString::transcode(e.getMessage());
-        cerr << "An error occured during parsing\n   Message: "
+        cerr << "An error occurred during parsing\n   Message: "
              << msg << endl;
 		XSEC_RELEASE_XMLCH(msg);
         errorsOccured = true;
@@ -4457,7 +4457,7 @@ int doMsgDump(int argc, char ** argv, int paramCount) {
 
     catch (const DOMException& e)
     {
-       cerr << "A DOM error occured during parsing\n   DOMException code: "
+       cerr << "A DOM error occurred during parsing\n   DOMException code: "
              << e.code << endl;
         errorsOccured = true;
     }
diff --git a/xsec/tools/xtest/xtest.cpp b/xsec/tools/xtest/xtest.cpp
index d8f4c6c..c4ace7d 100644
--- a/xsec/tools/xtest/xtest.cpp
+++ b/xsec/tools/xtest/xtest.cpp
@@ -559,7 +559,7 @@ bool reValidateSig(DOMImplementation *impl, DOMDocument * inDoc, XSECCryptoKey *
 
 	catch (XSECException &e)
 	{
-		cerr << "An error occured during signature processing\n   Message: ";
+		cerr << "An error occurred during signature processing\n   Message: ";
 		char * ce = XMLString::transcode(e.getMsg());
 		cerr << ce << endl;
 		delete ce;
@@ -568,7 +568,7 @@ bool reValidateSig(DOMImplementation *impl, DOMDocument * inDoc, XSECCryptoKey *
 	}	
 	catch (XSECCryptoException &e)
 	{
-		cerr << "A cryptographic error occured during signature processing\n   Message: "
+		cerr << "A cryptographic error occurred during signature processing\n   Message: "
 		<< e.getMsg() << endl;
 		exit(1);
 	}
@@ -671,7 +671,7 @@ void unitTestEnvelopingSignature(DOMImplementation * impl) {
 
 	catch (XSECException &e)
 	{
-		cerr << "An error occured during signature processing\n   Message: ";
+		cerr << "An error occurred during signature processing\n   Message: ";
 		char * ce = XMLString::transcode(e.getMsg());
 		cerr << ce << endl;
 		delete ce;
@@ -680,7 +680,7 @@ void unitTestEnvelopingSignature(DOMImplementation * impl) {
 	}	
 	catch (XSECCryptoException &e)
 	{
-		cerr << "A cryptographic error occured during signature processing\n   Message: "
+		cerr << "A cryptographic error occurred during signature processing\n   Message: "
 		<< e.getMsg() << endl;
 		exit(1);
 	}
@@ -784,7 +784,7 @@ void unitTestBase64NodeSignature(DOMImplementation * impl) {
 
 	catch (XSECException &e)
 	{
-		cerr << "An error occured during signature processing\n   Message: ";
+		cerr << "An error occurred during signature processing\n   Message: ";
 		char * ce = XMLString::transcode(e.getMsg());
 		cerr << ce << endl;
 		delete ce;
@@ -793,7 +793,7 @@ void unitTestBase64NodeSignature(DOMImplementation * impl) {
 	}	
 	catch (XSECCryptoException &e)
 	{
-		cerr << "A cryptographic error occured during signature processing\n   Message: "
+		cerr << "A cryptographic error occurred during signature processing\n   Message: "
 		<< e.getMsg() << endl;
 		exit(1);
 	}
@@ -954,7 +954,7 @@ void unitTestLongSHA(DOMImplementation * impl) {
 
 	catch (XSECException &e)
 	{
-		cerr << "An error occured during signature processing\n   Message: ";
+		cerr << "An error occurred during signature processing\n   Message: ";
 		char * ce = XMLString::transcode(e.getMsg());
 		cerr << ce << endl;
 		delete ce;
@@ -963,7 +963,7 @@ void unitTestLongSHA(DOMImplementation * impl) {
 	}	
 	catch (XSECCryptoException &e)
 	{
-		cerr << "A cryptographic error occured during signature processing\n   Message: "
+		cerr << "A cryptographic error occurred during signature processing\n   Message: "
 		<< e.getMsg() << endl;
 		exit(1);
 	}
@@ -1065,7 +1065,7 @@ void unitTestRSASig(DOMImplementation * impl, XSECCryptoKeyRSA * k, const XMLCh
 
 	catch (XSECException &e)
 	{
-		cerr << "An error occured during signature processing\n   Message: ";
+		cerr << "An error occurred during signature processing\n   Message: ";
 		char * ce = XMLString::transcode(e.getMsg());
 		cerr << ce << endl;
 		delete ce;
@@ -1074,7 +1074,7 @@ void unitTestRSASig(DOMImplementation * impl, XSECCryptoKeyRSA * k, const XMLCh
 	}	
 	catch (XSECCryptoException &e)
 	{
-		cerr << "A cryptographic error occured during signature processing\n   Message: "
+		cerr << "A cryptographic error occurred during signature processing\n   Message: "
 		<< e.getMsg() << endl;
 		exit(1);
 	}
@@ -1571,7 +1571,7 @@ count(ancestor-or-self::dsig:Signature)");
 
 	catch (XSECException &e)
 	{
-		cerr << "An error occured during signature processing\n   Message: ";
+		cerr << "An error occurred during signature processing\n   Message: ";
 		char * ce = XMLString::transcode(e.getMsg());
 		cerr << ce << endl;
 		delete ce;
@@ -1580,7 +1580,7 @@ count(ancestor-or-self::dsig:Signature)");
 	}	
 	catch (XSECCryptoException &e)
 	{
-		cerr << "A cryptographic error occured during signature processing\n   Message: "
+		cerr << "A cryptographic error occurred during signature processing\n   Message: "
 		<< e.getMsg() << endl;
 		exit(1);
 	}
@@ -1677,7 +1677,7 @@ void unitTestCipherReference(DOMImplementation * impl) {
 	catch (XSECException &e)
 	{
 		cerr << "failed\n";
-		cerr << "An error occured during signature processing\n   Message: ";
+		cerr << "An error occurred during signature processing\n   Message: ";
 		char * ce = XMLString::transcode(e.getMsg());
 		cerr << ce << endl;
 		delete ce;
@@ -1687,7 +1687,7 @@ void unitTestCipherReference(DOMImplementation * impl) {
 	catch (XSECCryptoException &e)
 	{
 		cerr << "failed\n";
-		cerr << "A cryptographic error occured during signature processing\n   Message: "
+		cerr << "A cryptographic error occurred during signature processing\n   Message: "
 		<< e.getMsg() << endl;
 		exit(1);
 	}
@@ -1787,7 +1787,7 @@ void unitTestElementContentEncrypt(DOMImplementation *impl, XSECCryptoKey * key,
 	}
 	catch (XSECException &e)
 	{
-		cerr << "An error occured during encryption processing\n   Message: ";
+		cerr << "An error occurred during encryption processing\n   Message: ";
 		char * ce = XMLString::transcode(e.getMsg());
 		cerr << ce << endl;
 		delete ce;
@@ -1796,7 +1796,7 @@ void unitTestElementContentEncrypt(DOMImplementation *impl, XSECCryptoKey * key,
 	}	
 	catch (XSECCryptoException &e)
 	{
-		cerr << "A cryptographic error occured during encryption processing\n   Message: "
+		cerr << "A cryptographic error occurred during encryption processing\n   Message: "
 		<< e.getMsg() << endl;
 		exit(1);
 	}
@@ -1896,7 +1896,7 @@ void unitTestSmallElement(DOMImplementation *impl) {
 	}
 	catch (XSECException &e)
 	{
-		cerr << "An error occured during encryption processing\n   Message: ";
+		cerr << "An error occurred during encryption processing\n   Message: ";
 		char * ce = XMLString::transcode(e.getMsg());
 		cerr << ce << endl;
 		delete ce;
@@ -1905,7 +1905,7 @@ void unitTestSmallElement(DOMImplementation *impl) {
 	}	
 	catch (XSECCryptoException &e)
 	{
-		cerr << "A cryptographic error occured during encryption processing\n   Message: "
+		cerr << "A cryptographic error occurred during encryption processing\n   Message: "
 		<< e.getMsg() << endl;
 		exit(1);
 	}
@@ -1991,7 +1991,7 @@ void unitTestKeyEncrypt(DOMImplementation *impl, XSECCryptoKey * k, encryptionMe
 	catch (XSECException &e)
 	{
 		cerr << "failed\n";
-		cerr << "An error occured during signature processing\n   Message: ";
+		cerr << "An error occurred during signature processing\n   Message: ";
 		char * ce = XMLString::transcode(e.getMsg());
 		cerr << ce << endl;
 		delete ce;
@@ -2001,7 +2001,7 @@ void unitTestKeyEncrypt(DOMImplementation *impl, XSECCryptoKey * k, encryptionMe
 	catch (XSECCryptoException &e)
 	{
 		cerr << "failed\n";
-		cerr << "A cryptographic error occured during signature processing\n   Message: "
+		cerr << "A cryptographic error occurred during signature processing\n   Message: "
 		<< e.getMsg() << endl;
 		exit(1);
 	}
@@ -2195,7 +2195,7 @@ void unitTestEncrypt(DOMImplementation *impl) {
 	catch (XSECCryptoException &e)
 	{
 		cerr << "failed\n";
-		cerr << "A cryptographic error occured during encryption unit tests\n   Message: "
+		cerr << "A cryptographic error occurred during encryption unit tests\n   Message: "
 		<< e.getMsg() << endl;
 		exit(1);
 	}
@@ -2445,7 +2445,7 @@ void testEncrypt(DOMImplementation *impl) {
 	}
 	catch (XSECException &e)
 	{
-		cerr << "An error occured during signature processing\n   Message: ";
+		cerr << "An error occurred during signature processing\n   Message: ";
 		char * ce = XMLString::transcode(e.getMsg());
 		cerr << ce << endl;
 		delete ce;
@@ -2454,7 +2454,7 @@ void testEncrypt(DOMImplementation *impl) {
 	}	
 	catch (XSECCryptoException &e)
 	{
-		cerr << "A cryptographic error occured during signature processing\n   Message: "
+		cerr << "A cryptographic error occurred during signature processing\n   Message: "
 		<< e.getMsg() << endl;
 		exit(1);
 	}
diff --git a/xsec/transformers/TXFMParser.cpp b/xsec/transformers/TXFMParser.cpp
index abccda7..a38b166 100644
--- a/xsec/transformers/TXFMParser.cpp
+++ b/xsec/transformers/TXFMParser.cpp
@@ -123,7 +123,7 @@ void TXFMParser::setInput(TXFMBase *newInput) {
 	parser.parse(is);
     xsecsize_t errorCount = parser.getErrorCount();
     if (errorCount > 0)
-		throw XSECException(XSECException::XSLError, "Errors occured parsing BYTE STREAM");
+		throw XSECException(XSECException::XSLError, "Errors occurred parsing BYTE STREAM");
 
     mp_parsedDoc = parser.adoptDocument();
 
diff --git a/xsec/transformers/TXFMXSL.cpp b/xsec/transformers/TXFMXSL.cpp
index e22aeec..ebe9693 100644
--- a/xsec/transformers/TXFMXSL.cpp
+++ b/xsec/transformers/TXFMXSL.cpp
@@ -203,7 +203,7 @@ void TXFMXSL::evaluateStyleSheet(const safeBuffer &sbStyleSheet) {
 	parser->parse(*memIS);
     errorCount = parser->getErrorCount();
     if (errorCount > 0)
-		throw XSECException(XSECException::XSLError, "Errors occured when XSL result was parsed back to DOM_Nodes");
+		throw XSECException(XSECException::XSLError, "Errors occurred when XSL result was parsed back to DOM_Nodes");
 
     docOut = parser->adoptDocument();
 
diff --git a/xsec/xenc/impl/XENCCipherImpl.cpp b/xsec/xenc/impl/XENCCipherImpl.cpp
index 136c6aa..7f586a9 100644
--- a/xsec/xenc/impl/XENCCipherImpl.cpp
+++ b/xsec/xenc/impl/XENCCipherImpl.cpp
@@ -313,7 +313,7 @@ DOMDocumentFragment * XENCCipherImpl::deSerialise(safeBuffer &content, DOMNode *
     parser.parse(memIS);
     xsecsize_t errorCount = parser.getErrorCount();
     if (errorCount > 0)
-        throw XSECException(XSECException::CipherError, "Errors occured during de-serialisation of decrypted element content");
+        throw XSECException(XSECException::CipherError, "Errors occurred during de-serialisation of decrypted element content");
 
     DOMDocument * doc = parser.getDocument();