@microsoft/ccf-app 4.0.0-dev3 → 4.0.0-dev4

package/crypto.d.ts

@@ -57,9 +57,33 @@ export declare const rsaPemToJwk: (pem: string, kid?: string | undefined) => imp
 /**
  * @inheritDoc global!CCFCrypto.pubEddsaPemToJwk
  */
-export declare const pubEddsaPemToJwk: (pem: string, kid?: string | undefined) => import("./global.js").JsonWebKeyEdDSAPrivate;
+export declare const pubEddsaPemToJwk: (pem: string, kid?: string | undefined) => import("./global.js").JsonWebKeyEdDSAPublic;
 /**
  * @inheritDoc global!CCFCrypto.eddsaPemToJwk
  */
 export declare const eddsaPemToJwk: (pem: string, kid?: string | undefined) => import("./global.js").JsonWebKeyEdDSAPrivate;
+/**
+ * @inheritDoc global!CCFCrypto.pubJwkToPem
+ */
+export declare const pubJwkToPem: (jwk: import("./global.js").JsonWebKeyECPublic) => string;
+/**
+ * @inheritDoc global!CCFCrypto.JwkToPem
+ */
+export declare const jwkToPem: (jwk: import("./global.js").JsonWebKeyECPrivate) => string;
+/**
+ * @inheritDoc global!CCFCrypto.pubRsaJwkToPem
+ */
+export declare const pubRsaJwkToPem: (jwk: import("./global.js").JsonWebKeyRSAPublic) => string;
+/**
+ * @inheritDoc global!CCFCrypto.rsaJwkToPem
+ */
+export declare const rsaJwkToPem: (jwk: import("./global.js").JsonWebKeyRSAPrivate) => string;
+/**
+ * @inheritDoc global!CCFCrypto.pubEddsaJwkToPem
+ */
+export declare const pubEddsaJwkToPem: (jwk: import("./global.js").JsonWebKeyEdDSAPublic) => string;
+/**
+ * @inheritDoc global!CCFCrypto.eddsaJwkToPem
+ */
+export declare const eddsaJwkToPem: (jwk: import("./global.js").JsonWebKeyEdDSAPrivate) => string;
 export { WrapAlgoParams, AesKwpParams, RsaOaepParams, RsaOaepAesKwpParams, CryptoKeyPair, DigestAlgorithm, SigningAlgorithm, } from "./global";

package/crypto.js

@@ -78,3 +78,27 @@ export const pubEddsaPemToJwk = ccf.crypto.pubEddsaPemToJwk;
  * @inheritDoc global!CCFCrypto.eddsaPemToJwk
  */
 export const eddsaPemToJwk = ccf.crypto.eddsaPemToJwk;
+/**
+ * @inheritDoc global!CCFCrypto.pubJwkToPem
+ */
+export const pubJwkToPem = ccf.crypto.pubJwkToPem;
+/**
+ * @inheritDoc global!CCFCrypto.JwkToPem
+ */
+export const jwkToPem = ccf.crypto.jwkToPem;
+/**
+ * @inheritDoc global!CCFCrypto.pubRsaJwkToPem
+ */
+export const pubRsaJwkToPem = ccf.crypto.pubRsaJwkToPem;
+/**
+ * @inheritDoc global!CCFCrypto.rsaJwkToPem
+ */
+export const rsaJwkToPem = ccf.crypto.rsaJwkToPem;
+/**
+ * @inheritDoc global!CCFCrypto.pubEddsaJwkToPem
+ */
+export const pubEddsaJwkToPem = ccf.crypto.pubEddsaJwkToPem;
+/**
+ * @inheritDoc global!CCFCrypto.eddsaJwkToPem
+ */
+export const eddsaJwkToPem = ccf.crypto.eddsaJwkToPem;

package/global.d.ts

@@ -360,7 +360,7 @@ export interface CCFCrypto {
      * @param pem EdDSA public key as PEM
      * @param kid Key identifier (optional)
      */
-    pubEddsaPemToJwk(pem: string, kid?: string): JsonWebKeyEdDSAPrivate;
+    pubEddsaPemToJwk(pem: string, kid?: string): JsonWebKeyEdDSAPublic;
     /**
      * Converts an EdDSA private key as PEM to JSON Web Key (JWK) object.
      * Currently only Curve25519 is supported.
@@ -369,6 +369,44 @@ export interface CCFCrypto {
      * @param kid Key identifier (optional)
      */
     eddsaPemToJwk(pem: string, kid?: string): JsonWebKeyEdDSAPrivate;
+    /**
+     * Converts an elliptic curve public key as JSON Web Key (JWK) object to PEM.
+     *
+     * @param jwk Elliptic curve public key as JWK
+     */
+    pubJwkToPem(jwk: JsonWebKeyECPublic): string;
+    /**
+     * Converts an elliptic curve private key as JSON Web Key (JWK) object to PEM.
+     *
+     * @param pem Elliptic curve private key as JWK
+     */
+    jwkToPem(jwk: JsonWebKeyECPrivate): string;
+    /**
+     * Converts an RSA public key as JSON Web Key (JWK) object to PEM.
+     *
+     * @param pem RSA public key as JWK
+     */
+    pubRsaJwkToPem(jwk: JsonWebKeyRSAPublic): string;
+    /**
+     * Converts an RSA private key as JSON Web Key (JWK) object to PEM.
+     *
+     * @param pem RSA private key as JWK
+     */
+    rsaJwkToPem(jwk: JsonWebKeyRSAPrivate): string;
+    /**
+     * Converts an EdDSA public key as JSON Web Key (JWK) object to PEM.
+     * Currently only Curve25519 is supported.
+     *
+     * @param pem EdDSA public key as JWK
+     */
+    pubEddsaJwkToPem(jwk: JsonWebKeyEdDSAPublic): string;
+    /**
+     * Converts an EdDSA private key as JSON Web Key (JWK) object to PEM.
+     * Currently only Curve25519 is supported.
+     *
+     * @param pem EdDSA private key as JWK
+     */
+    eddsaJwkToPem(jwk: JsonWebKeyEdDSAPrivate): string;
 }
 export interface CCFRpc {
     /**
@@ -521,6 +559,16 @@ export interface CCF {
      */
     historicalState?: HistoricalState;
     historical: CCFHistorical;
+    /**
+     * Toggles implementation of Date global API between using untrusted host time
+     * and returning 0 (default).
+     *
+     * Returns previous value, allowing a global default to be maintained.
+     *
+     * @param enable If true, then subsequent calls to Date.now() will return untrusted
+     * host time
+     */
+    enableUntrustedDateTime(enable: boolean): boolean;
 }
 export declare const openenclave: OpenEnclave;
 export interface EvidenceClaims {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/ccf-app",
-  "version": "4.0.0-dev3",
+  "version": "4.0.0-dev4",
   "description": "CCF app support package",
   "main": "index.js",
   "files": [

package/polyfill.js

@@ -325,13 +325,8 @@ class CCFPolyfill {
                 const jwk = key.export({
                     format: "jwk",
                 });
-                return {
-                    crv: jwk.crv,
-                    x: jwk.x,
-                    y: jwk.y,
-                    kty: jwk.kty,
-                    kid: kid,
-                };
+                jwk.kid = kid;
+                return jwk;
             },
             pemToJwk(pem, kid) {
                 const key = jscrypto.createPrivateKey({
@@ -340,14 +335,8 @@ class CCFPolyfill {
                 const jwk = key.export({
                     format: "jwk",
                 });
-                return {
-                    d: jwk.d,
-                    crv: jwk.crv,
-                    x: jwk.x,
-                    y: jwk.y,
-                    kty: jwk.kty,
-                    kid: kid,
-                };
+                jwk.kid = kid;
+                return jwk;
             },
             pubRsaPemToJwk(pem, kid) {
                 const key = jscrypto.createPublicKey({
@@ -356,12 +345,8 @@ class CCFPolyfill {
                 const jwk = key.export({
                     format: "jwk",
                 });
-                return {
-                    n: jwk.n,
-                    e: jwk.e,
-                    kty: jwk.kty,
-                    kid: kid,
-                };
+                jwk.kid = kid;
+                return jwk;
             },
             rsaPemToJwk(pem, kid) {
                 const key = jscrypto.createPrivateKey({
@@ -370,18 +355,8 @@ class CCFPolyfill {
                 const jwk = key.export({
                     format: "jwk",
                 });
-                return {
-                    d: jwk.d,
-                    p: jwk.p,
-                    q: jwk.d,
-                    dp: jwk.dp,
-                    dq: jwk.dq,
-                    qi: jwk.qi,
-                    n: jwk.n,
-                    e: jwk.e,
-                    kty: jwk.kty,
-                    kid: kid,
-                };
+                jwk.kid = kid;
+                return jwk;
             },
             pubEddsaPemToJwk(pem, kid) {
                 const key = jscrypto.createPublicKey({
@@ -390,12 +365,8 @@ class CCFPolyfill {
                 const jwk = key.export({
                     format: "jwk",
                 });
-                return {
-                    crv: jwk.crv,
-                    x: jwk.x,
-                    kty: jwk.kty,
-                    kid: kid,
-                };
+                jwk.kid = kid;
+                return jwk;
             },
             eddsaPemToJwk(pem, kid) {
                 const key = jscrypto.createPrivateKey({
@@ -404,13 +375,50 @@ class CCFPolyfill {
                 const jwk = key.export({
                     format: "jwk",
                 });
-                return {
-                    crv: jwk.crv,
-                    x: jwk.x,
-                    d: jwk.d,
-                    kty: jwk.kty,
-                    kid: kid,
-                };
+                jwk.kid = kid;
+                return jwk;
+            },
+            pubJwkToPem(jwk) {
+                const key = jscrypto.createPublicKey({
+                    key: jwk,
+                    format: "jwk",
+                });
+                return key.export({ type: "spki", format: "pem" }).toString();
+            },
+            jwkToPem(jwk) {
+                const key = jscrypto.createPrivateKey({
+                    key: jwk,
+                    format: "jwk",
+                });
+                return key.export({ type: "pkcs8", format: "pem" }).toString();
+            },
+            pubRsaJwkToPem(jwk) {
+                const key = jscrypto.createPublicKey({
+                    key: jwk,
+                    format: "jwk",
+                });
+                return key.export({ type: "spki", format: "pem" }).toString();
+            },
+            rsaJwkToPem(jwk) {
+                const key = jscrypto.createPrivateKey({
+                    key: jwk,
+                    format: "jwk",
+                });
+                return key.export({ type: "pkcs8", format: "pem" }).toString();
+            },
+            pubEddsaJwkToPem(jwk) {
+                const key = jscrypto.createPublicKey({
+                    key: jwk,
+                    format: "jwk",
+                });
+                return key.export({ type: "spki", format: "pem" }).toString();
+            },
+            eddsaJwkToPem(jwk) {
+                const key = jscrypto.createPrivateKey({
+                    key: jwk,
+                    format: "jwk",
+                });
+                return key.export({ type: "pkcs8", format: "pem" }).toString();
             },
         };
     }
@@ -447,6 +455,9 @@ class CCFPolyfill {
     isValidX509CertChain(chain, trusted) {
         return this.crypto.isValidX509CertChain(chain, trusted);
     }
+    enableUntrustedDateTime(enable) {
+        throw new Error("Not implemented");
+    }
 }
 globalThis.ccf = new CCFPolyfill();
 class OpenEnclavePolyfill {