Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(287)

Side by Side Diff: Source/modules/crypto/Key.h

Issue 170243007: [webcrypto] Make all of the crypto.subtle method failures asynchronous. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « LayoutTests/crypto/wrap-unwrap-expected.txt ('k') | Source/modules/crypto/Key.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 25 matching lines...) Expand all
36 #include "modules/crypto/NormalizeAlgorithm.h" 36 #include "modules/crypto/NormalizeAlgorithm.h"
37 #include "public/platform/WebCryptoKey.h" 37 #include "public/platform/WebCryptoKey.h"
38 #include "wtf/Forward.h" 38 #include "wtf/Forward.h"
39 #include "wtf/PassRefPtr.h" 39 #include "wtf/PassRefPtr.h"
40 #include "wtf/RefCounted.h" 40 #include "wtf/RefCounted.h"
41 #include "wtf/text/WTFString.h" 41 #include "wtf/text/WTFString.h"
42 42
43 namespace WebCore { 43 namespace WebCore {
44 44
45 class Algorithm; 45 class Algorithm;
46 class ExceptionState; 46 class CryptoResult;
47 47
48 class Key : public RefCountedWillBeGarbageCollectedFinalized<Key>, public Scrip tWrappable { 48 class Key : public RefCountedWillBeGarbageCollectedFinalized<Key>, public Scrip tWrappable {
49 DECLARE_GC_INFO; 49 DECLARE_GC_INFO;
50 public: 50 public:
51 static PassRefPtrWillBeRawPtr<Key> create(const blink::WebCryptoKey& key) 51 static PassRefPtrWillBeRawPtr<Key> create(const blink::WebCryptoKey& key)
52 { 52 {
53 return adoptRefWillBeNoop(new Key(key)); 53 return adoptRefWillBeNoop(new Key(key));
54 } 54 }
55 55
56 ~Key(); 56 ~Key();
57 57
58 String type() const; 58 String type() const;
59 bool extractable() const; 59 bool extractable() const;
60 Algorithm* algorithm(); 60 Algorithm* algorithm();
61 Vector<String> usages() const; 61 Vector<String> usages() const;
62 62
63 const blink::WebCryptoKey& key() const { return m_key; } 63 const blink::WebCryptoKey& key() const { return m_key; }
64 64
65 // If the key cannot be used with the indicated algorithm, returns false 65 // If the key cannot be used with the indicated algorithm, returns false
66 // and fills the provided String with error details. 66 // and completes the CryptoResult with an error.
67 bool canBeUsedForAlgorithm(const blink::WebCryptoAlgorithm&, AlgorithmOperat ion, String&) const; 67 bool canBeUsedForAlgorithm(const blink::WebCryptoAlgorithm&, AlgorithmOperat ion, CryptoResult*) const;
68 68
69 static bool parseFormat(const String&, blink::WebCryptoKeyFormat&, Exception State&); 69 // On failure, these return false and complete the CryptoResult with an erro r.
70 static bool parseUsageMask(const Vector<String>&, blink::WebCryptoKeyUsageMa sk&, ExceptionState&); 70 static bool parseFormat(const String&, blink::WebCryptoKeyFormat&, CryptoRes ult*);
71 static bool parseUsageMask(const Vector<String>&, blink::WebCryptoKeyUsageMa sk&, CryptoResult*);
71 72
72 void trace(Visitor*); 73 void trace(Visitor*);
73 74
74 protected: 75 protected:
75 explicit Key(const blink::WebCryptoKey&); 76 explicit Key(const blink::WebCryptoKey&);
76 77
77 const blink::WebCryptoKey m_key; 78 const blink::WebCryptoKey m_key;
78 RefPtrWillBeMember<Algorithm> m_algorithm; 79 RefPtrWillBeMember<Algorithm> m_algorithm;
79 }; 80 };
80 81
81 } // namespace WebCore 82 } // namespace WebCore
82 83
83 #endif 84 #endif
OLDNEW
« no previous file with comments | « LayoutTests/crypto/wrap-unwrap-expected.txt ('k') | Source/modules/crypto/Key.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698