commit 8e047e1424c49b9b218c4350d11a6a9fd0346edd
author Davide Pesavento <davidepesa@gmail.com> Mon Feb 12 16:50:23 2024 -0500
committer Davide Pesavento <davidepesa@gmail.com> Mon Feb 12 16:55:03 2024 -0500
tree 26786ed372e0e2d12d6d80c8721726019bfd9a4b
parent 334516a019f8855bcb13cacadfe5b1a8c420114c

name-component: rename fromEscapedString() to fromUri()

Consistent with toUri()

Change-Id: Ia8ca75be9068b06840e2847f0128ffc7a4cd57af

tools/ndnsec/cert-gen.cpp

diff --git a/tools/ndnsec/cert-gen.cpp b/tools/ndnsec/cert-gen.cpp
index c382119..e7c49ad 100644
--- a/tools/ndnsec/cert-gen.cpp
+++ b/tools/ndnsec/cert-gen.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2023 Regents of the University of California.
+ * Copyright (c) 2013-2024 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -121,7 +121,7 @@
     }
   }
 
-  auto issuerId = name::Component::fromEscapedString(issuer);
+  auto issuerId = name::Component::fromUri(issuer);
   if (issuerId.isImplicitSha256Digest() ||
       issuerId.isParametersSha256Digest() ||
       issuerId.isKeyword()) {

tools/ndnsec/key-gen.cpp

diff --git a/tools/ndnsec/key-gen.cpp b/tools/ndnsec/key-gen.cpp
index a045cd6..bd3712e 100644
--- a/tools/ndnsec/key-gen.cpp
+++ b/tools/ndnsec/key-gen.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2023 Regents of the University of California.
+ * Copyright (c) 2013-2024 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -86,7 +86,7 @@
     }
 
     keyIdType = KeyIdType::USER_SPECIFIED;
-    userKeyIdComponent = name::Component::fromEscapedString(userKeyId);
+    userKeyIdComponent = name::Component::fromUri(userKeyId);
     if (userKeyIdComponent.empty() ||
         userKeyIdComponent.isImplicitSha256Digest() ||
         userKeyIdComponent.isParametersSha256Digest() ||

tools/ndnsec/sign-req.cpp

diff --git a/tools/ndnsec/sign-req.cpp b/tools/ndnsec/sign-req.cpp
index ca53819..2023ce9 100644
--- a/tools/ndnsec/sign-req.cpp
+++ b/tools/ndnsec/sign-req.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2023 Regents of the University of California.
+ * Copyright (c) 2013-2024 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -83,7 +83,7 @@
 
   // Create signing request (similar to self-signed certificate)
   security::MakeCertificateOptions opts;
-  opts.issuerId = name::Component::fromEscapedString("cert-request");
+  opts.issuerId = name::Component::fromUri("cert-request");
   opts.validity = security::ValidityPeriod::makeRelative(-1_s, 10_days);
   auto certificate = keyChain.makeCertificate(key, security::signingByKey(key), opts);