Skip to content

Commit 005e3db

Browse files
karlw00tdavid-koenig
authored andcommitted
doc updates and typos (#346)
* doc updates and typos * Update materials.h Reverting change from "materials providers" to "material provider" * A bit more cleanup of doxygen comments * Fixes from PR review * Remove absolute paths from doxygen docs * Clarification of base init function comments
1 parent b8e0fd9 commit 005e3db

File tree

6 files changed

+18
-17
lines changed

6 files changed

+18
-17
lines changed

doxygen/doxygen.config.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ABBREVIATE_BRIEF = "The $name class" \
2727
the
2828
ALWAYS_DETAILED_SEC = NO
2929
INLINE_INHERITED_MEMB = NO
30-
FULL_PATH_NAMES = YES
30+
FULL_PATH_NAMES = NO
3131
STRIP_FROM_PATH =
3232
STRIP_FROM_INC_PATH =
3333
SHORT_NAMES = NO

include/aws/cryptosdk/edk.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ extern "C" {
4747
#endif
4848

4949
/**
50-
* Deallocates all memory associated with an EDK. Setting all bytes of EDK to
51-
* zero upon creation will make this safe to call even if some buffers are unused.
50+
* Deallocates all memory associated with an EDK. Setting all bytes of an EDK to
51+
* zero when you declare it will make this safe to call even if some buffers are unused.
5252
*/
5353
AWS_CRYPTOSDK_API
5454
void aws_cryptosdk_edk_clean_up(struct aws_cryptosdk_edk *edk);

include/aws/cryptosdk/header.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
/**
2020
* @ingroup session
2121
* Known algorithm suite names.
22-
* These follow the format:
23-
* [cipher algorithm]_IV[iv length]_AUTH[authtag length]_KD[KDF algorithm]_SIG[Signature algorithm, or NONE]
22+
* For more information, see the <a
23+
* href="https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/algorithms-reference.html">Algorithms
24+
* Reference</a>.
2425
*/
2526
enum aws_cryptosdk_alg_id {
2627
ALG_AES256_GCM_IV12_TAG16_HKDF_SHA384_ECDSA_P384 = 0x0378,

include/aws/cryptosdk/materials.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ struct aws_cryptosdk_cmm_vt {
325325
};
326326

327327
/**
328-
* Initialize the base structure for a CMM. This should be called by the /implementation/ of a CMM, to set up the
328+
* Initialize the base structure for a CMM. The implementation of a CMM needs to call this function to set up the
329329
* vtable and reference count. On return, the reference count is initialized to 1.
330330
*/
331331
AWS_CRYPTOSDK_STATIC_INLINE void aws_cryptosdk_cmm_base_init(
@@ -336,7 +336,7 @@ AWS_CRYPTOSDK_STATIC_INLINE void aws_cryptosdk_cmm_base_init(
336336

337337
/**
338338
* @ingroup cmm_kr_highlevel
339-
* Decrements the reference count on the CMM; if the new reference count is zero, the CMM is destroyed.
339+
* Decrements the reference count on the CMM. If the new reference count is zero, the CMM is destroyed.
340340
*/
341341
AWS_CRYPTOSDK_STATIC_INLINE void aws_cryptosdk_cmm_release(struct aws_cryptosdk_cmm *cmm) {
342342
if (cmm && aws_cryptosdk_private_refcount_down(&cmm->refcount)) {
@@ -346,7 +346,7 @@ AWS_CRYPTOSDK_STATIC_INLINE void aws_cryptosdk_cmm_release(struct aws_cryptosdk_
346346

347347
/**
348348
* @ingroup cmm_kr_highlevel
349-
* Increments the reference count on the cmm.
349+
* Increments the reference count on the CMM.
350350
*/
351351
AWS_CRYPTOSDK_STATIC_INLINE struct aws_cryptosdk_cmm *aws_cryptosdk_cmm_retain(struct aws_cryptosdk_cmm *cmm) {
352352
aws_cryptosdk_private_refcount_up(&cmm->refcount);
@@ -440,8 +440,8 @@ struct aws_cryptosdk_keyring_vt {
440440
};
441441

442442
/**
443-
* Initialize the base structure for a keyring. This should be called by the /implementation/ of a keyring, to set up
444-
* the vtable and reference count. On return, the reference count is initialized to 1.
443+
* Initialize the base structure for a keyring. The implementation of a keyring needs to call this function
444+
* to set up the vtable and reference count. On return, the reference count is initialized to 1.
445445
*/
446446
AWS_CRYPTOSDK_STATIC_INLINE void aws_cryptosdk_keyring_base_init(
447447
struct aws_cryptosdk_keyring *keyring, const struct aws_cryptosdk_keyring_vt *vtable) {

include/aws/cryptosdk/session.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,16 @@ int aws_cryptosdk_session_set_frame_size(struct aws_cryptosdk_session *session,
100100

101101
/**
102102
* Sets the precise size of the message to encrypt. This function must be
103-
* called exactly once during an encrypt operation; it need not be called
103+
* called exactly once during an encrypt operation. You do not need to call it
104104
* before beginning to pass data, but providing the message size up front may
105105
* improve efficiency.
106106
*
107107
* If the session has already processed more than message_size bytes, or if this
108108
* method is called more than once, the session will enter an error state.
109109
*
110-
* This method is how the end of data is determined; if this is not called, then
111-
* process will be unable to write out the end-of-message frames (and instead will
112-
* continue to request additional data).
110+
* This method is how the end of data is determined. If this is not called,
111+
* @ref aws_cryptosdk_session_process cannot write the end-of-message
112+
* frames and instead will continue to expect additional data.
113113
*
114114
* Note that if the frame size is set to zero (i.e. this is a one-shot encrypt),
115115
* a message size must be set before any input data can be processed.
@@ -121,7 +121,7 @@ int aws_cryptosdk_session_set_message_size(struct aws_cryptosdk_session *session
121121
* Provides an upper bound on the message size. This hint is useful when the exact
122122
* message size is not known up-front, but the configured CMM still needs to make use
123123
* of message size information. For example, the caching CMM enforces an upper bound
124-
* on the number of bytes encrypted under a cached key; if this method is not called,
124+
* on the number of bytes encrypted under a cached key. If this method is not called,
125125
* it must assume that you are processing an unbounded amount of data, and it will
126126
* therefore bypass the cache.
127127
*

include/aws/cryptosdk/version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
* the AWS Encryption SDKs in all languages, see the
2727
* <a href="https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/introduction.html">Developer Guide</a>.
2828
*
29-
* <b>This library is currently under public preview.</b>
29+
* <b>This library is currently in public preview.</b>
3030
* Feel free to check out the code and give it a spin, but be aware that the APIs are still in flux.
3131
* We'd love to hear your feedback on the APIs before they're fully nailed down.
3232
*
33-
* Source code and installation instructions are avaiable in
33+
* Source code and installation instructions are available in
3434
* <a href="https://github.com/awslabs/aws-encryption-sdk-c">the GitHub repository</a>.
3535
*
3636
*

0 commit comments

Comments
 (0)