summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'refs/remotes/origin/master'David Hook2022-11-0811-337/+332
|\
| * Overhaul UTCTime classesPeter Dettman2022-11-0711-337/+332
| |
* | fixed falcon signature format, added raw encoding for Falcon public keyDavid Hook2022-11-084-36/+112
|/
* fixed use of propertyDavid Hook2022-11-075-9/+16
|
* fixed use of propertyDavid Hook2022-11-075-16/+22
|
* Merge branch 'master' of gitlab.cryptoworkshop.com:root/bc-csharpDavid Hook2022-11-07223-2404/+20148
|\
| * GOST 2012 private key readingPeter Dettman2022-11-062-13/+101
| | | | | | | | - see https://github.com/bcgit/bc-csharp/issues/365
| * CryptoApiRandomGenerator implements IDisposablePeter Dettman2022-11-061-2/+12
| |
| * Add some dotnet ECDsa interop methodsPeter Dettman2022-11-062-33/+117
| |
| * CMS support for OtherRevocationInfoFormatPeter Dettman2022-11-069-42/+313
| | | | | | | | - see https://github.com/bcgit/bc-csharp/pull/328
| * Asn1 GetInstance refactoringPeter Dettman2022-11-0624-248/+289
| |
| * Mark class staticPeter Dettman2022-11-061-1/+1
| |
| * Rename HKDF filesPeter Dettman2022-11-063-0/+0
| | | | | | | | - see https://github.com/bcgit/bc-csharp/pull/325
| * Update KeyPurposeID from bc-javaPeter Dettman2022-11-063-18/+76
| | | | | | | | | | - obsolete old-style names - add Kerberos entries (see https://github.com/bcgit/bc-csharp/pull/256)
| * More GOST 2012 registry entriesPeter Dettman2022-11-063-4/+30
| | | | | | | | - see https://github.com/bcgit/bc-csharp/pull/233
| * GOST registry entriesPeter Dettman2022-11-053-10/+17
| | | | | | | | - see https://github.com/bcgit/bc-csharp/pull/284
| * Add Span-based variants in DTLSPeter Dettman2022-11-058-10/+444
| |
| * Add TlsPeer.IgnoreCorruptDtlsRecordsPeter Dettman2022-11-059-5/+41
| | | | | | | | | | | | - property controls behaviour when bad_record_mac thrown for DTLS record. - defaults to 'false' (don't ignore i.e. fail the connection) - see https://github.com/bcgit/bc-csharp/pull/279
| * Preprocessor symbol cleanupPeter Dettman2022-11-054-15/+0
| |
| * Merge branch 'Optimize-structures' of github.com:harrison314/bc-csharpPeter Dettman2022-11-052-10/+6
| |\
| | * Optimize constructors for Org.BouncyCastle.Asn1.X509.Time and ↵Jozef Gajdos2022-08-022-10/+6
| | | | | | | | | | | | Org.BouncyCastle.Asn1.Cms.Time.
| * | Cleanup RevokedStatusPeter Dettman2022-11-051-27/+18
| | |
| * | Merge branch 'master' of github.com:harrison314/bc-csharpPeter Dettman2022-11-051-0/+6
| |\ \
| | * | Make reason in RevokedStatus (in Org.BouncyCastle.Ocsp) optional.Jozef Gajdos2022-08-011-0/+6
| | |/
| * | Resolve some FIXMEsPeter Dettman2022-11-053-48/+29
| | |
| * | Port OpenPGP support for XDH, EdDSA from bc-javaPeter Dettman2022-11-0532-573/+16362
| | | | | | | | | | | | - see https://github.com/bcgit/bc-csharp/issues/345
| * | Update package iconPeter Dettman2022-11-042-1/+1
| | |
| * | Make LongArray a struct, refactorPeter Dettman2022-11-043-111/+66
| | |
| * | Clenaup warningsPeter Dettman2022-11-0354-1014/+953
| | |
| * | EmbedAllSources, remove SourceLinkPeter Dettman2022-11-031-8/+8
| | |
| * | net462 => net461Peter Dettman2022-11-033-6/+5
| | |
| * | Authors/License cleanupPeter Dettman2022-11-033-15/+10
| | |
| * | Update tags and READMEPeter Dettman2022-11-032-5/+5
| | |
| * | Add authorPeter Dettman2022-11-021-1/+1
| | |
| * | Enable package validationPeter Dettman2022-11-021-0/+19
| | | | | | | | | | | | - limited by Span-based variant methods
| * | A few package validation fixesPeter Dettman2022-11-025-41/+39
| | |
| * | AssemblyTitle and PackageIconPeter Dettman2022-11-023-13/+22
| | |
| * | AssemblyVersion uses only major versionPeter Dettman2022-11-021-0/+13
| | | | | | | | | | | | - assembly binding compatibility on .NET Framework
| * | Fix prerelease precedencePeter Dettman2022-11-021-1/+1
| | |
| * | A few span opts.Peter Dettman2022-11-022-1/+21
| | |
| * | Refactoring in Pqc.Crypto.LmsPeter Dettman2022-11-024-37/+28
| | |
| * | NUnit3TestAdapter 4.3.0Peter Dettman2022-11-021-1/+1
| | |
| * | Include TargetFramework in TitlePeter Dettman2022-11-021-1/+1
| | |
| * | Fix test projectPeter Dettman2022-11-022-4/+3
| | |
| * | More release prep.Peter Dettman2022-11-026-4/+17
| | |
| * | Re-add TRACEPeter Dettman2022-11-011-1/+1
| | |
| * | SCrypt perf. opts.Peter Dettman2022-11-012-40/+168
| | |
| * | Span-based TlsStream methodsPeter Dettman2022-11-0110-0/+419
| | |
| * | More Span-based Stream methodsPeter Dettman2022-11-0127-57/+462
| | |
| * | Package with LICENSE.md filePeter Dettman2022-10-302-2/+21
| | |
| * | Remove TRACEPeter Dettman2022-10-301-1/+1
| | |
| * | Mark SIKE implementation ObsoletePeter Dettman2022-10-3012-5/+25
| | |
* | | resolve conflictsDavid Hook2022-10-29317-4950/+19080
|\| |
| * | Release preparationsPeter Dettman2022-10-2914-33/+76
| | |
| * | Use correct OIDPeter Dettman2022-10-293-3/+3
| | |
| * | Remove obsolete codePeter Dettman2022-10-281-26/+0
| | |
| * | Cleanup CMS compressed dataPeter Dettman2022-10-284-31/+32
| | |
| * | DateTimeUtilities improvements:Peter Dettman2022-10-279-67/+81
| | | | | | | | | | | | | | | - DateTimeToUnixMs converts to UTC - UnixMsToDateTime checks input range
| * | Refactoring in Bcpg.SigPeter Dettman2022-10-2711-157/+32
| | |
| * | Pqc.Crypto.Bike cleanupPeter Dettman2022-10-263-29/+20
| | |
| * | Add Asn1UtcTime and usePeter Dettman2022-10-2512-328/+338
| | |
| * | Refactor Pqc test configsPeter Dettman2022-10-257-100/+10
| | |
| * | FIne-grained SupportedOSPlatform attributesPeter Dettman2022-10-252-7/+29
| | |
| * | Refactoring in Keccak codePeter Dettman2022-10-253-115/+90
| | |
| * | Remove unnecessary intrinsic usagePeter Dettman2022-10-251-28/+0
| | |
| * | Xor methods in Nat classesPeter Dettman2022-10-254-30/+361
| | |
| * | Fixed pqc/utilsroyb2022-10-245-291/+353
| | |
| * | namespace errorroyb2022-10-241-66/+69
| | |
| * | Merge remote-tracking branch 'origin/master'royb2022-10-2437-547/+675
| |\ \
| | * | Add Asn1GeneralizedTime and usePeter Dettman2022-10-2537-547/+675
| | | |
| * | | Added Aes and Uniform variant to Saberroyb2022-10-2418-102/+6641
| |/ /
| * | fixed refactored class names in pqc/utilsroyb2022-10-243-266/+191
| | |
| * | fixed refactored class names in SubjectPublicKeyInfoFactoryroyb2022-10-241-69/+82
| | |
| * | Use MemoryMarshal.AsBytesPeter Dettman2022-10-246-17/+17
| | |
| * | Use platform compression where availablePeter Dettman2022-10-2414-81/+203
| | | | | | | | | | | | - Move Bzip2 code into Utilities
| * | Use correct OIDPeter Dettman2022-10-241-1/+1
| | |
| * | Refactor intrinsics codePeter Dettman2022-10-248-136/+136
| | |
| * | Add Gost2012 algorithms to registriesPeter Dettman2022-10-234-7/+46
| | | | | | | | | | | | - see https://github.com/bcgit/bc-csharp/pull/217
| * | Refactoring in SP80038GPeter Dettman2022-10-231-72/+27
| | |
| * | Xor methodsPeter Dettman2022-10-232-10/+98
| | |
| * | Various cleanupPeter Dettman2022-10-2316-26/+6
| | |
| * | Complete SecureRandom refactoringPeter Dettman2022-10-2314-73/+64
| | |
| * | Change BigInteger arbitrary random sourcePeter Dettman2022-10-232-14/+26
| | |
| * | VMPC refactoringPeter Dettman2022-10-232-80/+70
| | |
| * | SecureRandom refactoring in CryptoPeter Dettman2022-10-2326-123/+83
| | |
| * | SecureRandom refactoring in CmsPeter Dettman2022-10-2310-87/+67
| | |
| * | Refactoring in Pqc.Crypto.SikePeter Dettman2022-10-2225-885/+862
| | |
| * | Refactoring in Pqc.Crypto.SaberPeter Dettman2022-10-2214-211/+165
| | |
| * | Refactoring in Pqc.Crypto.LmsPeter Dettman2022-10-2235-593/+619
| | | | | | | | | | | | - add missing factory entries
| * | Remove extraneous classPeter Dettman2022-10-221-74/+0
| | |
| * | Salsa20 perf. opts.Peter Dettman2022-10-221-36/+117
| | |
| * | Add Xor methods to Nat classesPeter Dettman2022-10-214-16/+182
| | |
| * | Unroll ShiftUp methodsPeter Dettman2022-10-211-29/+346
| | |
| * | added HQC ackDavid Hook2022-10-211-1/+1
| | |
| * | Make FalconFPR a structPeter Dettman2022-10-211-2/+3
| | |
| * | Refactoring in Pqc.Crypto.Cmce (performance)Peter Dettman2022-10-211-6/+44
| | |
| * | Remove unnecessary special casesPeter Dettman2022-10-201-62/+15
| | |
| * | Refactoring in Pqc.Crypto.Hqc (performance)Peter Dettman2022-10-2015-308/+153
| | |
| * | Initial import of HQCPeter Dettman2022-10-2029-16/+6762
| | |
| * | Fix BinaryReader usage in Pqc.Crypto.LmsPeter Dettman2022-10-2010-164/+104
| | |
| * | Add Inverse64 methodPeter Dettman2022-10-201-1/+16
| | |
| * | Microsoft.NET.Test.Sdk 17.3.2Peter Dettman2022-10-201-1/+1
| | |
| * | JksStore endianness safetyPeter Dettman2022-10-201-55/+44
| | |
| * | Add BinaryReaders, BinaryWritersPeter Dettman2022-10-202-0/+180
| | |
| * | Refactoring in UtilitiesPeter Dettman2022-10-207-11/+29
| | |
| * | Add Shorts utility classPeter Dettman2022-10-201-0/+54
| | |
| * | Fix LMS tests namespacePeter Dettman2022-10-205-33/+29
| | |
| * | Refactoring in Pqc.Crypto.Lms (tests)Peter Dettman2022-10-205-70/+27
| | |
| * | Reorganize tests in Pqc.Crypto.TestPeter Dettman2022-10-2013-551/+673
| | |
| * | Refactoring in Cmce (performance)Peter Dettman2022-10-201-11/+12
| | |
* | | Merge remote-tracking branch 'refs/remotes/origin/master'David Hook2022-10-155-509/+400
|\| |
| * | Replace BikePolynomial with new BikeRingPeter Dettman2022-10-204-508/+399
| | | | | | | | | | | | | | | - more efficient polynomial ring implementation - refactor BikeEngine (performance)
| * | Account for zOff correctlyPeter Dettman2022-10-201-1/+1
| | |
* | | conflict resolutionDavid Hook2022-10-157-1/+78
|/ /
* | Refactoring in Pqc.Crypto.Bike (performance)Peter Dettman2022-10-1813-374/+206
| |
* | Replace LinearAlgebra with BikePolynomialPeter Dettman2022-10-1815-2883/+505
| |
* | Compare byte arrays using SequenceCompareToPeter Dettman2022-10-171-0/+5
| |
* | Mark some tests NonParallelizablePeter Dettman2022-10-173-6/+5
| |
* | Switch to 4.5.1 as fallback targetPeter Dettman2022-10-171-1/+1
| |
* | System.Linq cleanupPeter Dettman2022-10-175-30/+14
| |
* | updated public key encoding to latest version of draft RFCDavid Hook2022-10-142-4/+6
| |
* | Revert mistaken framework changePeter Dettman2022-10-141-1/+1
| |
* | Remove debug testPeter Dettman2022-10-141-9/+0
| |
* | Fix constructor accessPeter Dettman2022-10-142-2/+2
| |
* | Use BinaryPrimitives when availablePeter Dettman2022-10-141-33/+106
| |
* | fixed truncation issue in BikeRandom (Harrison patch)David Hook2022-10-132-3/+2
| |
* | Refactoring in Pqc.Crypto.TestsPeter Dettman2022-10-1310-216/+196
| |
* | Remove unnecessary copiesPeter Dettman2022-10-132-6/+3
| |
* | Refactoring in Frodo (performance)Peter Dettman2022-10-133-32/+74
| |
* | general cleanups - naming, importsDavid Hook2022-10-1244-117/+8490
| |
* | added BIKE credDavid Hook2022-10-121-0/+3
| |
* | Minor fixes in PQC testsPeter Dettman2022-10-134-8/+8
| |
* | Refactor FrodoMatrixGenerator (performance)Peter Dettman2022-10-131-28/+15
| |
* | Reorganize FrodoVectorTestPeter Dettman2022-10-122-96/+102
| |
* | Skip redundant cipher init in Frodo-AESPeter Dettman2022-10-122-76/+35
| |
* | Refactoring SphincsPlus (performance)Peter Dettman2022-10-126-103/+489
| |
* | Improve digest API compliance in sphincs haraka implsPeter Dettman2022-10-123-6/+83
| |
* | Nerdbank.GitVersioning 3.5.113Peter Dettman2022-10-121-1/+1
| |
* | FormattingPeter Dettman2022-10-121-4/+4
| |
* | Add barebones CryptoServicesRegistrar classPeter Dettman2022-10-121-0/+17
| |
* | Add BcTlsCrypto default constructorPeter Dettman2022-10-1218-39/+25
| |
* | Change method names in IXofPeter Dettman2022-10-1137-190/+188
| | | | | | | | - distinct from IDigest methods and consistent with span-based methods
* | Hardware-accelerate Haraka engine for SPHINCS+Peter Dettman2022-10-115-1/+372
| |
* | Support custom round constantsPeter Dettman2022-10-112-6/+82
| |
* | Stores don't need refPeter Dettman2022-10-113-26/+26
| |
* | Haraka512 hardware accelerationPeter Dettman2022-10-113-55/+246
| |
* | Further speedups in Haraka256_X86Peter Dettman2022-10-111-26/+36
| |
* | Haraka256 hardware accelerationPeter Dettman2022-10-112-0/+137
| |
* | Refactor Haraka digestsPeter Dettman2022-10-103-504/+439
| |
* | Refactoring pass over Pqc.Crypto.SphincsPlusPeter Dettman2022-10-1026-600/+578
| |
* | Fix checksum conversion to base wPeter Dettman2022-10-101-1/+1
| | | | | | | | - innocuous for currently tested parameter sets
* | Fix Harakas XOF API compliancePeter Dettman2022-10-101-14/+11
| |
* | Fix Haraka digest API compliancePeter Dettman2022-10-104-27/+29
| |
* | Haraka refactoring (performance)Peter Dettman2022-10-091-237/+122
| |
* | Round out Bits methodsPeter Dettman2022-10-091-4/+61
| | | | | | | | | | - AggressiveInlining - Debug guards
* | Improvements to PRNG classesPeter Dettman2022-10-0913-359/+906
| |
* | Tweak allocation strategyPeter Dettman2022-10-081-16/+7
| |
* | New Spans methodsPeter Dettman2022-10-085-4/+30
| |
* | Refactor TestSamplerPeter Dettman2022-10-081-5/+4
| |
* | Span usage in Asn1RelativeOidPeter Dettman2022-10-081-0/+18
| |
* | More span variants in randomness classesPeter Dettman2022-10-0714-51/+247
| |
* | Span usage in encodersPeter Dettman2022-10-073-20/+309
| |
* | Span usage in Math.RawPeter Dettman2022-10-076-123/+1105
| |
* | Fix exception typePeter Dettman2022-10-061-13/+7
| |
* | Refactoring pass over Pqc.Crypto.LmsPeter Dettman2022-10-0634-996/+698
| |
* | Fix extraneous usingPeter Dettman2022-10-061-1/+0
| |
* | Refactor stackalloc usagePeter Dettman2022-10-0616-43/+108
| |
* | Refactor RSACoreEngine.ConvertOutputPeter Dettman2022-10-061-19/+5
| |
* | Refactor stackalloc usage in TLSPeter Dettman2022-10-065-7/+18
| |
* | Refactor stackalloc usagePeter Dettman2022-10-061-17/+10
| |
* | Fix method names and refactoringPeter Dettman2022-10-055-24/+16
| |
* | Remove Times classPeter Dettman2022-10-053-18/+3
| |
* | Use generics in EnumsPeter Dettman2022-10-056-40/+36
| |
* | Delete experimental codePeter Dettman2022-10-051-360/+0
| |
* | Span-based variants for XDH/EdDSAPeter Dettman2022-10-056-39/+304
| |
* | Span-bases variants for Mod methodsPeter Dettman2022-10-052-5/+342
| |
* | Various span usagesPeter Dettman2022-10-056-74/+143
| |
* | BigInteger in-place conversionsPeter Dettman2022-10-052-41/+145
| |
* | Various span usage in TLS codePeter Dettman2022-10-0518-30/+465
| |
* | Span-based constructors in parameter classesPeter Dettman2022-10-045-83/+81
| |
* | Save heap allocationsPeter Dettman2022-10-041-1/+7
| |
* | Span-based variants for XDH/EdDSAPeter Dettman2022-10-0415-10/+847
| |
* | Avoid some allocations around MPIntegerPeter Dettman2022-10-045-46/+60
| |
* | Fix warningsPeter Dettman2022-10-043-5/+5
| |
* | Fix parameter namePeter Dettman2022-10-041-11/+11
| |
* | ECPrivateKeyStructure refactoringPeter Dettman2022-10-041-30/+20
| |
* | Add variant of AddOptionalTaggedPeter Dettman2022-10-041-0/+8
| |
* | Support GOST agreement OIDsPeter Dettman2022-10-042-5/+9
| |
* | RefactoringPeter Dettman2022-10-046-29/+18
| |
* | Update CryptoProObjectIdentifiersPeter Dettman2022-10-041-1/+7
| |
* | Add support for C1C3C2 mode to SM2EnginePeter Dettman2022-10-022-22/+302
| | | | | | | | - Refactoring, including span-based variants
* | Span-based variant of ECCurve.DecodePointPeter Dettman2022-10-021-43/+120
| |
* | Generic ReverseInPlace methodPeter Dettman2022-10-021-27/+4
| |
* | Missing filePeter Dettman2022-10-021-0/+27
| |
* | Support encoding without allocationPeter Dettman2022-10-022-1/+89
| |
* | Span-based constructor for BigIntegerPeter Dettman2022-10-021-16/+77
| |
* | RefactoringPeter Dettman2022-10-011-33/+13
| |
* | Span-based variant of IRawAgreement.CalculateAgreementPeter Dettman2022-10-0112-7/+795
| |
* | Port Blake2xsDigest from bc-javaPeter Dettman2022-09-304-165/+3270
| | | | | | | | - refactor Blake2bDigest, Blake2sDigest
* | Fix parameter namePeter Dettman2022-09-301-9/+9
| |
* | RefactoringPeter Dettman2022-09-3015-125/+87
| |
* | Derivation function workPeter Dettman2022-09-3015-463/+656
| | | | | | | | | | | | - Add span-based variant of IDerivationFunction.GenerateBytes - IMacDerivation.GetMac() => Mac property - Refactor implementations
* | fixed parameter name to h valueDavid Hook2022-09-301-2/+2
| |
* | changed to array prop to internalDavid Hook2022-09-301-3/+4
| |
* | fixed cut and pasteDavid Hook2022-09-301-6/+8
| |
* | Merge remote-tracking branch 'origin/master'royb2022-09-298-20/+8479
|\ \
| * | Grain128Aead performance, constant-timePeter Dettman2022-09-301-141/+84
| | |
| * | Preserve mac after DoFinalPeter Dettman2022-09-291-17/+15
| | |
| * | Grain128Aead fixesPeter Dettman2022-09-292-149/+112
| | |
| * | Merge remote-tracking branch 'refs/remotes/origin/master'David Hook2022-09-291-0/+73
| |\ \
| | * | Add ConcatenationKdfTestPeter Dettman2022-09-291-0/+73
| | | |
| * | | Grain128 AEAD Test DataDavid Hook2022-09-291-0/+7623
| |/ /
| * | added IAeadCipjer to grain128AeadDavid Hook2022-09-292-44/+107
| | |
| * | added grain128AeadDavid Hook2022-09-292-0/+795
| | |
| * | Remove unused fieldPeter Dettman2022-09-291-1/+0
| | |
| * | Use AesUtilitiesPeter Dettman2022-09-292-6/+7
| | |
| * | updated text on OCB patents.Peter Dettman2022-09-291-13/+14
| | |
* | | Added ASN.1 key encoding/decoding for Kyber, Dilithium, and Falcon.royb2022-09-2914-128/+509
|/ /
* | Added Kyber AES supportroyb2022-09-2816-306/+2538
| |
* | Added Dilithium AES support + some optimizationsroyb2022-09-2821-356/+3158
| |
* | Port Blake3 from bc-javaPeter Dettman2022-09-285-0/+1595
| |
* | MiscObjectIdentifier updates from bc-javaPeter Dettman2022-09-281-5/+27
| |
* | Kyber refactoringPeter Dettman2022-09-2817-578/+452
| |
* | Add LE_To_UInt24, refactorPeter Dettman2022-09-281-20/+27
| |
* | Use AesUtilitiesPeter Dettman2022-09-282-2/+2
| |
* | (D)TLS: RFC 7250 Raw Public KeysPeter Dettman2022-09-2420-530/+1476
| |
* | Cmp updatesPeter Dettman2022-09-209-311/+236
| |
* | Port of Asn1.Cmp tests from bc-javaPeter Dettman2022-09-207-83/+359
| |
* | CleanupPeter Dettman2022-09-207-20/+7
| |
* | Give IStreamCalculator a generic typePeter Dettman2022-09-2026-102/+77
| |
* | Update Asn1.Cmp from bc-javaPeter Dettman2022-09-2044-1253/+2051
| |
* | added randomized signingDavid Hook2022-09-203-11/+9
| |
* | Add MapElements methodsPeter Dettman2022-09-142-16/+26
| |
* | DateTimeObject => nullable DateTimePeter Dettman2022-09-1418-111/+36
| |
* | added Dilithium ackDavid Hook2022-09-141-1/+1
| |
* | Cleanup.mw2022-09-144-256/+124
| |
* | added missing usageDavid Hook2022-09-141-1/+2
| |
* | added missing usageDavid Hook2022-09-142-2/+4
| |
* | fixed method exposureDavid Hook2022-09-141-1/+1
| |
* | added missing usageDavid Hook2022-09-141-0/+1
| |
* | cleanuporeste2022-09-1313-62/+4
| |
* | first cut of DilithiumDavid Hook2022-09-144-0/+2850
| |
* | first cut of DilithiumDavid Hook2022-09-1417-0/+2200
| |
* | Use nullable DateTime instead of MinValuePeter Dettman2022-09-132-13/+18
| |
* | Rename filePeter Dettman2022-09-131-0/+0
| |
* | GetUnderlyingCipher() => UnderlyingCipherPeter Dettman2022-09-1213-150/+65
| |
* | Mark some classes sealedPeter Dettman2022-09-124-46/+32
| |
* | Separate out new IBlockCipherMode from IBlockCipherPeter Dettman2022-09-1258-713/+302
| |
* | Add basic support for JKS keystoresPeter Dettman2022-09-122-0/+791
| |
* | Improve span-based GCM codePeter Dettman2022-09-033-13/+153
| |