diff --git a/src/libsodium/crypto_hash/sha256/cp/hash_sha256_cp.c b/src/libsodium/crypto_hash/sha256/cp/hash_sha256_cp.c
index 394c3914..5fa89242 100644
--- a/src/libsodium/crypto_hash/sha256/cp/hash_sha256_cp.c
+++ b/src/libsodium/crypto_hash/sha256/cp/hash_sha256_cp.c
@@ -37,6 +37,11 @@
 #include "private/common.h"
 #include "utils.h"
 
+#if defined(__aarch64__) && defined(__ARM_FEATURE_SHA2)
+# define HAVE_SHA256_ARMCRYPTO 1
+# include <arm_neon.h>
+#endif
+
 static void
 be32enc_vect(unsigned char *dst, const uint32_t *src, size_t len)
 {
@@ -47,6 +52,158 @@ be32enc_vect(unsigned char *dst, const uint32_t *src, size_t len)
     }
 }
 
+#ifdef HAVE_SHA256_ARMCRYPTO
+
+static const uint32_t Krnd[64] = {
+    0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1,
+    0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
+    0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786,
+    0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+    0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147,
+    0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
+    0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, 0xa2bfe8a1, 0xa81a664b,
+    0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+    0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a,
+    0x5b9cca4f, 0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
+    0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
+};
+
+static void
+SHA256_Transform(uint32_t state[8], const uint8_t block[64], uint32_t W[64],
+                 uint32_t S[8])
+{
+    uint32x4_t STATE0, STATE1;
+    uint32x4_t ABCD_SAVE, EFGH_SAVE;
+    uint32x4_t MSG0, MSG1, MSG2, MSG3;
+    uint32x4_t TMP0, TMP1, TMP2;
+
+    (void) W;
+    (void) S;
+
+    STATE0 = vld1q_u32(&state[0]);
+    STATE1 = vld1q_u32(&state[4]);
+
+    ABCD_SAVE = STATE0;
+    EFGH_SAVE = STATE1;
+
+    MSG0 = vreinterpretq_u32_u8(vrev32q_u8(vld1q_u8(&block[0])));
+    MSG1 = vreinterpretq_u32_u8(vrev32q_u8(vld1q_u8(&block[16])));
+    MSG2 = vreinterpretq_u32_u8(vrev32q_u8(vld1q_u8(&block[32])));
+    MSG3 = vreinterpretq_u32_u8(vrev32q_u8(vld1q_u8(&block[48])));
+
+    TMP0 = vaddq_u32(MSG0, vld1q_u32(&Krnd[0]));
+    TMP2 = STATE0;
+    STATE0 = vsha256hq_u32(STATE0, STATE1, TMP0);
+    STATE1 = vsha256h2q_u32(STATE1, TMP2, TMP0);
+    MSG0 = vsha256su0q_u32(MSG0, MSG1);
+
+    TMP1 = vaddq_u32(MSG1, vld1q_u32(&Krnd[4]));
+    TMP2 = STATE0;
+    STATE0 = vsha256hq_u32(STATE0, STATE1, TMP1);
+    STATE1 = vsha256h2q_u32(STATE1, TMP2, TMP1);
+    MSG0 = vsha256su1q_u32(MSG0, MSG2, MSG3);
+    MSG1 = vsha256su0q_u32(MSG1, MSG2);
+
+    TMP0 = vaddq_u32(MSG2, vld1q_u32(&Krnd[8]));
+    TMP2 = STATE0;
+    STATE0 = vsha256hq_u32(STATE0, STATE1, TMP0);
+    STATE1 = vsha256h2q_u32(STATE1, TMP2, TMP0);
+    MSG1 = vsha256su1q_u32(MSG1, MSG3, MSG0);
+    MSG2 = vsha256su0q_u32(MSG2, MSG3);
+
+    TMP1 = vaddq_u32(MSG3, vld1q_u32(&Krnd[12]));
+    TMP2 = STATE0;
+    STATE0 = vsha256hq_u32(STATE0, STATE1, TMP1);
+    STATE1 = vsha256h2q_u32(STATE1, TMP2, TMP1);
+    MSG2 = vsha256su1q_u32(MSG2, MSG0, MSG1);
+    MSG3 = vsha256su0q_u32(MSG3, MSG0);
+
+    TMP0 = vaddq_u32(MSG0, vld1q_u32(&Krnd[16]));
+    TMP2 = STATE0;
+    STATE0 = vsha256hq_u32(STATE0, STATE1, TMP0);
+    STATE1 = vsha256h2q_u32(STATE1, TMP2, TMP0);
+    MSG3 = vsha256su1q_u32(MSG3, MSG1, MSG2);
+    MSG0 = vsha256su0q_u32(MSG0, MSG1);
+
+    TMP1 = vaddq_u32(MSG1, vld1q_u32(&Krnd[20]));
+    TMP2 = STATE0;
+    STATE0 = vsha256hq_u32(STATE0, STATE1, TMP1);
+    STATE1 = vsha256h2q_u32(STATE1, TMP2, TMP1);
+    MSG0 = vsha256su1q_u32(MSG0, MSG2, MSG3);
+    MSG1 = vsha256su0q_u32(MSG1, MSG2);
+
+    TMP0 = vaddq_u32(MSG2, vld1q_u32(&Krnd[24]));
+    TMP2 = STATE0;
+    STATE0 = vsha256hq_u32(STATE0, STATE1, TMP0);
+    STATE1 = vsha256h2q_u32(STATE1, TMP2, TMP0);
+    MSG1 = vsha256su1q_u32(MSG1, MSG3, MSG0);
+    MSG2 = vsha256su0q_u32(MSG2, MSG3);
+
+    TMP1 = vaddq_u32(MSG3, vld1q_u32(&Krnd[28]));
+    TMP2 = STATE0;
+    STATE0 = vsha256hq_u32(STATE0, STATE1, TMP1);
+    STATE1 = vsha256h2q_u32(STATE1, TMP2, TMP1);
+    MSG2 = vsha256su1q_u32(MSG2, MSG0, MSG1);
+    MSG3 = vsha256su0q_u32(MSG3, MSG0);
+
+    TMP0 = vaddq_u32(MSG0, vld1q_u32(&Krnd[32]));
+    TMP2 = STATE0;
+    STATE0 = vsha256hq_u32(STATE0, STATE1, TMP0);
+    STATE1 = vsha256h2q_u32(STATE1, TMP2, TMP0);
+    MSG3 = vsha256su1q_u32(MSG3, MSG1, MSG2);
+    MSG0 = vsha256su0q_u32(MSG0, MSG1);
+
+    TMP1 = vaddq_u32(MSG1, vld1q_u32(&Krnd[36]));
+    TMP2 = STATE0;
+    STATE0 = vsha256hq_u32(STATE0, STATE1, TMP1);
+    STATE1 = vsha256h2q_u32(STATE1, TMP2, TMP1);
+    MSG0 = vsha256su1q_u32(MSG0, MSG2, MSG3);
+    MSG1 = vsha256su0q_u32(MSG1, MSG2);
+
+    TMP0 = vaddq_u32(MSG2, vld1q_u32(&Krnd[40]));
+    TMP2 = STATE0;
+    STATE0 = vsha256hq_u32(STATE0, STATE1, TMP0);
+    STATE1 = vsha256h2q_u32(STATE1, TMP2, TMP0);
+    MSG1 = vsha256su1q_u32(MSG1, MSG3, MSG0);
+    MSG2 = vsha256su0q_u32(MSG2, MSG3);
+
+    TMP1 = vaddq_u32(MSG3, vld1q_u32(&Krnd[44]));
+    TMP2 = STATE0;
+    STATE0 = vsha256hq_u32(STATE0, STATE1, TMP1);
+    STATE1 = vsha256h2q_u32(STATE1, TMP2, TMP1);
+    MSG2 = vsha256su1q_u32(MSG2, MSG0, MSG1);
+    MSG3 = vsha256su0q_u32(MSG3, MSG0);
+
+    TMP0 = vaddq_u32(MSG0, vld1q_u32(&Krnd[48]));
+    TMP2 = STATE0;
+    STATE0 = vsha256hq_u32(STATE0, STATE1, TMP0);
+    STATE1 = vsha256h2q_u32(STATE1, TMP2, TMP0);
+    MSG3 = vsha256su1q_u32(MSG3, MSG1, MSG2);
+
+    TMP1 = vaddq_u32(MSG1, vld1q_u32(&Krnd[52]));
+    TMP2 = STATE0;
+    STATE0 = vsha256hq_u32(STATE0, STATE1, TMP1);
+    STATE1 = vsha256h2q_u32(STATE1, TMP2, TMP1);
+
+    TMP0 = vaddq_u32(MSG2, vld1q_u32(&Krnd[56]));
+    TMP2 = STATE0;
+    STATE0 = vsha256hq_u32(STATE0, STATE1, TMP0);
+    STATE1 = vsha256h2q_u32(STATE1, TMP2, TMP0);
+
+    TMP1 = vaddq_u32(MSG3, vld1q_u32(&Krnd[60]));
+    TMP2 = STATE0;
+    STATE0 = vsha256hq_u32(STATE0, STATE1, TMP1);
+    STATE1 = vsha256h2q_u32(STATE1, TMP2, TMP1);
+
+    STATE0 = vaddq_u32(STATE0, ABCD_SAVE);
+    STATE1 = vaddq_u32(STATE1, EFGH_SAVE);
+
+    vst1q_u32(&state[0], STATE0);
+    vst1q_u32(&state[4], STATE1);
+}
+
+#else
+
 static void
 be32dec_vect(uint32_t *dst, const unsigned char *src, size_t len)
 {
@@ -144,6 +301,8 @@ SHA256_Transform(uint32_t state[8], const uint8_t block[64], uint32_t W[64],
     }
 }
 
+#endif
+
 static const uint8_t PAD[64] = { 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                                  0,    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                                  0,    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,