From 55b3205532575a92dd54697a8d6241011a7d09c0 Mon Sep 17 00:00:00 2001 From: Amritanshu Patra Date: Sat, 16 May 2026 00:49:32 +0530 Subject: [PATCH] fix: rename getPublickKey() to getPublicKey() and update all references --- frontend-ui/frontend-react-js-based-buyer-app | 2 +- .../python-based-buyer-app-side-protocol-layer | 2 +- .../java/ondc/onboarding/utility/AppConfig.java | 4 ++-- .../ondc/onboarding/utility/CryptoKeyPair.java | 2 +- .../org/ondc/crypto/util/CryptoFunctions.java | 14 +++++++------- .../java/org/ondc/crypto/util/CryptoKeyPair.java | 2 +- .../java/org/ondc/crypto/util/CryptoTest.java | 16 ++++++++-------- .../src/test/java/org/ondc/crypto/util/Test.java | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/frontend-ui/frontend-react-js-based-buyer-app b/frontend-ui/frontend-react-js-based-buyer-app index f49d20ad..be842e7e 160000 --- a/frontend-ui/frontend-react-js-based-buyer-app +++ b/frontend-ui/frontend-react-js-based-buyer-app @@ -1 +1 @@ -Subproject commit f49d20ad02c2aa12d2b135a01d1f6f3673a4f6db +Subproject commit be842e7eb68e0f7438d56446d2bcdb8140df0486 diff --git a/protocol-layer/python-based-buyer-app-side-protocol-layer b/protocol-layer/python-based-buyer-app-side-protocol-layer index 2a9b71c4..b4680717 160000 --- a/protocol-layer/python-based-buyer-app-side-protocol-layer +++ b/protocol-layer/python-based-buyer-app-side-protocol-layer @@ -1 +1 @@ -Subproject commit 2a9b71c42175fcf649a5071f076760820a9016c7 +Subproject commit b4680717d945fa0c2b71d841f2514625cb66ce91 diff --git a/utilities/on_subscibe-service/java/src/main/java/ondc/onboarding/utility/AppConfig.java b/utilities/on_subscibe-service/java/src/main/java/ondc/onboarding/utility/AppConfig.java index cb3713da..38093b11 100644 --- a/utilities/on_subscibe-service/java/src/main/java/ondc/onboarding/utility/AppConfig.java +++ b/utilities/on_subscibe-service/java/src/main/java/ondc/onboarding/utility/AppConfig.java @@ -24,9 +24,9 @@ public Map keys() throws NoSuchPaddingException, IllegalBlockSize CryptoKeyPair encKeyPair = generateEncDecKey(); Map keys = new HashMap<>(); - keys.put("sign_public_key",signingKeyPair.getPublickKey()); + keys.put("sign_public_key",signingKeyPair.getPublicKey()); keys.put("sign_private_key",signingKeyPair.getPrivateKey()); - keys.put("enc_public_key", encKeyPair.getPublickKey()); + keys.put("enc_public_key", encKeyPair.getPublicKey()); keys.put("enc_private_key", encKeyPair.getPrivateKey()); return keys; } diff --git a/utilities/on_subscibe-service/java/src/main/java/ondc/onboarding/utility/CryptoKeyPair.java b/utilities/on_subscibe-service/java/src/main/java/ondc/onboarding/utility/CryptoKeyPair.java index 21e6d378..a6c68ac4 100644 --- a/utilities/on_subscibe-service/java/src/main/java/ondc/onboarding/utility/CryptoKeyPair.java +++ b/utilities/on_subscibe-service/java/src/main/java/ondc/onboarding/utility/CryptoKeyPair.java @@ -24,7 +24,7 @@ public void setPrivateKey(byte[] privateKey) { } - public byte[] getPublickKey() { + public byte[] getPublicKey() { return publicKey; } diff --git a/utilities/signing_and_verification/java/ondc-crypto-utility-master/src/main/java/org/ondc/crypto/util/CryptoFunctions.java b/utilities/signing_and_verification/java/ondc-crypto-utility-master/src/main/java/org/ondc/crypto/util/CryptoFunctions.java index 3f30f820..ab715ef3 100644 --- a/utilities/signing_and_verification/java/ondc-crypto-utility-master/src/main/java/org/ondc/crypto/util/CryptoFunctions.java +++ b/utilities/signing_and_verification/java/ondc-crypto-utility-master/src/main/java/org/ondc/crypto/util/CryptoFunctions.java @@ -60,7 +60,7 @@ public class CryptoFunctions { * * byte[] signature= CryptoFunctions.sign(signingKeyPair.getPrivateKey(), message.getBytes()); * - * boolean verificationResult=CryptoFunctions.verify(signature, message.getBytes(), signingKeyPair.getPublickKey()); + * boolean verificationResult=CryptoFunctions.verify(signature, message.getBytes(), signingKeyPair.getPublicKey()); * * @author SujeetS @@ -102,7 +102,7 @@ public static CryptoKeyPair generateSigningKeyPair() { * * String message="message to be signed"; * byte[] signature= CryptoFunctions.sign(signingKeyPair.getPrivateKey(), message.getBytes()); - * boolean verificationResult=CryptoFunctions.verify(signature, message.getBytes(), signingKeyPair.getPublickKey()); + * boolean verificationResult=CryptoFunctions.verify(signature, message.getBytes(), signingKeyPair.getPublicKey()); * * @author SujeetS @@ -132,7 +132,7 @@ public static byte[] sign(byte[] privateKey,byte[] message) { * * String message="message to be signed"; * byte[] signature= CryptoFunctions.sign(signingKeyPair.getPrivateKey(), message.getBytes()); - * boolean verificationResult=CryptoFunctions.verify(signature, message.getBytes(), signingKeyPair.getPublickKey()); + * boolean verificationResult=CryptoFunctions.verify(signature, message.getBytes(), signingKeyPair.getPublicKey()); * * @author SujeetS * @param signature the signature that needs to be verified @@ -192,22 +192,22 @@ public static CryptoKeyPair generateEncDecKey() throws InvalidKeyException, NoSu * } * String message="message to be encrypted"; * - * byte[] encrypted= CryptoFunctions.encryptDecrypt(Cipher.ENCRYPT_MODE,message.getBytes(),senderEncDecKeyPair.getPrivateKey(),receiverEncDecKeyPair.getPublickKey()); + * byte[] encrypted= CryptoFunctions.encryptDecrypt(Cipher.ENCRYPT_MODE,message.getBytes(),senderEncDecKeyPair.getPrivateKey(),receiverEncDecKeyPair.getPublicKey()); * * System.out.println("\n\n/* Sender Side /"); * System.out.println("{"); * System.out.println("\t\"plainChallengeString \":\""+message +"\","); * System.out.println("\t\"EncryptedChallengeString \":\""+Base64.getEncoder().encodeToString(encrypted)+"\","); * System.out.println("\t\"senderPrivateKey \":\""+Base64.getEncoder().encodeToString(senderEncDecKeyPair.getPrivateKey()) +"\","); - * System.out.println("\t\"receiverPublicKey \":\""+Base64.getEncoder().encodeToString(receiverEncDecKeyPair.getPublickKey()) +"\""); + * System.out.println("\t\"receiverPublicKey \":\""+Base64.getEncoder().encodeToString(receiverEncDecKeyPair.getPublicKey()) +"\""); * System.out.println("}\n\n"); - * byte[] decrypted= CryptoFunctions.encryptDecrypt(Cipher.DECRYPT_MODE,encrypted,receiverEncDecKeyPair.getPrivateKey(),senderEncDecKeyPair.getPublickKey()); + * byte[] decrypted= CryptoFunctions.encryptDecrypt(Cipher.DECRYPT_MODE,encrypted,receiverEncDecKeyPair.getPrivateKey(),senderEncDecKeyPair.getPublicKey()); * String decryptedMessage=new String(decrypted); * System.out.println("\n\n/** Receiver Side "); * System.out.println("{"); * System.out.println("\t\"DecryptedChallengeString \":\""+decryptedMessage+"\","); * System.out.println("\t\"receiverPrivateKey \":\""+Base64.getEncoder().encodeToString(receiverEncDecKeyPair.getPrivateKey()) +"\","); - * System.out.println("\t\"senderPublicKey \":\""+Base64.getEncoder().encodeToString(senderEncDecKeyPair.getPublickKey()) +"\""); + * System.out.println("\t\"senderPublicKey \":\""+Base64.getEncoder().encodeToString(senderEncDecKeyPair.getPublicKey()) +"\""); * System.out.println("}"); * * @author SujeetS diff --git a/utilities/signing_and_verification/java/ondc-crypto-utility-master/src/main/java/org/ondc/crypto/util/CryptoKeyPair.java b/utilities/signing_and_verification/java/ondc-crypto-utility-master/src/main/java/org/ondc/crypto/util/CryptoKeyPair.java index 0a3df09b..c9c3d188 100644 --- a/utilities/signing_and_verification/java/ondc-crypto-utility-master/src/main/java/org/ondc/crypto/util/CryptoKeyPair.java +++ b/utilities/signing_and_verification/java/ondc-crypto-utility-master/src/main/java/org/ondc/crypto/util/CryptoKeyPair.java @@ -47,7 +47,7 @@ public void setPrivateKey(byte[] privateKey) { * * @return the public key */ - public byte[] getPublickKey() { + public byte[] getPublicKey() { return publicKey; } diff --git a/utilities/signing_and_verification/java/ondc-crypto-utility-master/src/test/java/org/ondc/crypto/util/CryptoTest.java b/utilities/signing_and_verification/java/ondc-crypto-utility-master/src/test/java/org/ondc/crypto/util/CryptoTest.java index 72c9c7f6..499617d9 100644 --- a/utilities/signing_and_verification/java/ondc-crypto-utility-master/src/test/java/org/ondc/crypto/util/CryptoTest.java +++ b/utilities/signing_and_verification/java/ondc-crypto-utility-master/src/test/java/org/ondc/crypto/util/CryptoTest.java @@ -58,13 +58,13 @@ public void testGenerateSigningKeyPair_Normal() { System.out.println("}\n\n"); - boolean verificationResult=CryptoFunctions.verify(signature, message.getBytes(), signingKeyPair.getPublickKey()); + boolean verificationResult=CryptoFunctions.verify(signature, message.getBytes(), signingKeyPair.getPublicKey()); System.out.println("\n\n/** Receiver Side **/"); System.out.println("{"); System.out.println("\t\"message \":\""+message +"\","); System.out.println("\t\"signature \":\""+Base64.getEncoder().encodeToString(signature)+"\","); - System.out.println("\t\"publicKey \":\""+Base64.getEncoder().encodeToString(signingKeyPair.getPublickKey()) +"\","); + System.out.println("\t\"publicKey \":\""+Base64.getEncoder().encodeToString(signingKeyPair.getPublicKey()) +"\","); System.out.println("\t\"verified \":\""+verificationResult +"\","); System.out.println("}\n\n"); if(verificationResult) @@ -106,13 +106,13 @@ public void testGenerateSigningKeyPair_Tampered() { message="tampered message to be verified"; - boolean verificationResult=CryptoFunctions.verify(signature, message.getBytes(), signingKeyPair.getPublickKey()); + boolean verificationResult=CryptoFunctions.verify(signature, message.getBytes(), signingKeyPair.getPublicKey()); System.out.println("\n\n/** Receiver Side **/"); System.out.println("{"); System.out.println("\t\"message \":\""+message +"\","); System.out.println("\t\"signature \":\""+Base64.getEncoder().encodeToString(signature)+"\","); - System.out.println("\t\"publicKey \":\""+Base64.getEncoder().encodeToString(signingKeyPair.getPublickKey()) +"\","); + System.out.println("\t\"publicKey \":\""+Base64.getEncoder().encodeToString(signingKeyPair.getPublicKey()) +"\","); System.out.println("\t\"verified \":\""+verificationResult +"\","); System.out.println("}\n\n"); @@ -156,7 +156,7 @@ public void testGenerateEncryptionDecryptionKeyPair_Normal() throws InvalidKeyEx } String message="message to be encrypted"; - byte[] encrypted= CryptoFunctions.encryptDecrypt(Cipher.ENCRYPT_MODE,message.getBytes(),senderEncDecKeyPair.getPrivateKey(),receiverEncDecKeyPair.getPublickKey()); + byte[] encrypted= CryptoFunctions.encryptDecrypt(Cipher.ENCRYPT_MODE,message.getBytes(),senderEncDecKeyPair.getPrivateKey(),receiverEncDecKeyPair.getPublicKey()); System.out.println("Encryption :: [OK]"); @@ -165,10 +165,10 @@ public void testGenerateEncryptionDecryptionKeyPair_Normal() throws InvalidKeyEx System.out.println("\t\"plainChallengeString \":\""+message +"\","); System.out.println("\t\"EncryptedChallengeString \":\""+Base64.getEncoder().encodeToString(encrypted)+"\","); System.out.println("\t\"senderPrivateKey \":\""+Base64.getEncoder().encodeToString(senderEncDecKeyPair.getPrivateKey()) +"\","); - System.out.println("\t\"receiverPublicKey \":\""+Base64.getEncoder().encodeToString(receiverEncDecKeyPair.getPublickKey()) +"\""); + System.out.println("\t\"receiverPublicKey \":\""+Base64.getEncoder().encodeToString(receiverEncDecKeyPair.getPublicKey()) +"\""); System.out.println("}\n\n"); - byte[] decrypted= CryptoFunctions.encryptDecrypt(Cipher.DECRYPT_MODE,encrypted,receiverEncDecKeyPair.getPrivateKey(),senderEncDecKeyPair.getPublickKey()); + byte[] decrypted= CryptoFunctions.encryptDecrypt(Cipher.DECRYPT_MODE,encrypted,receiverEncDecKeyPair.getPrivateKey(),senderEncDecKeyPair.getPublicKey()); System.out.println("Decryption :: [OK]"); String decryptedMessage=new String(decrypted); @@ -178,7 +178,7 @@ public void testGenerateEncryptionDecryptionKeyPair_Normal() throws InvalidKeyEx System.out.println("{"); System.out.println("\t\"decryptedChallengeString \":\""+decryptedMessage+"\","); System.out.println("\t\"receiverPrivateKey \":\""+Base64.getEncoder().encodeToString(receiverEncDecKeyPair.getPrivateKey()) +"\","); - System.out.println("\t\"senderPublicKey \":\""+Base64.getEncoder().encodeToString(senderEncDecKeyPair.getPublickKey()) +"\","); + System.out.println("\t\"senderPublicKey \":\""+Base64.getEncoder().encodeToString(senderEncDecKeyPair.getPublicKey()) +"\","); System.out.println("\t\"match\":\""+message.equals(decryptedMessage)+"\""); System.out.println("}"); diff --git a/utilities/signing_and_verification/java/ondc-crypto-utility-master/src/test/java/org/ondc/crypto/util/Test.java b/utilities/signing_and_verification/java/ondc-crypto-utility-master/src/test/java/org/ondc/crypto/util/Test.java index 289fe593..25404498 100644 --- a/utilities/signing_and_verification/java/ondc-crypto-utility-master/src/test/java/org/ondc/crypto/util/Test.java +++ b/utilities/signing_and_verification/java/ondc-crypto-utility-master/src/test/java/org/ondc/crypto/util/Test.java @@ -12,7 +12,7 @@ public static void main(String[] args) { CryptoKeyPair signingKeyPair=CryptoFunctions.generateSigningKeyPair(); byte[] privateKey = signingKeyPair.getPrivateKey(); System.out.printf("Private Key: %s \n",Base64.getEncoder().encodeToString(privateKey)); - System.out.printf("Public Key: %s \n",Base64.getEncoder().encodeToString(signingKeyPair.getPublickKey())); + System.out.printf("Public Key: %s \n",Base64.getEncoder().encodeToString(signingKeyPair.getPublicKey())); byte[] signMessage = Test.sign(privateKey,"IND|ONDC:RET10|sellerApp|std:080|ref-app-seller-staging-v2.ondc.org".getBytes()); System.out.println(Base64.getEncoder().encodeToString(signMessage));