diff --git a/crypto/doc/api.rst b/crypto/doc/api.rst
index 81415c3d0c..d642187239 100644
--- a/crypto/doc/api.rst
+++ b/crypto/doc/api.rst
@@ -100,7 +100,7 @@ KMU/KDR APIs
 
 
 .. _crypto_api_nrf_oberon:
-   
+
 nrf_oberon crypto library
 *************************
 
@@ -115,6 +115,20 @@ AES - Advanced Encryption Standard APIs
    :project: nrfxlib
    :members:
 
+AES-CBC - AES Cipher Block Chaining Mode
+--------------------------
+
+.. doxygengroup:: ocrypto_aes_cbc
+   :project: nrfxlib
+   :members:
+
+AES-CBC - AES CCipher Block Chaining Mode with PKCS7 padding
+--------------------------
+
+.. doxygengroup:: ocrypto_aes_cbc_pkcs7
+   :project: nrfxlib
+   :members:
+
 AES-CTR - AES Counter Mode
 --------------------------
 
@@ -129,6 +143,27 @@ AES EAX APIs
    :project: nrfxlib
    :members:
 
+AES-CBC - AES Electronic Code Book Mode
+--------------------------
+
+.. doxygengroup:: ocrypto_aes_ecb
+   :project: nrfxlib
+   :members:
+
+AES-CCM - AES Cipher-based Message Authentication Code
+--------------------------
+
+.. doxygengroup:: ocrypto_aes_cmac
+   :project: nrfxlib
+   :members:
+
+AES-CCM - AES Counter with CBC-MAC Mode
+--------------------------
+
+.. doxygengroup:: ocrypto_aes_ccm
+   :project: nrfxlib
+   :members:
+
 AES GCM - AES Galois/Counter Mode APIs
 --------------------------------------
 
@@ -171,6 +206,13 @@ Constant time APIs
    :project: nrfxlib
    :members:
 
+ECC secp224r1 low-level APIs
+============================
+
+.. doxygengroup:: ocrypto_p224
+   :project: nrfxlib
+   :members:
+
 ECC secp256r1 low-level APIs
 ============================
 
@@ -188,26 +230,45 @@ ECC Curve25519 low-level APIs
 ECDH APIs
 =========
 
-.. doxygengroup:: ocrypto_ecdh_p256
+.. doxygengroup:: ocrypto_ecdh_p224
    :project: nrfxlib
    :members:
 
-.. doxygengroup:: ocrypto_ecdh_p224
+.. doxygengroup:: ocrypto_ecdh_p256
    :project: nrfxlib
    :members:
 
+.. doxygengroup:: ocrypto_ecdh_p384
+   :project: nrfxlib
+   :members:
 
 ECDSA APIs
 ==========
 
+.. doxygengroup:: ocrypto_ecdsa_p224
+   :project: nrfxlib
+   :members:
+
 .. doxygengroup:: ocrypto_ecdsa_p256
    :project: nrfxlib
    :members:
 
-.. doxygengroup:: ocrypto_ecdsa_p224
+.. doxygengroup:: ocrypto_ecdsa_p384
+   :project: nrfxlib
+   :members:
+
+.. doxygengroup:: ocrypto_ecdsa_p521
    :project: nrfxlib
    :members:
 
+EC-JPAKE APIs
+=============
+
+.. doxygengroup:: ocrypto_ecjpake
+   :project: nrfxlib
+   :members:
+
+
 Ed25519 APIs
 =============
 
@@ -215,6 +276,10 @@ Ed25519 APIs
    :project: nrfxlib
    :members:
 
+.. doxygengroup:: ocrypto_ed25519ph
+   :project: nrfxlib
+   :members:
+
 HKDF - HMAC based Key Derivation Function
 =========================================
 
@@ -257,26 +322,47 @@ HMAC APIs using SHA-512
    :project: nrfxlib
    :members:
 
+PBKDF2 APIs
+===========
+
+.. doxygengroup:: ocrypto_pbkdf2
+   :project: nrfxlib
+   :members:
+
 RSA - Rivest-Shamir-Adleman algorithm
 =====================================
 
 .. doxygengroup:: ocrypto_rsa
    :project: nrfxlib
-   :members:   
+   :members:
 
 RSA APIs
 --------
 
 .. doxygengroup:: ocrypto_rsa_api
    :project: nrfxlib
-   :members:   
+   :members:
 
 RSA key APIs
 ------------
 
 .. doxygengroup:: ocrypto_rsa_key
    :project: nrfxlib
-   :members:   
+   :members:
+
+SHA-1 APIs
+============
+
+.. doxygengroup:: ocrypto_sha_1
+   :project: nrfxlib
+   :members:
+
+SHA-224 APIs
+============
+
+.. doxygengroup:: ocrypto_sha_224
+   :project: nrfxlib
+   :members:
 
 SHA-256 APIs
 ============
@@ -285,6 +371,13 @@ SHA-256 APIs
    :project: nrfxlib
    :members:
 
+SHA-256 APIs
+============
+
+.. doxygengroup:: ocrypto_sha_384
+   :project: nrfxlib
+   :members:
+
 SHA-512 APIs
 ============
 
@@ -292,6 +385,13 @@ SHA-512 APIs
    :project: nrfxlib
    :members:
 
+SPAKE2+ APIs
+=================================
+
+.. doxygengroup:: ocrypto_spake2p
+   :project: nrfxlib
+   :members:
+
 SRP - Secure Remote Password APIs
 =================================
 
@@ -305,3 +405,10 @@ SRPT - Secure Real-Time Transport Protocol APIs
 .. doxygengroup:: ocrypto_srtp
    :project: nrfxlib
    :members:
+
+ocrypto internal types
+======================
+
+.. doxygengroup:: ocrypto_types
+   :project: nrfxlib
+   :members: