Skip to content

Commit

Permalink
-a
Browse files Browse the repository at this point in the history
  • Loading branch information
@bkanui
bkanui committed Jan 31, 2024
1 parent 78bf2ff commit b218db6
Show file tree
Hide file tree
Showing 133 changed files with 125 additions and 158 deletions.
4 changes: 0 additions & 4 deletions content/Developer_Program/Guides/Securing_Web_Services_with_OTP.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@ Developers looking to add OTP support will need to implement an OTP validation s

[Note]
======
<<<<<<< HEAD
Yubico has declared end-of-life of YubiKey Validation Server (YK-VAL) and YubiKey Key Storage Module (YK-KSM). These have been moved to link://github.com/YubicoLabs/yubikey-ksm[YubicoLabs] as a reference architecture. See article, link:/support.yubico.com/hc/en-us/articles/360021227000[YK-VAL, YK-KSM and YubiHSM 1 End-of-Life].
=======
Yubico has declared end-of-life for the YubiKey Validation Server (YK-VAL) and YubiKey Key Storage Module (YK-KSM). These have been moved to link://github.com/YubicoLabs/yubikey-ksm[YubicoLabs] as a reference architecture. See article, link:/support.yubico.com/hc/en-us/articles/360021227000[YK-VAL, YK-KSM and YubiHSM 1 End-of-Life].
>>>>>>> 456647ee9dcca05aafc4d68935558d154423db61
======


Expand Down
4 changes: 0 additions & 4 deletions content/Developer_Program/Guides/Touch_triggered_OTP.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,7 @@ The Yubico OTP, like other OTPs, was designed to be used as a second factor auth

[Note]
======
<<<<<<< HEAD
Yubico has declared end-of-life of YubiKey Validation Server (YK-VAL) and YubiKey Key Storage Module (YK-KSM). These have been moved to link://github.com/YubicoLabs/yubikey-ksm[YubicoLabs] as a reference architecture. See article, link:/support.yubico.com/hc/en-us/articles/360021227000[YK-VAL, YK-KSM and YubiHSM 1 End-of-Life].
=======
Yubico has declared end-of-life for the YubiKey Validation Server (YK-VAL) and YubiKey Key Storage Module (YK-KSM). These have been moved to link://github.com/YubicoLabs/yubikey-ksm[YubicoLabs] as a reference architecture. See article, link:/support.yubico.com/hc/en-us/articles/360021227000[YK-VAL, YK-KSM and YubiHSM 1 End-of-Life].
>>>>>>> 456647ee9dcca05aafc4d68935558d154423db61
======


Expand Down
4 changes: 0 additions & 4 deletions content/OTP/Guides/Migrating_to_python-pyhsm.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@

[Note]
======
<<<<<<< HEAD
Yubico has declared end-of-life of YubiKey Validation Server (YK-VAL) and YubiKey Key Storage Module (YK-KSM). These have been moved to link://github.com/YubicoLabs/yubikey-ksm[YubicoLabs] as a reference architecture. See article, link:/support.yubico.com/hc/en-us/articles/360021227000[YK-VAL, YK-KSM and YubiHSM 1 End-of-Life].
=======
Yubico has declared end-of-life for the YubiKey Validation Server (YK-VAL) and YubiKey Key Storage Module (YK-KSM). These have been moved to link://github.com/YubicoLabs/yubikey-ksm[YubicoLabs] as a reference architecture. See article, link:/support.yubico.com/hc/en-us/articles/360021227000[YK-VAL, YK-KSM and YubiHSM 1 End-of-Life].
>>>>>>> 456647ee9dcca05aafc4d68935558d154423db61
======

This guide will take you through the steps needed to migrate from using the
Expand Down
4 changes: 0 additions & 4 deletions content/OTP/Guides/Self-hosted_OTP_validation.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@

[Note]
======
<<<<<<< HEAD
Yubico has declared end-of-life of YubiKey Validation Server (YK-VAL) and YubiKey Key Storage Module (YK-KSM). These have been moved to link://github.com/YubicoLabs/yubikey-ksm[YubicoLabs] as a reference architecture. See article, link:/support.yubico.com/hc/en-us/articles/360021227000[YK-VAL, YK-KSM and YubiHSM 1 End-of-Life].
=======
Yubico has declared end-of-life for the YubiKey Validation Server (YK-VAL) and YubiKey Key Storage Module (YK-KSM). These have been moved to link://github.com/YubicoLabs/yubikey-ksm[YubicoLabs] as a reference architecture. See article, link:/support.yubico.com/hc/en-us/articles/360021227000[YK-VAL, YK-KSM and YubiHSM 1 End-of-Life].
>>>>>>> 456647ee9dcca05aafc4d68935558d154423db61
======

This document will guide you through setting up a validation server for
Expand Down
4 changes: 0 additions & 4 deletions content/OTP/OTPs_Explained.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,7 @@ The private id field comprises 6 bytes copied from the private id field configur

[Note]
======
<<<<<<< HEAD
Yubico has declared end-of-life of YubiKey Validation Server (YK-VAL) and YubiKey Key Storage Module (YK-KSM). These have been moved to link://github.com/YubicoLabs/yubikey-ksm[YubicoLabs] as a reference architecture. See article, link:/support.yubico.com/hc/en-us/articles/360021227000[YK-VAL, YK-KSM and YubiHSM 1 End-of-Life].
=======
Yubico has declared end-of-life for the YubiKey Validation Server (YK-VAL) and YubiKey Key Storage Module (YK-KSM). These have been moved to link://github.com/YubicoLabs/yubikey-ksm[YubicoLabs] as a reference architecture. See article, link:/support.yubico.com/hc/en-us/articles/360021227000[YK-VAL, YK-KSM and YubiHSM 1 End-of-Life].
>>>>>>> 456647ee9dcca05aafc4d68935558d154423db61
======


Expand Down
4 changes: 0 additions & 4 deletions content/Software_Projects/Yubico_OTP/YubiCloud_Connector_Libraries/index.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@

[Note]
======
<<<<<<< HEAD
Yubico has declared end-of-life of YubiKey Validation Server (YK-VAL) and YubiKey Key Storage Module (YK-KSM). These have been moved to link://github.com/YubicoLabs/yubikey-ksm[YubicoLabs] as a reference architecture. See article, link:/support.yubico.com/hc/en-us/articles/360021227000[YK-VAL, YK-KSM and YubiHSM 1 End-of-Life].
=======
Yubico has declared end-of-life for the YubiKey Validation Server (YK-VAL) and YubiKey Key Storage Module (YK-KSM). These have been moved to link://github.com/YubicoLabs/yubikey-ksm[YubicoLabs] as a reference architecture. See article, link:/support.yubico.com/hc/en-us/articles/360021227000[YK-VAL, YK-KSM and YubiHSM 1 End-of-Life].
>>>>>>> 456647ee9dcca05aafc4d68935558d154423db61
======

These libraries help with connecting to the YubiCloud for Yubico OTP validation from a number of different programming languages. Learn how to use a connector library link:/OTP/Libraries/Using_a_library.html[here].
Expand Down
4 changes: 0 additions & 4 deletions content/Software_Projects/Yubico_OTP/YubiCloud_Validation_Servers/index.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@

[Note]
======
<<<<<<< HEAD
Yubico has declared end-of-life of YubiKey Validation Server (YK-VAL) and YubiKey Key Storage Module (YK-KSM). These have been moved to link://github.com/YubicoLabs/yubikey-ksm[YubicoLabs] as a reference architecture. See article, link:/support.yubico.com/hc/en-us/articles/360021227000[YK-VAL, YK-KSM and YubiHSM 1 End-of-Life].
=======
Yubico has declared end-of-life for the YubiKey Validation Server (YK-VAL) and YubiKey Key Storage Module (YK-KSM). These have been moved to link://github.com/YubicoLabs/yubikey-ksm[YubicoLabs] as a reference architecture. See article, link:https://support.yubico.com/hc/en-us/articles/360021227000[YK-VAL, YK-KSM and YubiHSM 1 End-of-Life].
>>>>>>> 456647ee9dcca05aafc4d68935558d154423db61
======

If you don't want to use YubiCloud, you can host one of these validation server(s) yourself.
Expand Down
4 changes: 0 additions & 4 deletions content/Software_Projects/Yubico_OTP/Yubico_OTP_Integration_Plug-ins/index.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,5 @@ Third party plugins can be discovered on link:https://github.com/search?q=yubico

[Note]
======
<<<<<<< HEAD
Yubico has declared end-of-life of YubiKey Validation Server (YK-VAL) and YubiKey Key Storage Module (YK-KSM). These have been moved to link://github.com/YubicoLabs/yubikey-ksm[YubicoLabs] as a reference architecture. See article, link:/support.yubico.com/hc/en-us/articles/360021227000[YK-VAL, YK-KSM and YubiHSM 1 End-of-Life].
=======
Yubico has declared end-of-life for the YubiKey Validation Server (YK-VAL) and YubiKey Key Storage Module (YK-KSM). These have been moved to link://github.com/YubicoLabs/yubikey-ksm[YubicoLabs] as a reference architecture. See article, link:/support.yubico.com/hc/en-us/articles/360021227000[YK-VAL, YK-KSM and YubiHSM 1 End-of-Life].
>>>>>>> 456647ee9dcca05aafc4d68935558d154423db61
======
2 changes: 1 addition & 1 deletion content/YubiHSM2/Backup_and_Restore/index.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
== Backup and Restore


**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Authenticate_Session.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== AUTHENTICATE SESSION

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Blink_Device.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== BLINK DEVICE

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Change_Authentication_Key.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== CHANGE AUTHENTICATION KEY

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Close_Session.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== CLOSE SESSION

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Create_Otp_Aead.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== CREATE OTP AEAD

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Create_Session.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== CREATE SESSION

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Decrypt_Aes_Cbc.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== DECRYPT AES CBC

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Decrypt_Aes_Ecb.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== DECRYPT AES ECB

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Decrypt_Oaep.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== DECRYPT OAEP

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Decrypt_Otp.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== DECRYPT OTP

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Decrypt_Pkcs1.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== DECRYPT PKCS1

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Delete_Object.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== DELETE OBJECT

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Derive_Ecdh.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== DERIVE ECDH

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Device_Info.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== DEVICE INFO

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Echo.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== ECHO

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Encrypt_Aes_Cbc.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== ENCRYPT AES CBC

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Encrypt_Aes_Ecb.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== ENCRYPT AES ECB

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Export_Wrapped.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== EXPORT WRAPPED

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Generate_Asymmetric_Key.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== GENERATE ASYMMETRIC KEY

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Generate_Hmac_Key.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== GENERATE HMAC KEY

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Generate_Otp_Aead_Key.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== GENERATE OTP AEAD KEY

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Generate_Symmetric_Key.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== GENERATE SYMMETRIC KEY

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Generate_Wrap_Key.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== GENERATE WRAP KEY

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Get_Device_Pubkey.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== GET DEVICE PUBLIC KEY

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Get_Log_Entries.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
== GET LOG ENTRIES


**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Get_Object_Info.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
== GET OBJECT INFO


**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Get_Opaque.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
== GET OPAQUE


**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Get_Option.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== GET OPTION

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Get_Pseudo_Random.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
== GET PSEUDO RANDOM


**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Get_Public_Key.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
== GET PUBLIC KEY


**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Get_Storage_Info.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
== GET STORAGE INFO


**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Get_Template.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== GET TEMPLATE

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Import_Wrapped.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== IMPORT WRAPPED

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/List_Objects.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
== LIST OBJECTS

**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Put_Asymmetric_Key.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
== PUT ASYMMETRIC KEY


**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
2 changes: 1 addition & 1 deletion content/YubiHSM2/Commands/Put_Authentication_Key.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
== PUT AUTHENTICATION KEY


**This content is deprecated. **
**This content is deprecated.**

For current content see:

Expand Down
Loading

0 comments on commit b218db6

Please sign in to comment.