Skip to content

fix: rename getPublickKey() to getPublicKey() and update all references #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AmritanshuPatra85 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: rename getPublickKey() to getPublicKey() and update all references #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend-ui/frontend-react-js-based-buyer-app
Open in desktop
Submodule frontend-react-js-based-buyer-app updated from f49d20 to be842e
2 changes: 1 addition & 1 deletion protocol-layer/python-based-buyer-app-side-protocol-layer
Open in desktop
Submodule python-based-buyer-app-side-protocol-layer updated from 2a9b71 to b46807
4 changes: 2 additions & 2 deletions utilities/on_subscibe-service/java/src/main/java/ondc/onboarding/utility/AppConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ public Map<String,byte[]> keys() throws NoSuchPaddingException, IllegalBlockSize
CryptoKeyPair encKeyPair = generateEncDecKey();

Map<String,byte[]> 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;
}
Expand Down
2 changes: 1 addition & 1 deletion utilities/on_subscibe-service/java/src/main/java/ondc/onboarding/utility/CryptoKeyPair.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public void setPrivateKey(byte[] privateKey) {
}


public byte[] getPublickKey() {
public byte[] getPublicKey() {
return publicKey;
}

Expand Down
14 changes: 7 additions & 7 deletions ...n/java/ondc-crypto-utility-master/src/main/java/org/ondc/crypto/util/CryptoFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
* </pre>

* @author SujeetS
Expand Down Expand Up @@ -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());
* </pre>

* @author SujeetS
Expand Down Expand Up @@ -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());
* </pre>
* @author SujeetS
* @param signature the signature that needs to be verified
Expand Down Expand Up @@ -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("}");
* </pre>
* @author SujeetS
Expand Down
2 changes: 1 addition & 1 deletion ...ion/java/ondc-crypto-utility-master/src/main/java/org/ondc/crypto/util/CryptoKeyPair.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void setPrivateKey(byte[] privateKey) {
*
* @return the public key
*/
public byte[] getPublickKey() {
public byte[] getPublicKey() {
return publicKey;
}

Expand Down
16 changes: 8 additions & 8 deletions ...cation/java/ondc-crypto-utility-master/src/test/java/org/ondc/crypto/util/CryptoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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");

Expand Down Expand Up @@ -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]");

Expand All @@ -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);
Expand All @@ -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("}");
Expand Down
2 changes: 1 addition & 1 deletion ...verification/java/ondc-crypto-utility-master/src/test/java/org/ondc/crypto/util/Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down