diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/HTTPSigningConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/HTTPSigningConfiguration.mustache index 84c6b39f3c3..64ccaa7a9bd 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/HTTPSigningConfiguration.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/HTTPSigningConfiguration.mustache @@ -78,9 +78,10 @@ namespace {{packageName}}.Client /// /// Gets the Headers for HTTpSIgning /// - /// - /// - /// + /// Base path + /// HTTP method + /// Path + /// Request options /// internal Dictionary GetHttpSignedHeader(string basePath,string method, string path, RequestOptions requestOptions) { @@ -313,16 +314,16 @@ namespace {{packageName}}.Client var ecKeyBase64String = keyStr.Replace(ecKeyHeader, "").Replace(ecKeyFooter, "").Trim(); var keyBytes = System.Convert.FromBase64String(ecKeyBase64String); var ecdsa = ECDsa.Create(); - var bytCount = 0; #if (NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0) + var byteCount = 0; if (configuration.KeyPassPhrase != null) { - ecdsa.ImportEncryptedPkcs8PrivateKey(keyPassPhrase, keyBytes, out bytCount); + ecdsa.ImportEncryptedPkcs8PrivateKey(keyPassPhrase, keyBytes, out byteCount); } else { - ecdsa.ImportPkcs8PrivateKey(keyBytes, out bytCount); + ecdsa.ImportPkcs8PrivateKey(keyBytes, out byteCount); } var signedBytes = ecdsa.SignHash(dataToSign); var derBytes = ConvertToECDSAANS1Format(signedBytes); @@ -687,7 +688,6 @@ namespace {{packageName}}.Client else if (key[0].ToString().Contains(ecPrivateKeyHeader) && key[key.Length - 1].ToString().Contains(ecPrivateKeyFooter)) { - /*this type of key can hold many type different types of private key, but here due lack of pem header Considering this as EC key */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HTTPSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HTTPSigningConfiguration.cs index a95d229f1e3..6c83bbb0640 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HTTPSigningConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HTTPSigningConfiguration.cs @@ -78,9 +78,10 @@ namespace Org.OpenAPITools.Client /// /// Gets the Headers for HTTpSIgning /// - /// - /// - /// + /// Base path + /// HTTP method + /// Path + /// Request options /// internal Dictionary GetHttpSignedHeader(string basePath,string method, string path, RequestOptions requestOptions) { @@ -313,16 +314,16 @@ namespace Org.OpenAPITools.Client var ecKeyBase64String = keyStr.Replace(ecKeyHeader, "").Replace(ecKeyFooter, "").Trim(); var keyBytes = System.Convert.FromBase64String(ecKeyBase64String); var ecdsa = ECDsa.Create(); - var bytCount = 0; #if (NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0) + var byteCount = 0; if (configuration.KeyPassPhrase != null) { - ecdsa.ImportEncryptedPkcs8PrivateKey(keyPassPhrase, keyBytes, out bytCount); + ecdsa.ImportEncryptedPkcs8PrivateKey(keyPassPhrase, keyBytes, out byteCount); } else { - ecdsa.ImportPkcs8PrivateKey(keyBytes, out bytCount); + ecdsa.ImportPkcs8PrivateKey(keyBytes, out byteCount); } var signedBytes = ecdsa.SignHash(dataToSign); var derBytes = ConvertToECDSAANS1Format(signedBytes); @@ -687,7 +688,6 @@ namespace Org.OpenAPITools.Client else if (key[0].ToString().Contains(ecPrivateKeyHeader) && key[key.Length - 1].ToString().Contains(ecPrivateKeyFooter)) { - /*this type of key can hold many type different types of private key, but here due lack of pem header Considering this as EC key */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HTTPSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HTTPSigningConfiguration.cs index a95d229f1e3..6c83bbb0640 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HTTPSigningConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HTTPSigningConfiguration.cs @@ -78,9 +78,10 @@ namespace Org.OpenAPITools.Client /// /// Gets the Headers for HTTpSIgning /// - /// - /// - /// + /// Base path + /// HTTP method + /// Path + /// Request options /// internal Dictionary GetHttpSignedHeader(string basePath,string method, string path, RequestOptions requestOptions) { @@ -313,16 +314,16 @@ namespace Org.OpenAPITools.Client var ecKeyBase64String = keyStr.Replace(ecKeyHeader, "").Replace(ecKeyFooter, "").Trim(); var keyBytes = System.Convert.FromBase64String(ecKeyBase64String); var ecdsa = ECDsa.Create(); - var bytCount = 0; #if (NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0) + var byteCount = 0; if (configuration.KeyPassPhrase != null) { - ecdsa.ImportEncryptedPkcs8PrivateKey(keyPassPhrase, keyBytes, out bytCount); + ecdsa.ImportEncryptedPkcs8PrivateKey(keyPassPhrase, keyBytes, out byteCount); } else { - ecdsa.ImportPkcs8PrivateKey(keyBytes, out bytCount); + ecdsa.ImportPkcs8PrivateKey(keyBytes, out byteCount); } var signedBytes = ecdsa.SignHash(dataToSign); var derBytes = ConvertToECDSAANS1Format(signedBytes); @@ -687,7 +688,6 @@ namespace Org.OpenAPITools.Client else if (key[0].ToString().Contains(ecPrivateKeyHeader) && key[key.Length - 1].ToString().Contains(ecPrivateKeyFooter)) { - /*this type of key can hold many type different types of private key, but here due lack of pem header Considering this as EC key */